Changeset 13813

Timestamp:

Jan 20, 2013, 11:57:09 PM (8 years ago)

Author:

jordan

Message:

(qt) Qt client should have the option to play a sound when the download completes, as the Mac and GTK+ clients do -- implemented.

Location:

trunk

Files:

• libtransmission/quark.c (modified) (1 diff)
• libtransmission/quark.h (modified) (1 diff)
• qt/app.cc (modified) (3 diffs)
• qt/prefs-dialog.cc (modified) (1 diff)
• qt/prefs.cc (modified) (5 diffs)
• qt/prefs.h (modified) (2 diffs)

trunk/libtransmission/quark.c

@@ -310 +310 @@
   { "sessionCount", 12 },
   { "show-backup-trackers", 20 },
-  { "show-desktop-notification", 25 },
   { "show-extra-peer-details", 23 },
   { "show-filterbar", 14 },

trunk/libtransmission/quark.h

@@ -320 +320 @@
   TR_KEY_sessionCount,
   TR_KEY_show_backup_trackers,
-  TR_KEY_show_desktop_notification,
   TR_KEY_show_extra_peer_details,
   TR_KEY_show_filterbar,

trunk/qt/app.cc

@@ -23 +23 @@
 #include <QLabel>
 #include <QLibraryInfo>
+#include <QProcess>
 #include <QRect>
 
@@ -260 +261 @@
 MyApp :: onTorrentsAdded( QSet<int> torrents )
 {
-    if( !myPrefs->getBool( Prefs::SHOW_DESKTOP_NOTIFICATION ) )
+    if( !myPrefs->getBool( Prefs::SHOW_NOTIFICATION_ON_ADD ) )
         return;
 
@@ -280 +281 @@
 MyApp :: onTorrentCompleted( int id )
 {
-    Torrent * tor = myModel->getTorrentFromId( id );
-
-    if( tor && !tor->name().isEmpty() )
-    {
-        notify( tr( "Torrent Completed" ), tor->name( ) );
-
-        disconnect( tor, SIGNAL(torrentCompleted(int)), this, SLOT(onTorrentCompleted(int)) );
+  Torrent * tor = myModel->getTorrentFromId (id);
+
+  if (tor)
+    {
+      if (myPrefs->getBool (Prefs::SHOW_NOTIFICATION_ON_COMPLETE))
+        notify (tr("Torrent Completed"), tor->name());
+
+      if (myPrefs->getBool (Prefs::COMPLETE_SOUND_ENABLED))
+        QProcess::execute (myPrefs->getString(Prefs::COMPLETE_SOUND_COMMAND));
+
+      disconnect( tor, SIGNAL(torrentCompleted(int)), this, SLOT(onTorrentCompleted(int)) );
     }
 }

trunk/qt/prefs-dialog.cc

@@ -300 +300 @@
     hig->addSectionTitle( tr( "Desktop" ) );
 
-    hig->addWideControl( checkBoxNew( tr( "Show Transmission icon in the &notification area" ), Prefs::SHOW_TRAY_ICON ) );
-    hig->addWideControl( checkBoxNew( tr( "Start &minimized in notification area" ), Prefs::START_MINIMIZED ) );
-    hig->addWideControl( checkBoxNew( tr( "Show &popup notifications" ), Prefs::SHOW_DESKTOP_NOTIFICATION ) );
+      hig->addWideControl( checkBoxNew( tr( "Show Transmission icon in the &notification area" ), Prefs::SHOW_TRAY_ICON ) );
+      hig->addWideControl( checkBoxNew( tr( "Start &minimized in notification area" ), Prefs::START_MINIMIZED ) );
+
+    hig->addSectionDivider( );
+    hig->addSectionTitle( tr ("Notification") );
+
+      hig->addWideControl( checkBoxNew( tr( "Show a notification when torrents are a&dded" ), Prefs::SHOW_NOTIFICATION_ON_ADD ) );
+      hig->addWideControl( checkBoxNew( tr( "Show a notification when torrents &finish" ), Prefs::SHOW_NOTIFICATION_ON_COMPLETE ) );
+      hig->addWideControl( checkBoxNew( tr( "Play a &sound when torrents finish" ), Prefs::COMPLETE_SOUND_ENABLED ) );
 
     hig->finish( );

trunk/qt/prefs.cc

@@ -39 +39 @@
   { SHOW_TRAY_ICON, TR_KEY_show_notification_area_icon, QVariant::Bool },
   { START_MINIMIZED, TR_KEY_start_minimized, QVariant::Bool },
-  { SHOW_DESKTOP_NOTIFICATION, TR_KEY_show_desktop_notification, QVariant::Bool },
+  { SHOW_NOTIFICATION_ON_ADD, TR_KEY_torrent_added_notification_enabled, QVariant::Bool },
+  { SHOW_NOTIFICATION_ON_COMPLETE, TR_KEY_torrent_complete_notification_enabled, QVariant::Bool },
   { ASKQUIT, TR_KEY_prompt_before_exit, QVariant::Bool },
   { SORT_MODE, TR_KEY_sort_mode, TrTypes::SortModeType },
@@ -66 +67 @@
   { SESSION_REMOTE_USERNAME, TR_KEY_remote_session_username, QVariant::String },
   { SESSION_REMOTE_PASSWORD, TR_KEY_remote_session_password, QVariant::String },
+  { COMPLETE_SOUND_COMMAND, TR_KEY_torrent_complete_sound_command, QVariant::String },
+  { COMPLETE_SOUND_ENABLED, TR_KEY_torrent_complete_sound_enabled, QVariant::Bool },
   { USER_HAS_GIVEN_INFORMED_CONSENT, TR_KEY_user_has_given_informed_consent, QVariant::Bool },
 
@@ -276 +279 @@
 Prefs :: initDefaults (tr_variant * d)
 {
-  tr_variantDictReserve (d, 35);
+  tr_variantDictReserve (d, 38);
   tr_variantDictAddBool (d, TR_KEY_blocklist_updates_enabled, true);
   tr_variantDictAddBool (d, TR_KEY_compact_view, false);
@@ -284 +287 @@
   tr_variantDictAddBool (d, TR_KEY_remote_session_requres_authentication, false);
   tr_variantDictAddBool (d, TR_KEY_show_backup_trackers, false);
-  tr_variantDictAddBool (d, TR_KEY_show_desktop_notification, true);
   tr_variantDictAddBool (d, TR_KEY_show_extra_peer_details, false),
   tr_variantDictAddBool (d, TR_KEY_show_filterbar, true);
@@ -294 +296 @@
   tr_variantDictAddBool (d, TR_KEY_show_tracker_scrapes, false);
   tr_variantDictAddBool (d, TR_KEY_sort_reversed, false);
+  tr_variantDictAddBool (d, TR_KEY_torrent_added_notification_enabled, true);
+  tr_variantDictAddBool (d, TR_KEY_torrent_complete_notification_enabled, true);
+  tr_variantDictAddStr  (d, TR_KEY_torrent_complete_sound_command, "canberra-gtk-play -i complete-download -d 'transmission torrent downloaded'");
+  tr_variantDictAddBool (d, TR_KEY_torrent_complete_sound_enabled, true);
   tr_variantDictAddBool (d, TR_KEY_user_has_given_informed_consent, false);
   tr_variantDictAddBool (d, TR_KEY_watch_dir_enabled, false);

trunk/qt/prefs.h

@@ -45 +45 @@
             SHOW_TRAY_ICON,
             START_MINIMIZED,
-            SHOW_DESKTOP_NOTIFICATION,
+            SHOW_NOTIFICATION_ON_ADD,
+            SHOW_NOTIFICATION_ON_COMPLETE,
             ASKQUIT,
             SORT_MODE,
@@ -72 +73 @@
             SESSION_REMOTE_USERNAME,
             SESSION_REMOTE_PASSWORD,
+            COMPLETE_SOUND_COMMAND,
+            COMPLETE_SOUND_ENABLED,
             USER_HAS_GIVEN_INFORMED_CONSENT,