Changeset 9631

Timestamp:

Nov 29, 2009, 6:23:06 PM (13 years ago)

Author:

charles

Message:

(trunk gtk) #2625: "ability to create a manget link" -- remove the magnet link from the properties dialog; add a "Copy _Magnet Link to Clipboard" menu & context menu item instead

Location:

trunk/gtk

Files:

• actions.c (modified) (2 diffs)
• details.c (modified) (4 diffs)
• main.c (modified) (3 diffs)
• ui.h (modified) (3 diffs)

trunk/gtk/actions.c

@@ -109 +109 @@
     { "edit-menu", NULL, N_( "_Edit" ), NULL, NULL, NULL },
     { "help-menu", NULL, N_( "_Help" ), NULL, NULL, NULL },
+    { "copy-magnet-link-to-clipboard",  GTK_STOCK_COPY, N_("Copy _Magnet Link to Clipboard" ), "<control>M", NULL,  G_CALLBACK( action_cb ) },
     { "add-torrent-from-url",  GTK_STOCK_ADD, N_("Add _URL..." ), NULL, N_( "Add URL..." ),  G_CALLBACK( action_cb ) },
     { "add-torrent-toolbar",  GTK_STOCK_ADD, NULL, NULL, N_( "Add a torrent" ),  G_CALLBACK( action_cb ) },
@@ -115 +116 @@
     { "show-stats", NULL, N_( "_Statistics" ), NULL, NULL, G_CALLBACK( action_cb ) },
     { "donate", NULL, N_( "_Donate" ), NULL, NULL, G_CALLBACK( action_cb ) },
-    { "verify-torrent", NULL, N_( "_Verify Local Data" ), NULL, NULL, G_CALLBACK( action_cb ) },
+    { "verify-torrent", NULL, N_( "_Verify Local Data" ), "<control>V", NULL, G_CALLBACK( action_cb ) },
     { "pause-torrent", GTK_STOCK_MEDIA_PAUSE, N_( "_Pause" ), "<control>P", N_( "Pause torrent" ), G_CALLBACK( action_cb ) },
     { "pause-all-torrents", GTK_STOCK_MEDIA_PAUSE, N_( "_Pause All" ), NULL, N_( "Pause all torrents" ), G_CALLBACK( action_cb ) },

trunk/gtk/details.c

@@ -77 +77 @@
 
     GtkWidget * hash_lb;
-    GtkWidget * magnet_lb;
     GtkWidget * privacy_lb;
     GtkWidget * origin_lb;
@@ -621 +620 @@
 {
     int i;
-    char * freeme;
     const char * str;
     const char * none = _( "None" );
@@ -887 +885 @@
         str = mixed;
     gtr_label_set_text( GTK_LABEL( di->hash_lb ), str );
-
-    /* magnet lb */
-    freeme = NULL;
-    if( n<=0 )
-        str = none;
-    else if ( n>1 )
-        str = mixed;
-    else if( infos[0]->isPrivate )
-        str = _( "Private Torrent" );
-    else
-        str = freeme = tr_torrentGetMagnetLink( torrents[0] );
-    gtr_label_set_text( GTK_LABEL( di->magnet_lb ), str );
-    tr_free( freeme );
 
     /* error */
@@ -1014 +999 @@
         hig_workarea_add_row( t, &row, _( "Hash:" ), l, NULL );
         di->hash_lb = l;
-
-        /* magnet url */
-        l = g_object_new( GTK_TYPE_LABEL, "selectable", TRUE,
-                                          "ellipsize", PANGO_ELLIPSIZE_END,
-                                           NULL );
-        hig_workarea_add_row( t, &row, _( "Magnet link:" ), l, NULL );
-        di->magnet_lb = l;
 
         /* privacy */

trunk/gtk/main.c

@@ -180 +180 @@
     action_sensitize( "open-torrent-folder", counts.totalCount == 1 );
     action_sensitize( "relocate-torrent", counts.totalCount == 1 );
+    action_sensitize( "copy-magnet-link-to-clipboard", counts.totalCount == 1 );
 
     canUpdate = 0;
@@ -1344 +1345 @@
 }
 
+static void
+copyMagnetLinkToClipboard( GtkWidget * w, tr_torrent * tor )
+{
+    char * magnet = tr_torrentGetMagnetLink( tor );
+    GdkDisplay * display = gtk_widget_get_display( w );
+    GdkAtom selection = GDK_SELECTION_CLIPBOARD;
+    GtkClipboard * clipboard = gtk_clipboard_get_for_display( display, selection );
+    gtk_clipboard_set_text( clipboard, magnet, -1 );
+    tr_free( magnet );
+}
+
 void
 doAction( const char * action_name, gpointer user_data )
@@ -1382 +1394 @@
         startAllTorrents( data );
     }
+    else if( !strcmp( action_name, "copy-magnet-link-to-clipboard" ) )
+    {
+        tr_torrent * tor = getFirstSelectedTorrent( data );
+        if( tor != NULL )
+        {
+            copyMagnetLinkToClipboard( GTK_WIDGET( data->wind ), tor );
+        }
+    }
     else if( !strcmp( action_name, "relocate-torrent" ) )
     {
         tr_torrent * tor = getFirstSelectedTorrent( data );
-        if( tor )
+        if( tor != NULL )
         {
             GtkWindow * parent = GTK_WINDOW( data->wind );

trunk/gtk/ui.h

@@ -20 +20 @@
     "    <menu action='torrent-menu'>\n"
     "      <menuitem action='show-torrent-properties'/>\n"
-    "      <menuitem action='open-torrent-folder'/>\n"
-    "      <menuitem action='relocate-torrent'/>\n"
     "      <separator/>\n"
     "      <menuitem action='start-torrent'/>\n"
     "      <menuitem action='update-tracker'/>\n"
     "      <menuitem action='pause-torrent'/>\n"
+    "      <menuitem action='copy-magnet-link-to-clipboard'/>\n"
+    "      <separator/>\n"
+    "      <menuitem action='open-torrent-folder'/>\n"
+    "      <menuitem action='relocate-torrent'/>\n"
     "      <menuitem action='verify-torrent'/>\n"
     "      <separator/>\n"
@@ -72 +74 @@
     "  <popup name='main-window-popup'>\n"
     "    <menuitem action='show-torrent-properties'/>\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"
     "    <separator/>\n"
     "    <menu action='sort-menu'>\n"
@@ -93 +89 @@
     "    </menu>\n"
     "    <separator/>\n"
+    "    <menuitem action='start-torrent'/>\n"
+    "    <menuitem action='update-tracker'/>\n"
+    "    <menuitem action='pause-torrent'/>\n"
+    "    <menuitem action='copy-magnet-link-to-clipboard'/>\n"
+    "    <separator/>\n"
+    "    <menuitem action='open-torrent-folder'/>\n"
+    "    <menuitem action='verify-torrent'/>\n"
     "    <menuitem action='relocate-torrent'/>\n"
     "    <separator/>\n"