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

List:       kde-commits
Subject:    KDE/kdepim/kleopatra
From:       Marc Mutz <mutz () kde ! org>
Date:       2010-11-12 16:39:11
Message-ID: 20101112163911.95CEEAC8A0 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1196139 by mutz:

SysTrayIcon: move ConfigureDialog handling over to KleopatraApplication

 M  +33 -1     kleopatraapplication.cpp  
 M  +1 -1      mainwindow_desktop.cpp  
 M  +0 -3      mainwindow_desktop.h  
 M  +1 -5      mainwindow_mobile.cpp  
 M  +0 -1      mainwindow_mobile.h  
 M  +1 -33     systrayicon.cpp  
 M  +0 -1      systrayicon.h  


--- trunk/KDE/kdepim/kleopatra/kleopatraapplication.cpp #1196138:1196139
@@ -38,6 +38,7 @@
 #include "systrayicon.h"
 
 #include <smartcard/readerstatus.h>
+#include <conf/configuredialog.h>
 
 #include <utils/gnupg-helper.h>
 #include <utils/filesystemwatcher.h>
@@ -60,9 +61,11 @@
 #include <KCmdLineOptions>
 #include <KDebug>
 #include <KUrl>
+#include <KWindowSystem>
 
 #include <QFile>
 #include <QDir>
+#include <QPointer>
 
 #include <boost/shared_ptr.hpp>
 #include <boost/range.hpp>
@@ -150,8 +153,19 @@
 #endif
     }
 
+private:
+    void connectConfigureDialog() {
+        if ( configureDialog && q->mainWindow() )
+            connect( configureDialog, SIGNAL(configCommitted()), q->mainWindow(), \
SLOT(slotConfigCommitted()) ); +    }
+    void disconnectConfigureDialog() {
+        if ( configureDialog && q->mainWindow() )
+            disconnect( configureDialog, SIGNAL(configCommitted()), q->mainWindow(), \
SLOT(slotConfigCommitted()) ); +    }
+
 public:
     bool ignoreNewInstance;
+    QPointer<ConfigureDialog> configureDialog;
     SmartCard::ReaderStatus readerStatus;
 #ifndef QT_NO_SYSTEMTRAYICON
     SysTrayIcon sysTray;
@@ -319,11 +333,29 @@
 void KleopatraApplication::openOrRaiseMainWindow() {
     d->sysTray.openOrRaiseMainWindow();
 }
+#endif
 
+static void open_or_raise( QWidget * w ) {
+    if ( w->isMinimized() ) {
+        KWindowSystem::unminimizeWindow( w->winId());
+        w->raise();
+    } else if ( w->isVisible() ) {
+        w->raise();
+    } else {
+        w->show();
+    }
+}
+
 void KleopatraApplication::openOrRaiseConfigDialog() {
-    d->sysTray.openOrRaiseConfigDialog();
+    if ( !d->configureDialog ) {
+        d->configureDialog = new ConfigureDialog;
+        d->configureDialog->setAttribute( Qt::WA_DeleteOnClose );
+        d->connectConfigureDialog();
 }
+    open_or_raise( d->configureDialog );
+}
 
+#ifndef QT_NO_SYSTEMTRAYICON
 void KleopatraApplication::startMonitoringSmartCard() {
     d->readerStatus.startMonitoring();
 }
--- trunk/KDE/kdepim/kleopatra/mainwindow_desktop.cpp #1196138:1196139
@@ -335,7 +335,7 @@
     KStandardAction::quit( q, SLOT(closeAndQuit()), coll );
     KStandardAction::configureToolbars( q, SLOT(configureToolbars()), coll );
     KStandardAction::keyBindings( q, SLOT(editKeybindings()), coll );
-    KStandardAction::preferences( q, SIGNAL(configDialogRequested()), coll );
+    KStandardAction::preferences( qApp, SIGNAL(openOrRaiseConfigDialog()), coll );
 
     q->createStandardStatusBarAction();
     q->setStandardToolBarMenuEnabled( true );
--- trunk/KDE/kdepim/kleopatra/mainwindow_desktop.h #1196138:1196139
@@ -46,9 +46,6 @@
 public Q_SLOTS:
     void importCertificatesFromFile( const QStringList & files );
 
-Q_SIGNALS:
-    void configDialogRequested();
-
 protected:
     void closeEvent( QCloseEvent * e );
     void showEvent( QShowEvent * e );
--- trunk/KDE/kdepim/kleopatra/mainwindow_mobile.cpp #1196138:1196139
@@ -208,10 +208,6 @@
         createAndStart<SelfTestCommand>();
     }
     void configureBackend();
-    void configDialogRequested() {
-        qDebug( "configDialogRequested: not implemented" );
-    }
-
     void showHandbook();
 
     void gnupgLogViewer() {
@@ -299,7 +295,7 @@
 
     KStandardAction::close( q, SLOT(close()), coll );
     KStandardAction::quit( q, SLOT(closeAndQuit()), coll );
-    KStandardAction::preferences( q, SIGNAL(configDialogRequested()), coll );
+    KStandardAction::preferences( qApp, SLOT(openOrRaiseConfigDialog()), coll );
 
     controller.createActions( coll );
 }
--- trunk/KDE/kdepim/kleopatra/mainwindow_mobile.h #1196138:1196139
@@ -65,7 +65,6 @@
     void registerSearchBar( Kleo::SearchBar * bar );
 
 private:
-    Q_PRIVATE_SLOT( d, void configDialogRequested() )
     Q_PRIVATE_SLOT( d, void closeAndQuit() )
     Q_PRIVATE_SLOT( d, void selfTest() )
     Q_PRIVATE_SLOT( d, void slotSearchBarTextChanged(QString) )
--- trunk/KDE/kdepim/kleopatra/systrayicon.cpp #1196138:1196139
@@ -49,8 +49,6 @@
 #include <commands/setinitialpincommand.h>
 #include <commands/learncardkeyscommand.h>
 
-#include <conf/configuredialog.h>
-
 #include <KIcon>
 #include <KLocale>
 #include <KAboutApplicationDialog>
@@ -151,24 +149,6 @@
     }
 
 private:
-    void connectConfigureDialog() {
-        if ( configureDialog && q->mainWindow() )
-            connect( configureDialog, SIGNAL(configCommitted()), q->mainWindow(), \
                SLOT(slotConfigCommitted()) );
-    }
-    void disconnectConfigureDialog() {
-        if ( configureDialog && q->mainWindow() )
-            disconnect( configureDialog, SIGNAL(configCommitted()), q->mainWindow(), \
                SLOT(slotConfigCommitted()) );
-    }
-    void connectMainWindow() {
-        if ( q->mainWindow() )
-            connect( q->mainWindow(), SIGNAL(configDialogRequested()), q, \
                SLOT(openOrRaiseConfigDialog()) );
-    }
-    void disconnectMainWindow() {
-        if ( q->mainWindow() )
-            connect( q->mainWindow(), SIGNAL(configDialogRequested()), q, \
                SLOT(openOrRaiseConfigDialog()) );
-    }
-
-private:
     bool anyCardHasNullPin;
     bool anyCardCanLearnKeys;
 
@@ -189,7 +169,6 @@
     QAction learnCertificatesAction;
 
     QPointer<KAboutApplicationDialog> aboutDialog;
-    QPointer<ConfigureDialog> configureDialog;
 
     QRect mainWindowPreviousGeometry;
 };
@@ -235,7 +214,7 @@
     KDAB_SET_OBJECT_NAME( learnCertificatesAction );
 
     connect( &openCertificateManagerAction, SIGNAL(triggered()), q, \
                SLOT(openOrRaiseMainWindow()) );
-    connect( &configureAction, SIGNAL(triggered()), q, \
SLOT(openOrRaiseConfigDialog()) ); +    connect( &configureAction, \
SIGNAL(triggered()), qApp, SLOT(openOrRaiseConfigDialog()) );  connect( &aboutAction, \
                SIGNAL(triggered()), q, SLOT(slotAbout()) );
     connect( &quitAction, SIGNAL(triggered()), QCoreApplication::instance(), \
                SLOT(quit()) );
     connect( &importClipboardAction, SIGNAL(triggered()), q, \
SLOT(slotImportClipboard()) ); @@ -315,8 +294,6 @@
         if ( d->mainWindowPreviousGeometry.isValid() )
             mw->setGeometry( d->mainWindowPreviousGeometry );
         setMainWindow( mw );
-        d->connectConfigureDialog();
-        d->connectMainWindow();
     }
     open_or_raise( mw );
 }
@@ -333,15 +310,6 @@
         openOrRaiseMainWindow();
 }
 
-void SysTrayIcon::openOrRaiseConfigDialog() {
-    if ( !d->configureDialog ) {
-        d->configureDialog = new ConfigureDialog;
-        d->configureDialog->setAttribute( Qt::WA_DeleteOnClose );
-        d->connectConfigureDialog();
-    }
-    open_or_raise( d->configureDialog );
-}
-
 void SysTrayIcon::setAnyCardHasNullPin( bool on ) {
     if ( d->anyCardHasNullPin == on )
         return;
--- trunk/KDE/kdepim/kleopatra/systrayicon.h #1196138:1196139
@@ -53,7 +53,6 @@
 
 public Q_SLOTS:
     void openOrRaiseMainWindow();
-    void openOrRaiseConfigDialog();
     void setAnyCardHasNullPin( bool );
     void setAnyCardCanLearnKeys( bool );
 


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