[shotwell/wip/dedeprecate: 48/64] wip

[Jens Georg <jensgeorg src gnome org>]

commit fef6a5ec6094dab114b7256f5437d5aee20c1efb
Author: Jens Georg <mail jensge org>
Date:   Wed Nov 2 23:29:28 2016 +0100

    wip

 src/CollectionPage.vala |   26 +++++++++++++++-----------
 ui/collection.ui        |    8 ++++++++
 2 files changed, 23 insertions(+), 11 deletions(-)
---
diff --git a/src/CollectionPage.vala b/src/CollectionPage.vala
index 438684e..335a12a 100644
--- a/src/CollectionPage.vala
+++ b/src/CollectionPage.vala
@@ -46,7 +46,7 @@ public abstract class CollectionPage : MediaPage {
     public override Gtk.Toolbar get_toolbar() {
         if (toolbar == null) {
             base.get_toolbar();
-            
+
             // separator to force slider to right side of toolbar
             Gtk.SeparatorToolItem separator = new Gtk.SeparatorToolItem();
             separator.set_expand(true);
@@ -688,20 +688,24 @@ public abstract class CollectionPage : MediaPage {
     }
     
     protected override bool on_ctrl_pressed(Gdk.EventKey? event) {
-/*        Gtk.ToolButton? rotate_button = ui.get_widget("/CollectionToolbar/ToolRotate")
-            as Gtk.ToolButton;
-        if (rotate_button != null)
-            rotate_button.set_related_action(get_action("RotateCounterclockwise"));
-         */
+        Gtk.ToolButton? rotate_button = this.builder.get_object ("ToolRotate") as Gtk.ToolButton;
+        if (rotate_button != null) {
+            rotate_button.set_action_name ("win.RotateCounterclockwise");
+            rotate_button.set_icon_name ("object-rotate-left");
+            rotate_button.set_tooltip_text (Resources.ROTATE_CCW_TOOLTIP);
+        }
+
         return base.on_ctrl_pressed(event);
     }
     
     protected override bool on_ctrl_released(Gdk.EventKey? event) {
-/*        Gtk.ToolButton? rotate_button = ui.get_widget("/CollectionToolbar/ToolRotate")
-            as Gtk.ToolButton;
-        if (rotate_button != null)
-            rotate_button.set_related_action(get_action("RotateClockwise"));
-        */
+        Gtk.ToolButton? rotate_button = this.builder.get_object ("ToolRotate") as Gtk.ToolButton;
+        if (rotate_button != null) {
+            rotate_button.set_action_name ("win.RotateClockwise");
+            rotate_button.set_icon_name ("object-rotate-right");
+            rotate_button.set_tooltip_text (Resources.ROTATE_CW_TOOLTIP);
+        }
+
         return base.on_ctrl_released(event);
     }
     
diff --git a/ui/collection.ui b/ui/collection.ui
index 83fc2c6..97c8802 100644
--- a/ui/collection.ui
+++ b/ui/collection.ui
@@ -68,6 +68,8 @@
       <object class="GtkToolButton" id="ToolRotate">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="tooltip_text" translatable="yes">Rotate the photos right (press Ctrl to rotate 
left)</property>
+        <property name="action_name">win.RotateClockwise</property>
         <property name="label" translatable="yes">Rotate</property>
         <property name="use_underline">True</property>
         <property name="icon_name">object-rotate-right</property>
@@ -81,6 +83,8 @@
       <object class="GtkToolButton" id="ToolEnhance">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="tooltip_text" translatable="yes">Automatically improve the photo’s 
appearance</property>
+        <property name="action_name">win.Enhance</property>
         <property name="label" translatable="yes">Enhance</property>
         <property name="use_underline">True</property>
         <property name="icon_name">shotwell-auto-enhance</property>
@@ -103,6 +107,8 @@
       <object class="GtkToolButton" id="ToolPublish">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="tooltip_text" translatable="yes">Publish to various websites</property>
+        <property name="action_name">win.Publish</property>
         <property name="label" translatable="yes">Publish</property>
         <property name="use_underline">True</property>
         <property name="icon_name">applications-internet</property>
@@ -125,6 +131,8 @@
       <object class="GtkToolButton" id="ToolFind">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="tooltip_text" translatable="yes">Find an image by typing text that appears in its 
name or tags</property>
+        <property name="action_name">win.Find</property>
         <property name="label" translatable="yes">Find</property>
         <property name="use_underline">True</property>
         <property name="icon_name">edit-find</property>