[shotwell/wip/dedeprecate] WIP

From: Jens Georg <jensgeorg src gnome org>
To: commits-list gnome org
Cc:
Subject: [shotwell/wip/dedeprecate] WIP
Date: Sun, 30 Oct 2016 18:37:15 +0000 (UTC)
commit 886a6d847e20006f377241e4a9c2d7c9d19a91fc
Author: Jens Georg <mail jensge org>
Date:   Sun Oct 30 19:36:57 2016 +0100

    WIP

 src/tags/TagPage.vala |    2 +-
 ui/media.ui           |   44 ++++++++++++++++++++++++++++----------------
 ui/photo.ui           |   49 +++++++++++++++++++++++++++++++------------------
 ui/photo_context.ui   |   49 +++++++++++++++++++++++++++++++------------------
 ui/trash.ui           |    8 +++++---
 5 files changed, 96 insertions(+), 56 deletions(-)
---
diff --git a/src/tags/TagPage.vala b/src/tags/TagPage.vala
index 7e937ad..f3799e3 100644
--- a/src/tags/TagPage.vala
+++ b/src/tags/TagPage.vala
@@ -15,7 +15,7 @@ public class TagPage : CollectionPage {
         Tag.global.items_altered.connect(on_tags_altered);
         tag.mirror_sources(get_view(), create_thumbnail);
         
-        init_page_context_menu("/TagsContextMenu");
+        init_page_context_menu("TagsContextMenu");
     }
     
     ~TagPage() {
diff --git a/ui/media.ui b/ui/media.ui
index 2a437ed..bd3ba3c 100644
--- a/ui/media.ui
+++ b/ui/media.ui
@@ -278,41 +278,50 @@
           <attribute name="label" translatable="yes">_Set Rating</attribute>
           <section>
             <item>
-              <attribute name="label" translatable="yes">RateFive</attribute>
+              <attribute name="label" translatable="no">★★★★★</attribute>
+              <attribute name="accel">5</attribute>
               <attribute name="action">RateFive</attribute>
             </item>
             <item>
-              <attribute name="label" translatable="yes">RateFour</attribute>
+              <attribute name="label" translatable="no">★★★★</attribute>
+              <attribute name="accel">4</attribute>
               <attribute name="action">RateFour</attribute>
             </item>
             <item>
-              <attribute name="label" translatable="yes">RateThree</attribute>
+              <attribute name="label" translatable="no">★★★</attribute>
+              <attribute name="accel">3</attribute>
               <attribute name="action">RateThree</attribute>
             </item>
             <item>
-              <attribute name="label" translatable="yes">RateTwo</attribute>
+              <attribute name="label" translatable="no">★★</attribute>
+              <attribute name="accel">2</attribute>
               <attribute name="action">RateTwo</attribute>
             </item>
             <item>
-              <attribute name="label" translatable="yes">RateOne</attribute>
+              <attribute name="label" translatable="no">★</attribute>
+              <attribute name="accel">1</attribute>
               <attribute name="action">RateOne</attribute>
             </item>
             <item>
-              <attribute name="label" translatable="yes">RateUnrated</attribute>
+              <attribute name="label" translatable="yes">_Unrated</attribute>
+              <attribute name="accel">0</attribute>
               <attribute name="action">RateUnrated</attribute>
             </item>
             <item>
-              <attribute name="label" translatable="yes">RateRejected</attribute>
+              <attribute name="label" translatable="yes">_Rejected</attribute>
+              <attribute name="accel">9</attribute>
               <attribute name="action">RateRejected</attribute>
             </item>
           </section>
           <section>
             <item>
-              <attribute name="label" translatable="yes">IncreaseRating</attribute>
+              <attribute name="label" translatable="yes">_Increase</attribute>
+              <attribute name="accel">greater</attribute>
               <attribute name="action">IncreaseRating</attribute>
             </item>
             <item>
-              <attribute name="label" translatable="yes">DecreaseRating</attribute>
+              <attribute name="label" translatable="yes">_Decrease</attribute>
+              <attribute name="accel">less</attribute>
               <attribute name="action">DecreaseRating</attribute>
             </item>
           </section>
@@ -320,7 +329,7 @@
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">EditTitle</attribute>
+          <attribute name="label" translatable="yes">Edit _Title…</attribute>
           <attribute name="action">EditTitle</attribute>
         </item>
         <item>
@@ -331,14 +340,14 @@
       </section>
       <section>
         <submenu>
-          <attribute name="label" translatable="yes">RawDeveloper</attribute>
+          <attribute name="label" translatable="yes">_Developer</attribute>
           <section>
             <item>
-              <attribute name="label" translatable="yes">RawDeveloperShotwell</attribute>
+              <attribute name="label" translatable="yes">Shotwell</attribute>
               <attribute name="action">RawDeveloperShotwell</attribute>
             </item>
             <item>
-              <attribute name="label" translatable="yes">RawDeveloperCamera</attribute>
+              <attribute name="label" translatable="yes">Camera</attribute>
               <attribute name="action">RawDeveloperCamera</attribute>
             </item>
           </section>
@@ -352,7 +361,8 @@
       <attribute name="label" translatable="yes">Even_ts</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">NewEvent</attribute>
+          <attribute name="label" translatable="yes">_New Event</attribute>
+          <attribute name="accel">&lt;Primary&gt;n</attribute>
           <attribute name="action">NewEvent</attribute>
         </item>
         <item>
@@ -366,11 +376,13 @@
       <attribute name="label" translatable="yes">Ta_gs</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">AddTags</attribute>
+          <attribute name="label" translatable="yes">Add _Tags…</attribute>
+          <attribute name="accel">&lt;Primary&gt;t</attribute>
           <attribute name="action">AddTags</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">ModifyTags</attribute>
+          <attribute name="label" translatable="yes">Modif_y Tags…</attribute>
+          <attribute name="accel">&lt;Primary&gt;m</attribute>
           <attribute name="action">ModifyTags</attribute>
         </item>
       </section>
diff --git a/ui/photo.ui b/ui/photo.ui
index 0ff45cc..4d79f93 100644
--- a/ui/photo.ui
+++ b/ui/photo.ui
@@ -200,7 +200,8 @@
           <attribute name="action">RotateClockwise</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">RotateCounterclockwise</attribute>
+          <attribute name="label" translatable="yes">Rotate _Left</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;r</attribute>
           <attribute name="action">RotateCounterclockwise</attribute>
         </item>
         <item>
@@ -262,48 +263,58 @@
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">Flag</attribute>
+          <attribute name="label" translatable="yes">_Flag</attribute>
+          <attribute name="accel">&lt;Primary&gt;g</attribute>
           <attribute name="action">Flag</attribute>
         </item>
         <submenu>
-          <attribute name="label" translatable="yes">Rate</attribute>
+          <attribute name="label" translatable="yes">_Set Rating</attribute>
           <section>
             <item>
-              <attribute name="label" translatable="yes">RateFive</attribute>
+              <attribute name="label" translatable="no">★★★★★</attribute>
+              <attribute name="accel">5</attribute>
               <attribute name="action">RateFive</attribute>
             </item>
             <item>
-              <attribute name="label" translatable="yes">RateFour</attribute>
+              <attribute name="label" translatable="no">★★★★</attribute>
+              <attribute name="accel">4</attribute>
               <attribute name="action">RateFour</attribute>
             </item>
             <item>
-              <attribute name="label" translatable="yes">RateThree</attribute>
+              <attribute name="label" translatable="no">★★★</attribute>
+              <attribute name="accel">3</attribute>
               <attribute name="action">RateThree</attribute>
             </item>
             <item>
-              <attribute name="label" translatable="yes">RateTwo</attribute>
+              <attribute name="label" translatable="no">★★</attribute>
+              <attribute name="accel">2</attribute>
               <attribute name="action">RateTwo</attribute>
             </item>
             <item>
-              <attribute name="label" translatable="yes">RateOne</attribute>
+              <attribute name="label" translatable="no">★</attribute>
+              <attribute name="accel">1</attribute>
               <attribute name="action">RateOne</attribute>
             </item>
             <item>
-              <attribute name="label" translatable="yes">RateUnrated</attribute>
+              <attribute name="label" translatable="yes">_Unrated</attribute>
+              <attribute name="accel">0</attribute>
               <attribute name="action">RateUnrated</attribute>
             </item>
             <item>
-              <attribute name="label" translatable="yes">RateRejected</attribute>
+              <attribute name="label" translatable="yes">_Rejected</attribute>
+              <attribute name="accel">9</attribute>
               <attribute name="action">RateRejected</attribute>
             </item>
           </section>
           <section>
             <item>
-              <attribute name="label" translatable="yes">IncreaseRating</attribute>
+              <attribute name="label" translatable="yes">_Increase</attribute>
+              <attribute name="accel">greater</attribute>
               <attribute name="action">IncreaseRating</attribute>
             </item>
             <item>
-              <attribute name="label" translatable="yes">DecreaseRating</attribute>
+              <attribute name="label" translatable="yes">_Decrease</attribute>
+              <attribute name="accel">less</attribute>
               <attribute name="action">DecreaseRating</attribute>
             </item>
           </section>
@@ -311,7 +322,7 @@
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">EditTitle</attribute>
+          <attribute name="label" translatable="yes">Edit _Title…</attribute>
           <attribute name="action">EditTitle</attribute>
         </item>
         <item>
@@ -325,14 +336,14 @@
       </section>
       <section>
         <submenu>
-          <attribute name="label" translatable="yes">RawDeveloper</attribute>
+          <attribute name="label" translatable="yes">_Developer</attribute>
           <section>
             <item>
-              <attribute name="label" translatable="yes">RawDeveloperShotwell</attribute>
+              <attribute name="label" translatable="yes">Shotwell</attribute>
               <attribute name="action">RawDeveloperShotwell</attribute>
             </item>
             <item>
-              <attribute name="label" translatable="yes">RawDeveloperCamera</attribute>
+              <attribute name="label" translatable="yes">Camera</attribute>
               <attribute name="action">RawDeveloperCamera</attribute>
             </item>
           </section>
@@ -354,11 +365,13 @@
       <attribute name="label" translatable="yes">Ta_gs</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">AddTags</attribute>
+          <attribute name="label" translatable="yes">Add _Tags…</attribute>
+          <attribute name="accel">&lt;Primary&gt;t</attribute>
           <attribute name="action">AddTags</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">ModifyTags</attribute>
+          <attribute name="label" translatable="yes">Modif_y Tags…</attribute>
+          <attribute name="accel">&lt;Primary&gt;m</attribute>
           <attribute name="action">ModifyTags</attribute>
         </item>
       </section>
diff --git a/ui/photo_context.ui b/ui/photo_context.ui
index 1af8513..4e2fe8e 100644
--- a/ui/photo_context.ui
+++ b/ui/photo_context.ui
@@ -16,72 +16,85 @@
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">AddTagsContextMenu</attribute>
+          <attribute name="label" translatable="yes">_Add Tags…</attribute>
+          <attribute name="accel">&lt;Primary&gt;a</attribute>
           <attribute name="action">AddTagsContextMenu</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">ModifyTags</attribute>
+          <attribute name="label" translatable="yes">Modif_y Tags…</attribute>
+          <attribute name="accel">&lt;Primary&gt;m</attribute>
           <attribute name="action">ModifyTags</attribute>
         </item>
       <attribute name="id">ContextTagsPlaceholder</attribute>
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">Flag</attribute>
+          <attribute name="label" translatable="yes">_Flag</attribute>
+          <attribute name="accel">&lt;Primary&gt;g</attribute>
           <attribute name="action">Flag</attribute>
         </item>
         <submenu>
-          <attribute name="label" translatable="yes">Rate</attribute>
+          <attribute name="label" translatable="yes">_Set Rating</attribute>
           <section>
             <item>
-              <attribute name="label" translatable="yes">RateFive</attribute>
+              <attribute name="label" translatable="no">★★★★★</attribute>
+              <attribute name="accel">5</attribute>
               <attribute name="action">RateFive</attribute>
             </item>
             <item>
-              <attribute name="label" translatable="yes">RateFour</attribute>
+              <attribute name="label" translatable="no">★★★★</attribute>
+              <attribute name="accel">4</attribute>
               <attribute name="action">RateFour</attribute>
             </item>
             <item>
-              <attribute name="label" translatable="yes">RateThree</attribute>
+              <attribute name="label" translatable="no">★★★</attribute>
+              <attribute name="accel">3</attribute>
               <attribute name="action">RateThree</attribute>
             </item>
             <item>
-              <attribute name="label" translatable="yes">RateTwo</attribute>
+              <attribute name="label" translatable="no">★★</attribute>
+              <attribute name="accel">2</attribute>
               <attribute name="action">RateTwo</attribute>
             </item>
             <item>
-              <attribute name="label" translatable="yes">RateOne</attribute>
+              <attribute name="label" translatable="no">★</attribute>
+              <attribute name="accel">1</attribute>
               <attribute name="action">RateOne</attribute>
             </item>
             <item>
-              <attribute name="label" translatable="yes">RateUnrated</attribute>
+              <attribute name="label" translatable="yes">_Unrated</attribute>
+              <attribute name="accel">0</attribute>
               <attribute name="action">RateUnrated</attribute>
             </item>
             <item>
-              <attribute name="label" translatable="yes">RateRejected</attribute>
+              <attribute name="label" translatable="yes">_Rejected</attribute>
+              <attribute name="accel">9</attribute>
               <attribute name="action">RateRejected</attribute>
             </item>
           </section>
           <section>
             <item>
-              <attribute name="label" translatable="yes">IncreaseRating</attribute>
+              <attribute name="label" translatable="yes">_Increase</attribute>
+              <attribute name="accel">greater</attribute>
               <attribute name="action">IncreaseRating</attribute>
             </item>
             <item>
-              <attribute name="label" translatable="yes">DecreaseRating</attribute>
+              <attribute name="label" translatable="yes">_Decrease</attribute>
+              <attribute name="accel">less</attribute>
               <attribute name="action">DecreaseRating</attribute>
             </item>
           </section>
         </submenu>
+
         <submenu>
-          <attribute name="label" translatable="yes">RawDeveloper</attribute>
+          <attribute name="label" translatable="yes">_Developer</attribute>
           <section>
             <item>
-              <attribute name="label" translatable="yes">RawDeveloperShotwell</attribute>
+              <attribute name="label" translatable="yes">Shotwell</attribute>
               <attribute name="action">RawDeveloperShotwell</attribute>
             </item>
             <item>
-              <attribute name="label" translatable="yes">RawDeveloperCamera</attribute>
+              <attribute name="label" translatable="yes">Camera</attribute>
               <attribute name="action">RawDeveloperCamera</attribute>
             </item>
           </section>
@@ -89,7 +102,7 @@
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">EditTitle</attribute>
+          <attribute name="label" translatable="yes">Edit _Title…</attribute>
           <attribute name="action">EditTitle</attribute>
         </item>
         <item>
@@ -109,7 +122,7 @@
       <section>
       <attribute name="id">ContextJumpPlaceholder</attribute>
         <item>
-          <attribute name="label" translatable="yes">SendToContextMenu</attribute>
+          <attribute name="label" translatable="yes">Send T_o…</attribute>
           <attribute name="action">SendToContextMenu</attribute>
         </item>
       </section>
diff --git a/ui/trash.ui b/ui/trash.ui
index d47ace3..af83d07 100644
--- a/ui/trash.ui
+++ b/ui/trash.ui
@@ -60,11 +60,12 @@
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">Delete</attribute>
+          <attribute name="label" translatable="yes">_Delete</attribute>
+          <attribute name="accel">Delete</attribute>
           <attribute name="action">Delete</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">Restore</attribute>
+          <attribute name="label" translatable="yes">_Restore</attribute>
           <attribute name="action">Restore</attribute>
         </item>
       </section>
@@ -106,7 +107,8 @@
           <attribute name="action">CommonDisplaySidebar</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">CommonDisplayToolbar</attribute>
+          <attribute name="label" translatable="yes">T_oolbar</attribute>
+          <attribute name="accel">&lt;Primary&gt;F9</attribute>
           <attribute name="action">CommonDisplayToolbar</attribute>
         </item>
       </section>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]