[shotwell] Fix toolbar in camera import page



commit eb8612cd6fafcac7d42baacd33697958e198941e
Author: Jens Georg <mail jensge org>
Date:   Tue Dec 20 13:28:13 2016 +0100

    Fix toolbar in camera import page
    
    Signed-off-by: Jens Georg <mail jensge org>
    
    https://bugzilla.gnome.org/show_bug.cgi?id=776298

 src/Resources.vala         |    4 ++--
 src/camera/ImportPage.vala |   11 +++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/src/Resources.vala b/src/Resources.vala
index d7f237c..feb568b 100644
--- a/src/Resources.vala
+++ b/src/Resources.vala
@@ -76,8 +76,8 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     public const string ADJUST = "image-adjust";
     public const string PIN_TOOLBAR = "shotwell-pin-toolbar";
     public const string MAKE_PRIMARY = "shotwell-make-primary";
-    public const string IMPORT = "shotwell-import";
-    public const string IMPORT_ALL = "shotwell-import-all";
+    public const string IMPORT = "import";
+    public const string IMPORT_ALL = "import-all";
     public const string ENHANCE = "shotwell-auto-enhance";
     public const string CROP_PIVOT_RETICLE = "shotwell-crop-pivot-reticle";
     public const string PUBLISH = "applications-internet";
diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala
index 92445bb..1200089 100644
--- a/src/camera/ImportPage.vala
+++ b/src/camera/ImportPage.vala
@@ -801,6 +801,7 @@ public class ImportPage : CheckerboardPage {
             
             // Find button
             Gtk.ToggleToolButton find_button = new Gtk.ToggleToolButton();
+            find_button.set_icon_name("edit-find");
             find_button.set_action_name ("win.CommonDisplaySearchbar");
             
             toolbar.insert(find_button, -1);
@@ -810,14 +811,20 @@ public class ImportPage : CheckerboardPage {
             
             // Import selected
             Gtk.ToolButton import_selected_button = new Gtk.ToolButton(null, null);
-            import_selected_button.set_icon_name(Resources.IMPORT);
+            import_selected_button.set_icon_name("import");
+            import_selected_button.set_label(_("Import _All"));
+            import_selected_button.is_important = true;
+            import_selected_button.use_underline = true;
             import_selected_button.set_action_name ("win.ImportSelected");
             
             toolbar.insert(import_selected_button, -1);
             
             // Import all
             Gtk.ToolButton import_all_button = new Gtk.ToolButton(null, null);
-            import_all_button.set_icon_name(Resources.IMPORT_ALL);
+            import_all_button.set_icon_name("import-all");
+            import_all_button.set_label(_("Import _Selected"));
+            import_all_button.is_important = true;
+            import_all_button.use_underline = true;
             import_all_button.set_action_name ("win.ImportAll");
             
             toolbar.insert(import_all_button, -1);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]