Changeset 5583

Timestamp:

Apr 11, 2008, 2:21:33 AM (15 years ago)

Author:

charles

Message:

(gtk) #859: No way of opening target folder of torrent

Location:

trunk/gtk

Files:

• actions.c (modified) (2 diffs)
• main.c (modified) (3 diffs)
• notify.c (modified) (2 diffs)
• tr-torrent.c (modified) (1 diff)
• tr-torrent.h (modified) (1 diff)
• ui.h (modified) (2 diffs)
• util.c (modified) (1 diff)
• util.h (modified) (1 diff)

trunk/gtk/actions.c

@@ -102 +102 @@
   { "help-menu", NULL, N_("_Help"), NULL, NULL, NULL },
   { "add-torrent-toolbar", GTK_STOCK_ADD, NULL, NULL, N_("Add a torrent"), G_CALLBACK(action_cb) },
-  { "add-torrent-menu", GTK_STOCK_ADD, N_("_Add..."), NULL, N_("Add a torrent"), G_CALLBACK(action_cb) },
+  { "add-torrent-menu", GTK_STOCK_ADD, N_("_Add..."), "<control>D", N_("Add a torrent"), G_CALLBACK(action_cb) },
   { "start-torrent", GTK_STOCK_MEDIA_PLAY,
     N_("_Start"), "<control>S", N_("Start torrent"), G_CALLBACK(action_cb) },
@@ -126 +126 @@
   { "show-torrent-details", GTK_STOCK_INFO,
     N_("_Details"), "<alt>Return", N_("Torrent details"), G_CALLBACK(action_cb) },
+  { "open-torrent-folder", GTK_STOCK_OPEN,
+    N_("_Open Folder"), NULL, NULL, G_CALLBACK(action_cb) },
   { "show-about-dialog", GTK_STOCK_ABOUT, NULL, NULL, NULL, G_CALLBACK(action_cb) },
   { "update-tracker", GTK_STOCK_NETWORK,

trunk/gtk/main.c

@@ -200 +200 @@
     action_sensitize( "delete-torrent", counts.totalCount!=0 );
     action_sensitize( "verify-torrent", counts.totalCount!=0 );
+    action_sensitize( "open-torrent-folder", counts.totalCount==1 );
     action_sensitize( "show-torrent-details", counts.totalCount==1 );
 
@@ -936 +937 @@
 
 static void
+openFolderForeach( GtkTreeModel * model,
+                   GtkTreePath  * path UNUSED,
+                   GtkTreeIter  * iter,
+                   gpointer       user_data UNUSED )
+{
+    TrTorrent * gtor = NULL;
+    gtk_tree_model_get( model, iter, MC_TORRENT, &gtor, -1 );
+    tr_torrent_open_folder( gtor );
+    g_object_unref( G_OBJECT( gtor ) );
+}
+
+static void
 showInfoForeach (GtkTreeModel * model,
                  GtkTreePath  * path UNUSED,
@@ -1040 +1053 @@
         gtk_tree_selection_selected_foreach( s, recheckTorrentForeach, NULL );
         changed |= gtk_tree_selection_count_selected_rows( s ) != 0;
+    }
+    else if (!strcmp (action_name, "open-torrent-folder"))
+    {
+        GtkTreeSelection * s = tr_window_get_selection(data->wind);
+        gtk_tree_selection_selected_foreach( s, openFolderForeach, data );
     }
     else if (!strcmp (action_name, "show-torrent-details"))

trunk/gtk/notify.c

@@ -16 +16 @@
 #include <glib/gi18n.h>
 #include "notify.h"
+#include "util.h"
 
 #ifndef HAVE_LIBNOTIFY
@@ -37 +38 @@
 {
     TrTorrent * gtor = TR_TORRENT( gdata );
-    tr_torrent * tor = tr_torrent_handle( gtor );
-    const tr_info * info = tr_torrent_info( gtor );
-    char * path = NULL;
 
     if( !strcmp( action, "folder" ) )
     {
-        if( info->fileCount == 1 )
-        {
-            path = g_build_filename( tr_torrentGetFolder(tor), NULL );
-        }
-        else
-        {
-            path = g_build_filename( tr_torrentGetFolder(tor), info->name, NULL );
-        }
+        tr_torrent_open_folder( gtor );
     }
     else if( !strcmp( action, "file" ) )
     {
-        path = g_build_filename( tr_torrentGetFolder(tor), info->files[0].name, NULL );
-    }
-
-    if( path )
-    {
-        gboolean opened = FALSE;
-#ifdef HAVE_GIO
-        GFile * file = g_file_new_for_path( path );
-        char * uri = g_file_get_uri( file );
-        opened = g_app_info_launch_default_for_uri( uri, NULL, NULL );
-        g_free( uri );
-        g_object_unref( G_OBJECT( file ) );
-#endif
-        if( !opened ) {
-            char * argv[] = { "xdg-open", path, NULL }; 
-            g_spawn_async( NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL );
-        }
-        g_free( path ); 
+        tr_torrent * tor = tr_torrent_handle( gtor );
+        const tr_info * info = tr_torrent_info( gtor );
+        char * path = g_build_filename( tr_torrentGetFolder(tor), info->files[0].name, NULL );
+        gtr_open_file( path );
+        g_free( path );
     }
 }

trunk/gtk/tr-torrent.c

@@ -345 +345 @@
     }
 }
+
+void
+tr_torrent_open_folder( TrTorrent * gtor )
+{
+    tr_torrent * tor = tr_torrent_handle( gtor );
+    const tr_info * info = tr_torrent_info( gtor );
+    char * path = info->fileCount == 1
+        ? g_build_filename( tr_torrentGetFolder(tor), NULL )
+        : g_build_filename( tr_torrentGetFolder(tor), info->name, NULL );
+    gtr_open_file( path );
+    g_free( path );
+}

trunk/gtk/tr-torrent.h

@@ -81 +81 @@
 
 void
+tr_torrent_open_folder( TrTorrent * tor );
+
+void
 tr_torrent_check_seeding_cap ( TrTorrent* );
 void

trunk/gtk/ui.h

@@ -6 +6 @@
 "      <menuitem action='new-torrent'/>\n"
 "      <separator/>\n"
+"      <menuitem action='show-torrent-details'/>\n"
+"      <menuitem action='open-torrent-folder'/>\n"
+"      <separator/>\n"
 "      <menuitem action='start-torrent'/>\n"
 "      <menuitem action='update-tracker'/>\n"
 "      <menuitem action='pause-torrent'/>\n"
 "      <menuitem action='verify-torrent'/>\n"
-"      <menuitem action='show-torrent-details'/>\n"
 "      <menuitem action='remove-torrent'/>\n"
 "      <menuitem action='delete-torrent'/>\n"
@@ -58 +60 @@
 "  <popup name='main-window-popup'>\n"
 "    <menuitem action='show-torrent-details'/>\n"
+"    <menuitem action='open-torrent-folder'/>\n"
 "    <separator/>\n"
 "    <menuitem action='start-torrent'/>\n"

trunk/gtk/util.c

@@ -437 +437 @@
     }
 }
+
+void
+gtr_open_file( const char * path )
+{
+    if( path )
+    {
+        gboolean opened = FALSE;
+#ifdef HAVE_GIO
+        if( !opened )
+        {
+            GFile * file = g_file_new_for_path( path );
+            char * uri = g_file_get_uri( file );
+            opened = g_app_info_launch_default_for_uri( uri, NULL, NULL );
+            g_free( uri );
+            g_object_unref( G_OBJECT( file ) );
+        }
+#endif
+        if( !opened )
+        {
+            char * argv[] = { "xdg-open", (char*)path, NULL };
+            g_spawn_async( NULL, argv, NULL, G_SPAWN_SEARCH_PATH,
+                           NULL, NULL, NULL, NULL );
+        }
+    }
+}

trunk/gtk/util.h

@@ -84 +84 @@
 getdownloaddir( void );
 
+void gtr_open_file( const char * path );
+
 #ifdef GTK_MAJOR_VERSION