GNOME.org
 

[frogr] Adjusted some accelerators, shortcuts and names for menu items

commit 2386c8f906070fa6ec6de113d0b9ee5b5be53e50
Author: Mario Sanchez Prada <msanchez gnome org>
Date:   Tue Nov 27 10:30:48 2012 +0100

    Adjusted some accelerators, shortcuts and names for menu items

 data/gtkbuilder/frogr-main-view.xml |   22 +++++++++++-----------
 data/gtkbuilder/frogr-menu-bar.xml  |   27 ++++++++++++++-------------
 src/frogr-main-view.c               |   12 ++++++------
 3 files changed, 31 insertions(+), 30 deletions(-)
---
diff --git a/data/gtkbuilder/frogr-main-view.xml b/data/gtkbuilder/frogr-main-view.xml
index 4ec6b58..9200b4d 100644
--- a/data/gtkbuilder/frogr-main-view.xml
+++ b/data/gtkbuilder/frogr-main-view.xml
@@ -4,7 +4,7 @@
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkActionGroup" id="file-actions">
     <child>
-      <object class="GtkAction" id="load-pictures">
+      <object class="GtkAction" id="add-pictures">
         <signal name="activate" handler="_on_gtk_action_activated" swapped="no"/>
       </object>
     </child>
@@ -77,7 +77,7 @@
         <property name="related_action">edit-details</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Edit _Detailsâ</property>
+        <property name="label" translatable="yes">_Edit Detailsâ</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -106,29 +106,29 @@
         <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Add to _Set</property>
+        <property name="label" translatable="yes">Add to _Photoset</property>
         <property name="use_underline">True</property>
         <child type="submenu">
           <object class="GtkMenu" id="menu8">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
-              <object class="GtkMenuItem" id="create_new_set_ctxt_menu_item">
+              <object class="GtkMenuItem" id="add_to_existing_set_ctxt_menu_item">
                 <property name="use_action_appearance">False</property>
-                <property name="related_action">add-to-new-set</property>
+                <property name="related_action">add-to-set</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Create New Setâ</property>
+                <property name="label" translatable="yes">_Add to Existing Photosetâ</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
             <child>
-              <object class="GtkMenuItem" id="add_to_existing_set_ctxt_menu_item">
+              <object class="GtkMenuItem" id="create_new_set_ctxt_menu_item">
                 <property name="use_action_appearance">False</property>
-                <property name="related_action">add-to-set</property>
+                <property name="related_action">add-to-new-set</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Add to _Existing Setâ</property>
+                <property name="label" translatable="yes">_Create New Photosetâ</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
@@ -149,7 +149,7 @@
         <property name="related_action">open-in-external-viewer</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Open in E_xternal Viewer</property>
+        <property name="label" translatable="yes">_Open in External Viewer</property>
         <property name="use_underline">True</property>
       </object>
     </child>
@@ -225,7 +225,7 @@
         <child>
           <object class="GtkToolButton" id="add_button">
             <property name="use_action_appearance">False</property>
-            <property name="related_action">load-pictures</property>
+            <property name="related_action">add-pictures</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="has_tooltip">True</property>
diff --git a/data/gtkbuilder/frogr-menu-bar.xml b/data/gtkbuilder/frogr-menu-bar.xml
index 3a16cad..c1b9448 100644
--- a/data/gtkbuilder/frogr-menu-bar.xml
+++ b/data/gtkbuilder/frogr-menu-bar.xml
@@ -5,37 +5,38 @@
       <attribute name='label' translatable='yes'>_File</attribute>
       <section>
         <item>
-          <attribute name='label' translatable='yes'>_Open Projectâ</attribute>
+          <attribute name='label' translatable='yes'>_Openâ</attribute>
           <attribute name='action'>win.open-project</attribute>
           <attribute name='accel'>&lt;Primary&gt;o</attribute>
         </item>
         <item>
-          <attribute name='label' translatable='yes'>_Save Project</attribute>
+          <attribute name='label' translatable='yes'>_Save</attribute>
           <attribute name='action'>win.save-project</attribute>
           <attribute name='accel'>&lt;Primary&gt;s</attribute>
         </item>
         <item>
-          <attribute name='label' translatable='yes'>_Save Project Asâ</attribute>
+          <attribute name='label' translatable='yes'>Save _Asâ</attribute>
           <attribute name='action'>win.save-project-as</attribute>
           <attribute name='accel'>&lt;Primary&gt;&lt;Shift&gt;s</attribute>
         </item>
       </section>
       <section>
         <item>
-          <attribute name='label' translatable='yes'>_Load Picturesâ</attribute>
-          <attribute name='action'>win.load-pictures</attribute>
-          <attribute name='accel'>&lt;Primary&gt;l</attribute>
+          <attribute name='label' translatable='yes'>A_dd Picturesâ</attribute>
+          <attribute name='action'>win.add-pictures</attribute>
+          <attribute name='accel'>&lt;Primary&gt;a</attribute>
         </item>
         <item>
           <attribute name='label' translatable='yes'>_Remove Pictures</attribute>
           <attribute name='action'>win.remove-pictures</attribute>
+          <attribute name='accel'>Delete</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name='label' translatable='yes'>_Upload All</attribute>
           <attribute name='action'>win.upload-all</attribute>
-          <attribute name='accel'>&lt;Primary&gt;&lt;Shift&gt;u</attribute>
+          <attribute name='accel'>&lt;Primary&gt;u</attribute>
         </item>
       </section>
     </submenu>
@@ -43,7 +44,7 @@
       <attribute name='label' translatable='yes'>_Edit</attribute>
       <section>
         <item>
-          <attribute name='label' translatable='yes'>Edit _Detailsâ</attribute>
+          <attribute name='label' translatable='yes'>_Edit Detailsâ</attribute>
           <attribute name='action'>win.edit-details</attribute>
           <attribute name='accel'>&lt;Primary&gt;d</attribute>
         </item>
@@ -58,15 +59,15 @@
           <attribute name='accel'>&lt;Primary&gt;g</attribute>
         </item>
         <submenu>
-          <attribute name='label' translatable='yes'>Add to _Set</attribute>
+          <attribute name='label' translatable='yes'>Add to _Photoset</attribute>
           <section>
             <item>
-              <attribute name='label' translatable='yes'>Add to _Existing Setâ</attribute>
+              <attribute name='label' translatable='yes'>_Add to Existing Photosetâ</attribute>
               <attribute name='action'>win.add-to-set</attribute>
               <attribute name='accel'>&lt;Primary&gt;p</attribute>
             </item>
             <item>
-              <attribute name='label' translatable='yes'>_Create New Setâ</attribute>
+              <attribute name='label' translatable='yes'>_Create New Photosetâ</attribute>
               <attribute name='action'>win.add-to-new-set</attribute>
               <attribute name='accel'>&lt;Primary&gt;&lt;Shift&gt;p</attribute>
             </item>
@@ -75,9 +76,9 @@
       </section>
       <section>
         <item>
-          <attribute name='label' translatable='yes'>Open in E_xternal Viewer</attribute>
+          <attribute name='label' translatable='yes'>_Open in External Viewer</attribute>
           <attribute name='action'>win.open-in-external-viewer</attribute>
-          <attribute name='accel'>&lt;Primary&gt;&lt;Shift&gt;v</attribute>
+          <attribute name='accel'>&lt;Primary&gt;v</attribute>
         </item>
       </section>
     </submenu>
diff --git a/src/frogr-main-view.c b/src/frogr-main-view.c
index 718aced..1fadbea 100644
--- a/src/frogr-main-view.c
+++ b/src/frogr-main-view.c
@@ -63,7 +63,7 @@
 #define ACTION_OPEN_PROJECT "open-project"
 #define ACTION_SAVE_PROJECT "save-project"
 #define ACTION_SAVE_PROJECT_AS "save-project-as"
-#define ACTION_LOAD_PICTURES "load-pictures"
+#define ACTION_ADD_PICTURES "add-pictures"
 #define ACTION_REMOVE_PICTURES "remove-pictures"
 #define ACTION_EDIT_DETAILS "edit-details"
 #define ACTION_ADD_TAGS "add-tags"
@@ -283,7 +283,7 @@ static GActionEntry win_entries[] = {
   { ACTION_OPEN_PROJECT, _on_menu_item_activated, NULL, NULL, NULL },
   { ACTION_SAVE_PROJECT, _on_menu_item_activated, NULL, NULL, NULL },
   { ACTION_SAVE_PROJECT_AS, _on_menu_item_activated, NULL, NULL, NULL },
-  { ACTION_LOAD_PICTURES, _on_menu_item_activated, NULL, NULL, NULL },
+  { ACTION_ADD_PICTURES, _on_menu_item_activated, NULL, NULL, NULL },
   { ACTION_REMOVE_PICTURES, _on_menu_item_activated, NULL, NULL, NULL },
   { ACTION_EDIT_DETAILS, _on_menu_item_activated, NULL, NULL, NULL },
   { ACTION_ADD_TAGS, _on_menu_item_activated, NULL, NULL, NULL },
@@ -643,7 +643,7 @@ _on_menu_item_activated (GSimpleAction *action, GVariant *parameter, gpointer da
     _add_pictures_to_new_set (self);
   else if (!g_strcmp0 (action_name, ACTION_OPEN_IN_EXTERNAL_VIEWER))
     _open_pictures_in_external_viewer (self);
-  else if (!g_strcmp0 (action_name, ACTION_LOAD_PICTURES))
+  else if (!g_strcmp0 (action_name, ACTION_ADD_PICTURES))
     _load_pictures_dialog (self);
   else if (!g_strcmp0 (action_name, ACTION_REMOVE_PICTURES))
     _remove_selected_pictures (self);
@@ -784,7 +784,7 @@ _on_gtk_action_activated (GtkAction *action, gpointer data)
     _add_pictures_to_new_set (mainview);
   else if (!g_strcmp0 (action_name, ACTION_OPEN_IN_EXTERNAL_VIEWER))
     _open_pictures_in_external_viewer (mainview);
-  else if (!g_strcmp0 (action_name, ACTION_LOAD_PICTURES))
+  else if (!g_strcmp0 (action_name, ACTION_ADD_PICTURES))
     _load_pictures_dialog (mainview);
   else if (!g_strcmp0 (action_name, ACTION_REMOVE_PICTURES))
     _remove_selected_pictures (mainview);
@@ -1398,7 +1398,7 @@ _pictures_loaded_required_check (FrogrMainView *self)
   if (!frogr_model_get_pictures (priv->model))
     {
       frogr_util_show_error_dialog (GTK_WINDOW (self),
-                                    _("You don't have any picture loaded yet"));
+                                    _("You don't have any picture added yet"));
       return FALSE;
     }
 
@@ -1951,7 +1951,7 @@ static gchar *file_actions[] = {
   ACTION_OPEN_PROJECT,
   ACTION_SAVE_PROJECT,
   ACTION_SAVE_PROJECT_AS,
-  ACTION_LOAD_PICTURES
+  ACTION_ADD_PICTURES
 };
 
 static gchar *selection_actions[] = {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]