Changeset 11720

Timestamp:

Jan 20, 2011, 7:48:13 PM (12 years ago)

Author:

jordan

Message:

(trunk) #3926: use "Open Torrent" instead of "Add Torrent" in GTK+ and Qt clients -- text changed.

Location:

trunk

Files:

• gtk/actions.c (modified) (1 diff)
• gtk/add-dialog.c (modified) (17 diffs)
• gtk/add-dialog.h (modified) (1 diff)
• gtk/main.c (modified) (1 diff)
• gtk/tr-window.c (modified) (1 diff)
• gtk/ui.h (modified) (3 diffs)
• qt/mainwin.cc (modified) (4 diffs)
• qt/mainwin.ui (modified) (5 diffs)
• qt/options.cc (modified) (3 diffs)
• qt/qtr.pro (modified) (1 diff)

trunk/gtk/actions.c

@@ -108 +108 @@
     { "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 ) },
-    { "add-torrent-menu", GTK_STOCK_ADD, N_( "_Add File..." ), "<control>D", N_( "Add a torrent" ), G_CALLBACK( action_cb ) },
+    { "open-torrent-from-url",  GTK_STOCK_OPEN, N_("Open _URL..." ), "<control>U", N_( "Open URL..." ),  G_CALLBACK( action_cb ) },
+    { "open-torrent-toolbar",  GTK_STOCK_OPEN, NULL, NULL, N_( "Open a torrent" ),  G_CALLBACK( action_cb ) },
+    { "open-torrent-menu", GTK_STOCK_OPEN, NULL, NULL, N_( "Open a torrent" ), G_CALLBACK( action_cb ) },
     { "start-torrent", GTK_STOCK_MEDIA_PLAY, N_( "_Start" ), "<control>S", N_( "Start torrent" ), G_CALLBACK( action_cb ) },
     { "show-stats", NULL, N_( "_Statistics" ), NULL, NULL, G_CALLBACK( action_cb ) },

trunk/gtk/add-dialog.c

@@ -87 +87 @@
 ****/
 
-struct AddData
+struct OpenData
 {
     TrCore *     core;
@@ -101 +101 @@
 
 static void
-removeOldTorrent( struct AddData * data )
+removeOldTorrent( struct OpenData * data )
 {
     if( data->gtor )
@@ -117 +117 @@
                gpointer    gdata )
 {
-    struct AddData * data = gdata;
+    struct OpenData * data = gdata;
 
     if( data->gtor )
@@ -151 +151 @@
 
 static void
-updateTorrent( struct AddData * o )
+updateTorrent( struct OpenData * o )
 {
     const gboolean isLocalFile = tr_ctorGetSourceFile( o->ctor ) != NULL;
@@ -181 +181 @@
 sourceChanged( GtkFileChooserButton * b, gpointer gdata )
 {
-    struct AddData * data = gdata;
+    struct OpenData * data = gdata;
     char * filename = gtk_file_chooser_get_filename( GTK_FILE_CHOOSER( b ) );
 
@@ -222 +222 @@
 downloadDirChanged( GtkFileChooserButton * b, gpointer gdata )
 {
-    struct AddData * data = gdata;
+    struct OpenData * data = gdata;
     char * fname = gtk_file_chooser_get_filename( GTK_FILE_CHOOSER( b ) );
 
@@ -267 +267 @@
     GtkWidget *      grab;
     GtkWidget *      source_chooser;
-    struct AddData * data;
+    struct OpenData * data;
     uint8_t          flag;
     GSList *         list;
@@ -277 +277 @@
                                      NULL );
     gtk_dialog_add_button( GTK_DIALOG( d ), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL );
-    grab = gtk_dialog_add_button( GTK_DIALOG( d ), GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT );
+    grab = gtk_dialog_add_button( GTK_DIALOG( d ), GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT );
     gtk_dialog_set_default_response( GTK_DIALOG( d ),
                                      GTK_RESPONSE_ACCEPT );
@@ -289 +289 @@
     g_assert( str );
 
-    data = g_new0( struct AddData, 1 );
+    data = g_new0( struct OpenData, 1 );
     data->core = core;
     data->ctor = ctor;
@@ -394 +394 @@
 
 static void
-onAddDialogResponse( GtkDialog * dialog,
-                     int         response,
-                     gpointer    core )
+onOpenDialogResponse( GtkDialog * dialog, int response, gpointer core )
 {
     char * folder;
@@ -422 +420 @@
 
 GtkWidget*
-gtr_torrent_add_from_file_dialog_new( GtkWindow * parent, TrCore * core )
+gtr_torrent_open_from_file_dialog_new( GtkWindow * parent, TrCore * core )
 {
     GtkWidget *  w;
@@ -428 +426 @@
     const char * folder;
 
-    w = gtk_file_chooser_dialog_new( _( "Add a Torrent" ), parent,
+    w = gtk_file_chooser_dialog_new( _( "Open a Torrent" ), parent,
                                      GTK_FILE_CHOOSER_ACTION_OPEN,
                                      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                     GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT,
+                                     GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
                                      NULL );
     gtk_dialog_set_alternative_button_order( GTK_DIALOG( w ),
@@ -439 +437 @@
     gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( w ), TRUE );
     addTorrentFilters( GTK_FILE_CHOOSER( w ) );
-    g_signal_connect( w, "response", G_CALLBACK(
-                          onAddDialogResponse ), core );
+    g_signal_connect( w, "response", G_CALLBACK( onOpenDialogResponse ), core );
 
     if( ( folder = gtr_pref_string_get( PREF_KEY_OPEN_DIALOG_FOLDER ) ) )
@@ -459 +456 @@
 
 static void
-onAddURLResponse( GtkDialog * dialog, int response, gpointer user_data )
+onOpenURLResponse( GtkDialog * dialog, int response, gpointer user_data )
 {
     gboolean destroy = TRUE;
@@ -493 +490 @@
 
 GtkWidget*
-gtr_torrent_add_from_url_dialog_new( GtkWindow * parent, TrCore * core )
+gtr_torrent_open_from_url_dialog_new( GtkWindow * parent, TrCore * core )
 {
     int row;
@@ -500 +497 @@
     GtkWidget * w;
 
-    w = gtk_dialog_new_with_buttons( _( "Add URL" ), parent,
+    w = gtk_dialog_new_with_buttons( _( "Open URL" ), parent,
                                      GTK_DIALOG_DESTROY_WITH_PARENT,
                                      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                     GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT,
+                                     GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
                                      NULL );
     gtk_dialog_set_alternative_button_order( GTK_DIALOG( w ),
@@ -509 +506 @@
                                              GTK_RESPONSE_CANCEL,
                                              -1 );
-    g_signal_connect( w, "response", G_CALLBACK( onAddURLResponse ), core );
+    g_signal_connect( w, "response", G_CALLBACK( onOpenURLResponse ), core );
 
     row = 0;
     t = hig_workarea_create( );
-    hig_workarea_add_section_title( t, &row, _( "Add torrent from URL" ) );
+    hig_workarea_add_section_title( t, &row, _( "Open torrent from URL" ) );
     e = gtk_entry_new( );
     gtk_widget_set_size_request( e, 400, -1 );

trunk/gtk/add-dialog.h

@@ -11 +11 @@
  */
 
-#ifndef GTR_ADD_DIALOG_H
-#define GTR_ADD_DIALOG_H
+#ifndef GTR_OPEN_DIALOG_H
+#define GTR_OPEN_DIALOG_H
 
 #include <gtk/gtk.h>
 #include "tr-core.h"
 
-GtkWidget* gtr_torrent_add_from_url_dialog_new ( GtkWindow * parent, TrCore * core );
-GtkWidget* gtr_torrent_add_from_file_dialog_new( GtkWindow * parent, TrCore * core );
+GtkWidget* gtr_torrent_open_from_url_dialog_new ( GtkWindow * parent, TrCore * core );
+GtkWidget* gtr_torrent_open_from_file_dialog_new( GtkWindow * parent, TrCore * core );
 
 /* This dialog assumes ownership of the ctor */

trunk/gtk/main.c

@@ -1703 +1703 @@
     gboolean        changed = FALSE;
 
-    if( !strcmp( action_name, "add-torrent-from-url" ) )
-    {
-        GtkWidget * w = gtr_torrent_add_from_url_dialog_new( data->wind, data->core );
+    if( !strcmp( action_name, "open-torrent-from-url" ) )
+    {
+        GtkWidget * w = gtr_torrent_open_from_url_dialog_new( data->wind, data->core );
         gtk_widget_show( w );
     }
-    else if(  !strcmp( action_name, "add-torrent-menu" )
-      || !strcmp( action_name, "add-torrent-toolbar" ) )
-    {
-        GtkWidget * w = gtr_torrent_add_from_file_dialog_new( data->wind, data->core );
+    else if(  !strcmp( action_name, "open-torrent-menu" )
+      || !strcmp( action_name, "open-torrent-toolbar" ) )
+    {
+        GtkWidget * w = gtr_torrent_open_from_file_dialog_new( data->wind, data->core );
         gtk_widget_show( w );
     }

trunk/gtk/tr-window.c

@@ -608 +608 @@
     /* toolbar */
     toolbar = p->toolbar = gtr_action_get_widget( "/main-window-toolbar" );
-    gtr_action_set_important( "add-torrent-toolbar", TRUE );
+    gtr_action_set_important( "open-torrent-toolbar", TRUE );
     gtr_action_set_important( "show-torrent-properties", TRUE );
 

trunk/gtk/ui.h

@@ -3 +3 @@
     "  <menubar name='main-window-menu'>\n"
     "    <menu action='file-menu'>\n"
-    "      <menuitem action='add-torrent-menu'/>\n"
-    "      <menuitem action='add-torrent-from-url'/>\n"
+    "      <menuitem action='open-torrent-menu'/>\n"
+    "      <menuitem action='open-torrent-from-url'/>\n"
     "      <menuitem action='new-torrent'/>\n"
     "      <separator/>\n"
@@ -63 +63 @@
     "\n"
     "  <toolbar name='main-window-toolbar'>\n"
-    "    <toolitem action='add-torrent-toolbar'/>\n"
+    "    <toolitem action='open-torrent-toolbar'/>\n"
     "    <toolitem action='start-torrent'/>\n"
     "    <toolitem action='pause-torrent'/>\n"
@@ -103 +103 @@
     "    <menuitem action='toggle-main-window'/>\n"
     "    <separator/>\n"
-    "    <menuitem action='add-torrent-menu'/>\n"
-    "    <menuitem action='add-torrent-from-url'/>\n"
+    "    <menuitem action='open-torrent-menu'/>\n"
+    "    <menuitem action='open-torrent-from-url'/>\n"
     "    <separator/>\n"
     "    <menuitem action='pause-all-torrents'/>\n"

trunk/qt/mainwin.cc

@@ -105 +105 @@
 
     // icons
-    ui.action_AddFile->setIcon( getStockIcon( "list-add", QStyle::SP_DialogOpenButton ) );
+    ui.action_OpenFile->setIcon( getStockIcon( "folder-open", QStyle::SP_DialogOpenButton ) );
     ui.action_New->setIcon( getStockIcon( "document-new", QStyle::SP_DesktopIcon ) );
     ui.action_Properties->setIcon( getStockIcon( "document-properties", QStyle::SP_DesktopIcon ) );
@@ -145 +145 @@
     connect( ui.action_StartAll, SIGNAL(triggered()), this, SLOT(startAll()));
     connect( ui.action_PauseAll, SIGNAL(triggered()), this, SLOT(pauseAll()));
-    connect( ui.action_AddFile, SIGNAL(triggered()), this, SLOT(openTorrent()));
+    connect( ui.action_OpenFile, SIGNAL(triggered()), this, SLOT(openTorrent()));
     connect( ui.action_AddURL, SIGNAL(triggered()), this, SLOT(openURL()));
     connect( ui.action_New, SIGNAL(triggered()), this, SLOT(newTorrent()));
@@ -215 +215 @@
 
     QMenu * menu = new QMenu( );
-    menu->addAction( ui.action_AddFile );
+    menu->addAction( ui.action_OpenFile );
     menu->addAction( ui.action_AddURL );
     menu->addSeparator( );
@@ -1028 +1028 @@
     QFileDialog * myFileDialog;
     myFileDialog = new QFileDialog( this,
-                                    tr( "Add Torrent" ),
+                                    tr( "Open Torrent" ),
                                     myPrefs.getString( Prefs::OPEN_DIALOG_FOLDER ),
                                     tr( "Torrent Files (*.torrent);;All Files (*.*)" ) );

trunk/qt/mainwin.ui

@@ -127 +127 @@
      <string>&amp;File</string>
     </property>
-    <addaction name="action_AddFile"/>
+    <addaction name="action_OpenFile"/>
     <addaction name="action_AddURL"/>
     <addaction name="action_New"/>
@@ -170 +170 @@
     <bool>false</bool>
    </attribute>
-   <addaction name="action_AddFile"/>
+   <addaction name="action_OpenFile"/>
    <addaction name="action_Start"/>
    <addaction name="action_Pause"/>
@@ -177 +177 @@
    <addaction name="action_Properties"/>
   </widget>
-  <action name="action_AddFile">
-   <property name="text">
-    <string>&amp;Add File...</string>
+  <action name="action_OpenFile">
+   <property name="text">
+    <string>&amp;Open...</string>
    </property>
    <property name="iconText">
-    <string>Add</string>
-   </property>
-   <property name="toolTip">
-    <string>Add a torrent</string>
+    <string>Open</string>
+   </property>
+   <property name="toolTip">
+    <string>Open a torrent</string>
    </property>
    <property name="shortcut">
@@ -267 +267 @@
     <string>Verify local data</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+V</string>
+   </property>
   </action>
   <action name="action_Remove">
@@ -574 +577 @@
   <action name="action_AddURL">
    <property name="text">
-    <string>Add &amp;URL...</string>
+    <string>Open &amp;URL...</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+U</string>
    </property>
   </action>

trunk/qt/options.cc

@@ -88 +88 @@
 
 {
-    setWindowTitle( tr( "Add Torrent" ) );
+    setWindowTitle( tr( "Open Torrent" ) );
     QFontMetrics fontMetrics( font( ) );
     QGridLayout * layout = new QGridLayout( this );
@@ -160 +160 @@
     layout->addWidget( c, ++row, 0, 1, 2, Qt::AlignLeft );
 
-    QDialogButtonBox * b = new QDialogButtonBox( QDialogButtonBox::Ok|QDialogButtonBox::Cancel, Qt::Horizontal, this );
+    QDialogButtonBox * b = new QDialogButtonBox( QDialogButtonBox::Open|QDialogButtonBox::Cancel, Qt::Horizontal, this );
     connect( b, SIGNAL(rejected()), this, SLOT(deleteLater()) );
     connect( b, SIGNAL(accepted()), this, SLOT(onAccepted()) );
@@ -402 +402 @@
     {
         QFileDialog * d = new QFileDialog( this,
-                                           tr( "Add Torrent" ),
+                                           tr( "Open Torrent" ),
                                            QFileInfo(myAdd.filename).absolutePath(),
                                            tr( "Torrent Files (*.torrent);;All Files (*.*)" ) );

trunk/qt/qtr.pro

@@ -17 +17 @@
 
 # if you have libevent2 installed in a custom path, specify it here
-EVENT_TOP = /usr
+EVENT_TOP = /home/charles/opt/libevent
 INCLUDEPATH = $${EVENT_TOP}/include $${INCLUDEPATH}