Changeset 13750

Timestamp:

Jan 4, 2013, 12:00:55 AM (9 years ago)

Author:

jordan

Message:

(2.7x, qt) backport r13733 for #5206

Location:

branches/2.7x/qt

Files:

• mainwin.cc (modified) (5 diffs)
• mainwin.h (modified) (1 diff)

branches/2.7x/qt/mainwin.cc

@@ -251 +251 @@
 
     connect( &myPrefs, SIGNAL(changed(int)), this, SLOT(refreshPref(int)) );
-    connect( ui.action_ShowMainWindow, SIGNAL(toggled(bool)), this, SLOT(toggleWindows(bool)));
+    connect( ui.action_ShowMainWindow, SIGNAL(triggered(bool)), this, SLOT(toggleWindows(bool)));
     connect( &myTrayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
              this, SLOT(trayActivated(QSystemTrayIcon::ActivationReason)));
 
-    ui.action_ShowMainWindow->setChecked( !minimized );
+    toggleWindows( !minimized );
     ui.action_TrayIcon->setChecked( minimized || prefs.getBool( Prefs::SHOW_TRAY_ICON ) );
 
@@ -307 +307 @@
 TrMainWindow :: ~TrMainWindow( )
 {
-}
-
-/****
-*****
-****/
-
-void
-TrMainWindow :: closeEvent( QCloseEvent * event )
-{
-    // if they're using a tray icon, close to the tray
-    // instead of exiting
-    if( !myPrefs.getBool( Prefs :: SHOW_TRAY_ICON ) )
-        event->accept( );
-    else {
-        toggleWindows( false );
-        event->ignore( );
-    }
 }
 
@@ -568 +551 @@
 
 void
+TrMainWindow :: showEvent( QShowEvent * event )
+{
+    Q_UNUSED (event);
+
+    ui.action_ShowMainWindow->setChecked(true);
+}
+
+/****
+*****
+****/
+
+void
+TrMainWindow :: hideEvent( QHideEvent * event )
+{
+    Q_UNUSED (event);
+
+    if (!isVisible())
+        ui.action_ShowMainWindow->setChecked(false);
+}
+
+/****
+*****
+****/
+
+void
 TrMainWindow :: onPrefsDestroyed( )
 {
@@ -994 +1002 @@
             toggleWindows( true );
         else
-            ui.action_ShowMainWindow->toggle( );
+            toggleWindows( !isVisible() );
     }
 }
@@ -1080 +1088 @@
             ui.action_TrayIcon->setChecked( b );
             myTrayIcon.setVisible( b );
+            dynamic_cast<MyApp*>(QCoreApplication::instance())->setQuitOnLastWindowClosed(!b);
             refreshTrayIconSoon( );
             break;

branches/2.7x/qt/mainwin.h

@@ -53 +53 @@
 
     private:
-        virtual void closeEvent( QCloseEvent * event );
+        virtual void hideEvent( QHideEvent * event );
+        virtual void showEvent( QShowEvent * event );
 
     private: