Changeset 11094

Timestamp:

Aug 2, 2010, 3:07:42 AM (12 years ago)

Author:

charles

Message:

(trunk) consistency tweaks between the GTK+ and Qt client:

1. synchronize some of the keyboard shortcuts
2. synchronize some text in the preferences dialog
3. add a "Desktop" tab in the Qt client's preferences dialog
4. add a "Donate" button to the Qt client's help menu

Location:

trunk

Files:

• gtk/actions.c (modified) (1 diff)
• gtk/tr-prefs.c (modified) (2 diffs)
• qt/app.cc (modified) (3 diffs)
• qt/app.h (modified) (1 diff)
• qt/mainwin.cc (modified) (5 diffs)
• qt/mainwin.h (modified) (2 diffs)
• qt/mainwin.ui (modified) (4 diffs)
• qt/prefs-dialog.cc (modified) (10 diffs)
• qt/prefs-dialog.h (modified) (1 diff)

trunk/gtk/actions.c

@@ -121 +121 @@
     { "pause-all-torrents", GTK_STOCK_MEDIA_PAUSE, N_( "_Pause All" ), NULL, N_( "Pause all torrents" ), G_CALLBACK( action_cb ) },
     { "start-all-torrents", GTK_STOCK_MEDIA_PLAY, N_( "_Start All" ), NULL, N_( "Start all torrents" ), G_CALLBACK( action_cb ) },
-    { "relocate-torrent", NULL, N_("Set _Location" ), NULL, NULL, G_CALLBACK( action_cb ) },
+    { "relocate-torrent", NULL, N_("Set _Location..." ), NULL, NULL, G_CALLBACK( action_cb ) },
     { "remove-torrent", GTK_STOCK_REMOVE, NULL, "Delete", N_( "Remove torrent" ), G_CALLBACK( action_cb ) },
     { "delete-torrent", GTK_STOCK_DELETE, N_( "_Delete Files and Remove" ), "<shift>Delete", NULL, G_CALLBACK( action_cb ) },

trunk/gtk/tr-prefs.c

@@ -532 +532 @@
     hig_workarea_add_wide_control( t, &row, w );
 
-    s = _( "Use Local Peer Discovery to find more peers" );
+    s = _( "Use _Local Peer Discovery to find more peers" );
     w = new_check_button( s, TR_PREFS_KEY_LPD_ENABLED, core );
     s = _( "LPD is a tool for finding peers on your local network." );
@@ -1288 +1288 @@
     g_object_weak_ref( G_OBJECT( t ), peerPageDestroyed, data );
 
-    s = _( "Pick a _random port on startup" );
+    s = _( "Pick a _random port every time Transmission is started" );
     w = new_check_button( s, TR_PREFS_KEY_PEER_PORT_RANDOM_ON_START, core );
     hig_workarea_add_wide_control( t, &row, w );

trunk/qt/app.cc

@@ -170 +170 @@
     // when the model sees a torrent for the first time, ask the session for full info on it
     connect( myModel, SIGNAL(torrentsAdded(QSet<int>)), mySession, SLOT(initTorrents(QSet<int>)) );
-    connect( myModel, SIGNAL(torrentsAdded(QSet<int>)), this, SLOT(torrentsAdded(QSet<int>)) );
+    connect( myModel, SIGNAL(torrentsAdded(QSet<int>)), this, SLOT(onTorrentsAdded(QSet<int>)) );
 
     mySession->initTorrents( );
@@ -246 +246 @@
 }
 
-void
-MyApp :: torrentsAdded( QSet<int> torrents )
-{
+/* these two functions are for popping up desktop notification
+ * when new torrents are added */
+void
+MyApp :: onTorrentsAdded( QSet<int> torrents )
+{
+    if( !myPrefs->getBool( Prefs::SHOW_DESKTOP_NOTIFICATION ) )
+        return;
+
     foreach( int id, torrents )
     {
         Torrent * tor = myModel->getTorrentFromId( id );
         if( !tor->name().isEmpty( ) )
-            torrentChanged( id );
+            onNewTorrentChanged( id );
         else // wait until the torrent's INFO fields are loaded
-            connect( tor, SIGNAL(torrentChanged(int)), this, SLOT(torrentChanged(int)) );
-    }
-}
-
-void
-MyApp :: torrentChanged( int id )
+            connect( tor, SIGNAL(torrentChanged(int)), this, SLOT(onNewTorrentChanged(int)) );
+    }
+}
+void
+MyApp :: onNewTorrentChanged( int id )
 {
     Torrent * tor = myModel->getTorrentFromId( id );
@@ -270 +274 @@
             notify( tr( "Torrent Added" ), tor->name( ) );
 
-        disconnect( tor, SIGNAL(torrentChanged(int)), this, SLOT(torrentChanged(int)) );
+        disconnect( tor, SIGNAL(torrentChanged(int)), this, SLOT(onNewTorrentChanged(int)) );
     }
 }

trunk/qt/app.h

@@ -58 +58 @@
         void refreshPref( int key );
         void refreshTorrents( );
-        void torrentsAdded( QSet<int> );
-        void torrentChanged( int );
+        void onTorrentsAdded( QSet<int> );
+        void onNewTorrentChanged( int );
 
     public slots:

trunk/qt/mainwin.cc

@@ -126 +126 @@
     // ui signals
     connect( ui.action_Toolbar, SIGNAL(toggled(bool)), this, SLOT(setToolbarVisible(bool)));
-    connect( ui.action_TrayIcon, SIGNAL(toggled(bool)), this, SLOT(setTrayIconVisible(bool)));
     connect( ui.action_Filterbar, SIGNAL(toggled(bool)), this, SLOT(setFilterbarVisible(bool)));
     connect( ui.action_Statusbar, SIGNAL(toggled(bool)), this, SLOT(setStatusbarVisible(bool)));
@@ -153 +152 @@
     connect( ui.action_Preferences, SIGNAL(triggered()), this, SLOT(openPreferences()));
     connect( ui.action_Statistics, SIGNAL(triggered()), myStatsDialog, SLOT(show()));
+    connect( ui.action_Donate, SIGNAL(triggered()), this, SLOT(openDonate()));
     connect( ui.action_About, SIGNAL(triggered()), myAboutDialog, SLOT(show()));
     connect( ui.action_Contents, SIGNAL(triggered()), this, SLOT(openHelp()));
@@ -609 +609 @@
 
 void
+TrMainWindow :: openDonate( )
+{
+    QDesktopServices :: openUrl( QUrl( "http://www.transmissionbt.com/donate.php" ) );
+}
+
+void
 TrMainWindow :: openHelp( )
 {
@@ -616 +622 @@
     char url[128];
     tr_snprintf( url, sizeof( url ), fmt, major, minor/10 );
-    QDesktopServices :: openUrl( QUrl( QString( url ) ) );
+    QDesktopServices :: openUrl( QUrl( url ) );
 }
 
@@ -817 +823 @@
 }
 void
-TrMainWindow :: setTrayIconVisible( bool visible )
-{
-    myPrefs.set( Prefs :: SHOW_TRAY_ICON, visible );
-}
-void
 TrMainWindow :: toggleSpeedMode( )
 {

trunk/qt/mainwin.h

@@ -112 +112 @@
         void addTorrents( const QStringList& filenames );
         void removeTorrents( const bool deleteFiles );
+        void openDonate( );
         void openHelp( );
         void openFolder( );
@@ -174 +175 @@
         void setFilterbarVisible( bool );
         void setStatusbarVisible( bool );
-        void setTrayIconVisible( bool );
         void setCompactView( bool );
         void refreshActionSensitivity( );

trunk/qt/mainwin.ui

@@ -97 +97 @@
     <addaction name="action_Statistics"/>
     <addaction name="separator"/>
+    <addaction name="action_Donate"/>
+    <addaction name="separator"/>
     <addaction name="action_Contents"/>
     <addaction name="action_About"/>
@@ -109 +111 @@
     <addaction name="action_Filterbar"/>
     <addaction name="action_Statusbar"/>
-    <addaction name="action_TrayIcon"/>
     <addaction name="separator"/>
     <addaction name="action_SortByActivity"/>
@@ -465 +466 @@
     <string>&amp;Contents</string>
    </property>
+   <property name="shortcut">
+    <string>F1</string>
+   </property>
   </action>
   <action name="action_About">
@@ -572 +576 @@
    <property name="text">
     <string>Add &amp;URL...</string>
+   </property>
+  </action>
+  <action name="action_Donate">
+   <property name="text">
+    <string>&amp;Donate</string>
    </property>
   </action>

trunk/qt/prefs-dialog.cc

@@ -225 +225 @@
     QWidget * w;
     QHBoxLayout * h = new QHBoxLayout( );
-    QIcon i( style()->standardIcon( QStyle::StandardPixmap( QStyle::SP_DirOpenIcon ) ) );
-    QPushButton * b = new QPushButton( i, tr( "&Open web client" ) );
+    QPushButton * b = new QPushButton( tr( "&Open web client" ) );
     connect( b, SIGNAL(clicked()), &session, SLOT(launchWebInterface()) );
     h->addWidget( b, 0, Qt::AlignRight );
@@ -295 +294 @@
         hig->addWideControl( new QLabel( s ) );
 
-        s = tr( "Limit d&ownload speed (%1):" ).arg( speed_K_str );
+        s = tr( "Limit do&wnload speed (%1):" ).arg( speed_K_str );
         r = spinBoxNew( Prefs :: ALT_SPEED_LIMIT_DOWN, 0, INT_MAX, 5 );
         hig->addRow( s, r );
@@ -344 +343 @@
 ***/
 
+QWidget *
+PrefsDialog :: createDesktopTab( )
+{
+    HIG * hig = new HIG( this );
+    hig->addSectionTitle( tr( "Desktop" ) );
+
+    hig->addWideControl( checkBoxNew( tr( "Show Transmission icon in the &notification area" ), Prefs::SHOW_TRAY_ICON ) );
+    hig->addWideControl( checkBoxNew( tr( "Show &popup notifications" ), Prefs::SHOW_DESKTOP_NOTIFICATION ) );
+
+    hig->finish( );
+    return hig;
+}
+
+/***
+****
+***/
+
 void
 PrefsDialog :: onPortTested( bool isOpen )
@@ -370 +386 @@
     QSpinBox * s = spinBoxNew( Prefs::PEER_PORT, 1, 65535, 1 );
     QHBoxLayout * h = new QHBoxLayout( );
-    QPushButton * b = myPortButton = new QPushButton( tr( "&Test Port" ) );
+    QPushButton * b = myPortButton = new QPushButton( tr( "Te&st Port" ) );
     QLabel * l = myPortLabel = new QLabel( tr( "Status unknown" ) );
     h->addWidget( l );
@@ -381 +397 @@
     hig->addRow( tr( "&Port for incoming connections:" ), s );
     hig->addRow( "", h, 0 );
+    hig->addWideControl( checkBoxNew( tr( "Pick a &random port every time Transmission is started" ), Prefs :: PEER_PORT_RANDOM_ON_START ) );
     hig->addWideControl( checkBoxNew( tr( "Use UPnP or NAT-PMP port &forwarding from my router" ), Prefs::PORT_FORWARDING ) );
-    hig->addWideControl( checkBoxNew( tr( "Pick a &random port every time Transmission is started" ), Prefs :: PEER_PORT_RANDOM_ON_START ) );
 
     hig->addSectionDivider( );
@@ -452 +468 @@
     hig->addSectionTitle( tr( "Blocklist" ) );
     QHBoxLayout * h = new QHBoxLayout( );
-    QIcon i( style()->standardIcon( QStyle::StandardPixmap( QStyle::SP_BrowserReload ) ) );
-    QWidget * w = new QPushButton( i, tr( "&Update blocklist" ) );
+    QWidget * w = new QPushButton( tr( "&Update" ) );
     connect( w, SIGNAL(clicked(bool)), this, SLOT(onUpdateBlocklistClicked()));
     myBlockWidgets << w;
@@ -573 +588 @@
         hig->addWideControl( checkBoxNew( tr( "Append \".&part\" to incomplete files' names" ), Prefs::RENAME_PARTIAL_FILES ) );
 
+        b = myDestinationButton = new QPushButton;
+        b->setIcon( folderPixmap );
+        b->setStyleSheet( "text-align: left; padding-left: 5; padding-right: 5" );
+        connect( b, SIGNAL(clicked(bool)), this, SLOT(onDestinationClicked(void)) );
+        hig->addRow( tr( "Save to &Location:" ), b );
+
         l = myIncompleteCheckbox = checkBoxNew( tr( "Keep &incomplete files in:" ), Prefs::INCOMPLETE_DIR_ENABLED );
         b = myIncompleteButton = new QPushButton;
@@ -581 +602 @@
         enableBuddyWhenChecked( qobject_cast<QCheckBox*>(l), b );
 
-        l = myTorrentDoneScriptCheckbox = checkBoxNew( tr( "Call scrip&t when torrent is completed" ), Prefs::SCRIPT_TORRENT_DONE_ENABLED );
+        l = myTorrentDoneScriptCheckbox = checkBoxNew( tr( "Call scrip&t when torrent is completed:" ), Prefs::SCRIPT_TORRENT_DONE_ENABLED );
         b = myTorrentDoneScriptButton = new QPushButton;
         b->setIcon( filePixmap );
@@ -589 +610 @@
         enableBuddyWhenChecked( qobject_cast<QCheckBox*>(l), b );
 
-        b = myDestinationButton = new QPushButton;
-        b->setIcon( folderPixmap );
-        b->setStyleSheet( "text-align: left; padding-left: 5; padding-right: 5" );
-        connect( b, SIGNAL(clicked(bool)), this, SLOT(onDestinationClicked(void)) );
-        hig->addRow( tr( "Save to &Location:" ), b );
-
     hig->addSectionDivider( );
     hig->addSectionTitle( tr( "Seeding Limits" ) );
@@ -630 +645 @@
     t->addTab( createPrivacyTab( ),      tr( "Privacy" ) );
     t->addTab( createNetworkTab( ),      tr( "Network" ) );
+    t->addTab( createDesktopTab( ),      tr( "Desktop" ) );
     t->addTab( createWebTab( session ),  tr( "Web" ) );
     //t->addTab( createTrackerTab( ),    tr( "Trackers" ) );

trunk/qt/prefs-dialog.h

@@ -80 +80 @@
         bool isAllowed( int key ) const;
         QWidget * createTorrentsTab( );
+        QWidget * createSpeedTab( );
+        QWidget * createPrivacyTab( );
         QWidget * createNetworkTab( );
-        QWidget * createPrivacyTab( );
-        QWidget * createSpeedTab( );
+        QWidget * createDesktopTab( );
         QWidget * createWebTab( Session& );
         QWidget * createTrackerTab( );