[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:15
Message-ID: 20101112163915.29B35AC8A4 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1196141 by mutz:

SystemTrayIcon: inform SysTrayIcon when a mainwindow was set; SysTrayIcon: restore mainwindow size there

 M  +5 -2      systrayicon.cpp  
 M  +1 -0      systrayicon.h  
 M  +2 -0      utils/systemtrayicon.cpp  
 M  +1 -0      utils/systemtrayicon.h  


--- trunk/KDE/kdepim/kleopatra/systrayicon.cpp #1196140:1196141
@@ -263,6 +263,11 @@
     KGlobal::deref();
 }
 
+void SysTrayIcon::doMainWindowSet( QWidget * mw ) {
+    if ( mw && !mw->isVisible() && d->mainWindowPreviousGeometry.isValid() )
+        mw->setGeometry( d->mainWindowPreviousGeometry );
+}
+
 void SysTrayIcon::doMainWindowClosed( QWidget * mw ) {
     d->mainWindowPreviousGeometry = mw->geometry();
 }
@@ -291,8 +296,6 @@
     if ( !mw ) {
         mw = new MainWindow;
         mw->setAttribute( Qt::WA_DeleteOnClose );
-        if ( d->mainWindowPreviousGeometry.isValid() )
-            mw->setGeometry( d->mainWindowPreviousGeometry );
         setMainWindow( mw );
     }
     open_or_raise( mw );
--- trunk/KDE/kdepim/kleopatra/systrayicon.h #1196140:1196141
@@ -57,6 +57,7 @@
     void setAnyCardCanLearnKeys( bool );
 
 private:
+    /* reimp */ void doMainWindowSet( QWidget * );
     /* reimp */ void doMainWindowClosed( QWidget * );
     /* reimp */ void doActivated();
     /* reimp */ void slotEnableDisableActions();
--- trunk/KDE/kdepim/kleopatra/utils/systemtrayicon.cpp #1196140:1196141
@@ -137,6 +137,7 @@
     d->mainWindow = mw;
     if ( mw )
         mw->installEventFilter( this );
+    doMainWindowSet( mw );
     slotEnableDisableActions();
 }
 
@@ -217,6 +218,7 @@
     return d->attentionIcon;
 }
 
+void SystemTrayIcon::doMainWindowSet( QWidget * ) {}
 void SystemTrayIcon::doMainWindowClosed( QWidget * ) {}
 void SystemTrayIcon::doAttentionWindowClosed( QWidget * ) {}
 
--- trunk/KDE/kdepim/kleopatra/utils/systemtrayicon.h #1196140:1196141
@@ -67,6 +67,7 @@
     virtual void slotEnableDisableActions() = 0;
 
 private:
+    virtual void doMainWindowSet( QWidget * );
     virtual void doMainWindowClosed( QWidget * );
     virtual void doAttentionWindowClosed( QWidget * );
     virtual void doActivated() = 0;
[prev in list] [next in list] [prev in thread] [next in thread]