Changeset 9367

Timestamp:

Oct 22, 2009, 3:01:38 AM (13 years ago)

Author:

charles

Message:

(1.7x) backports for 1.76: r9178 #2417: Qt client closes, rather than closing to the system tray, when user clicks X

Location:

branches/1.7x

Files:

• NEWS (modified) (2 diffs)
• qt/mainwin.cc (modified) (2 diffs)
• qt/mainwin.h (modified) (1 diff)

branches/1.7x/NEWS

@@ -1 @@
-=== Transmission 1.76 (2009/09/13) ===
+=== Transmission 1.76 (2009/xx/yy) ===
 ==== All Platforms ====
   * Fix possible dataloss when trying to move torrents to where they already are
   * Fix manpage errors
   * Fix minor protocol error that didn't send a port message to some peers
-  * Use automake's "quieter builds" rule when available
 ==== Daemon ====
   * Fix possible dataloss when using "transmission-remote --find"
@@ -17 +16 @@
 ==== Qt ====
   * Fix crash when removing expired torrents from the display
+  * Fix client from closing, rather than closing to the system tray, when clicking X
 
 === Transmission 1.75 (2009/09/13) ===

branches/1.7x/qt/mainwin.cc

@@ -15 +15 @@
 
 #include <QCheckBox>
+#include <QCloseEvent>
 #include <QDesktopServices>
 #include <QFileDialog>
@@ -287 +288 @@
 
 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( );
+    }
+}
+
+/****
+*****
+****/
+
+void
 TrMainWindow :: onSessionSourceChanged( )
 {

branches/1.7x/qt/mainwin.h

@@ -50 +50 @@
 {
         Q_OBJECT
+
+    private:
+        virtual void closeEvent( QCloseEvent * event );
 
     private: