Ticket #2309: transmission-1.73-alt-close-to-tray.patch

transmission-1.73/qt/mainwin.h

@@ -51 +51 @@
         Q_OBJECT
 
     private:
+        bool allow_close;
         time_t myLastFullUpdateTime;
         QDialog * mySessionDialog;
         QDialog * myPrefsDialog;
@@ -136 +137 @@
         void onSortBySizeToggled     ( bool );
         void onSortByStateToggled    ( bool );
         void onSortByTrackerToggled  ( bool );
+        void allowClose              ( );
 
     private:
         QWidget * createFilterBar( void );
@@ -173 +175 @@
 
     private:
         void clearSelection( );
+        virtual void closeEvent( QCloseEvent* );
 
     public slots:
         void setToolbarVisible( bool );

transmission-1.73/qt/mainwin.cc

@@ -23 +23 @@
 #include <QSystemTrayIcon>
 #include <QUrl>
 #include <QSignalMapper>
+#include <QCloseEvent>
 
 #include <libtransmission/version.h>
 
@@ -98 +99 @@
     myLastReadTime( 0 ),
     myNetworkTimer( this )
 {
+    allow_close = false;
+
     QAction * sep = new QAction( this );
     sep->setSeparator( true );
 
@@ -264 +267 @@
     connect( &mySession, SIGNAL(dataSendProgress()), this, SLOT(dataSendProgress()) );
     connect( &mySession, SIGNAL(httpAuthenticationRequired()), this, SLOT(wrongAuthentication()) );
 
+    connect( QCoreApplication::instance(), SIGNAL(aboutToQuit()), this, SLOT(allowClose()) );
+
     if( mySession.isServer( ) )
         myNetworkLabel->hide( );
     else {
@@ -286 +291 @@
 ****/
 
 void
+TrMainWindow :: allowClose( )
+{
+    allow_close = true;
+}
+
+void
+TrMainWindow :: closeEvent( QCloseEvent *e )
+{
+    if( myTrayIcon.isVisible( ) )
+    {
+        if( allow_close )
+        {
+            e->accept();
+        }
+        else
+        {
+            ui.action_ShowMainWindow->setChecked( false );
+            e->ignore();
+        }
+    }
+}
+
+void
 TrMainWindow :: onSessionSourceChanged( )
 {
     myModel.clear( );