[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase
From:       Ravikiran Rajagopal <ravi () kde ! org>
Date:       2003-09-13 3:15:36
[Download RAW message or body]

CVS commit by ravi: 

* Proper handling of Xinerama - no longer assume we are always on screen 0
* Proper way to avoid triggering DCOP server

NOTE: These changes are KSplashML BIC. You must recompile all your plugins from outside KDE CVS.

CCMAIL staikos@kde.org


  M +1 -1      startkde   1.122
  M +12 -4     ksplashml/main.cpp   1.5
  M +1 -1      ksplashml/wndmain.cpp   1.16
  M +5 -3      ksplashml/wndmain.h   1.7


--- kdebase/startkde  #1.121:1.122
@@ -157,5 +157,5 @@
 
 # the splashscreen and progress indicator
-ksplash
+ksplash --nodcop
 
 # We set LD_BIND_NOW to increase the efficiency of kdeinit.

--- kdebase/ksplashml/main.cpp  #1.4:1.5
@@ -1,6 +1,5 @@
 /***************************************************************************
  *   Copyright Brian Ledbetter 2001-2003 <brian@shadowcom.net>             *
- *   Copyright Ravikiran Rajagopal 2003                                    *
- *   ravi@ee.eng.ohio-state.edu                                            *
+ *   Copyright Ravikiran Rajagopal 2003  <ravi@kde.org>                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -10,5 +9,4 @@
  *                                                                         *
  ***************************************************************************/
-/* $Id$ */
 
 #ifdef HAVE_CONFIG_H
@@ -35,4 +33,6 @@ static KCmdLineOptions options[] = {
   { "nofork", I18N_NOOP("Don't fork into the background."), 0 },
   { "theme <argument>", I18N_NOOP("Override theme."), "" },
+  { "nodcop", I18N_NOOP("Do not attempt to start DCOP server."),0 },
+  { "steps <number>", I18N_NOOP("Number of steps."), "7" },
   KCmdLineLastOption
 };
@@ -61,8 +61,16 @@ int main( int argc, char **argv )
   }
 
+  if ( !( arg->isSet( "dcop" ) ) )
   KApplication::disableAutoDcopRegistration();
   KApplication app;
 
   KSplash wndMain("ksplash");
+  if ( arg->isSet( "steps" ) )
+  {
+    int steps = QMAX( arg->getOption( "steps" ).toInt(), 0 );
+    if ( steps )
+      wndMain.slotUpdateSteps( steps );
+  }
+
   app.setMainWidget(&wndMain);
   app.setTopWidget(&wndMain);

--- kdebase/ksplashml/wndmain.cpp  #1.15:1.16
@@ -301,5 +301,5 @@ ThemeEngine *KSplash::_loadThemeEngine( 
   QString objName;
   // Replace this test by a "nodcop" command line option.
-  if ( !mKsTheme->managedMode() /* && !mKsTheme->testing() */ )
+  if ( /*!mKsTheme->managedMode() ||*/ !KCmdLineArgs::parsedArgs()->isSet( "dcop" ) )
   {
     libName = QString("ksplash%1").arg(pluginName.lower());

--- kdebase/ksplashml/wndmain.h  #1.6:1.7
@@ -26,5 +26,5 @@
 // Action: This represents an "action entry" to any object which is interested
 // in knowing this.
-typedef struct __action
+typedef struct
 {
   QString ItemPixmap;
@@ -61,4 +61,8 @@ protected:
   bool eventFilter( QObject *o, QEvent *e );
 
+public slots:
+  void slotUpdateSteps( int );
+  void slotUpdateProgress( int );
+
 private slots:
   void initDcop();
@@ -72,6 +76,4 @@ private slots:
   void slotSetText( const QString& );
   void slotSetPixmap( const QString& );
-  void slotUpdateSteps( int );
-  void slotUpdateProgress( int );
 
   void loadTheme( const QString& );


[prev in list] [next in list] [prev in thread] [next in thread]