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

List:       kde-commits
Subject:    kdebase/kicker/applets/lockout
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2003-08-12 0:40:00
[Download RAW message or body]

CVS commit by aseigo: 

register a Configure action with the applet handle
Preferences -> Configure, and tell the user what thye're about to configure


  M +10 -4     lockout.cpp   1.16
  M +5 -3      lockout.h   1.2


--- kdebase/kicker/applets/lockout/lockout.cpp  #1.15:1.16
@@ -55,5 +55,5 @@ extern "C"
 
 Lockout::Lockout( const QString& configFile, QWidget *parent, const char *name)
-    : KPanelApplet( configFile, KPanelApplet::Normal, 0, parent, name )
+    : KPanelApplet( configFile, KPanelApplet::Normal, KPanelApplet::Preferences, parent, name )
 {
     setFrameStyle(Panel | Sunken);
@@ -203,5 +203,5 @@ bool Lockout::eventFilter( QObject *o, Q
                 popup->insertSeparator();
                 popup->insertItem( SmallIcon( "configure" ),
-                                   i18n( "&Preferences..." ),
+                                   i18n( "&Configure Screen Saver..." ),
                                    this, SLOT( slotLockPrefs() ) );
                 popup->exec( me->globalPos() );
@@ -218,5 +218,5 @@ bool Lockout::eventFilter( QObject *o, Q
                 popup->insertSeparator();
                 popup->insertItem( SmallIcon( "configure" ),
-                                   i18n( "&Preferences..." ),
+                                   i18n( "&Configure Session Manager..." ),
                                    this, SLOT( slotLogoutPrefs() ) );
                 popup->exec( me->globalPos() );
@@ -230,4 +230,10 @@ bool Lockout::eventFilter( QObject *o, Q
     // Process event normally:
     return false;
+}
+
+void Lockout::preferences()
+{
+    // Run both the screensaver and the logout settings
+    KRun::run( "kcmshell screensaver kcmsmserver", KURL::List() );
 }
 

--- kdebase/kicker/applets/lockout/lockout.h  #1.1:1.2
@@ -43,4 +43,6 @@ protected:
     virtual bool eventFilter( QObject *, QEvent * );
     
+    virtual void preferences();
+
 private slots:
     void lock();


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