[gitg] Move global author details action to app menu



commit def84b644b63bf51bc71b099535be42dcdc3e517
Author: Jesse van den Kieboom <jessevdk gnome org>
Date:   Sat Aug 8 11:56:30 2015 +0200

    Move global author details action to app menu
    
    https://bugzilla.gnome.org/show_bug.cgi?id=702635

 gitg/gitg-application.vala      |   14 ++++++++++++++
 gitg/gitg-window.vala           |    8 ++------
 gitg/resources/ui/gitg-menus.ui |   14 +++++++-------
 3 files changed, 23 insertions(+), 13 deletions(-)
---
diff --git a/gitg/gitg-application.vala b/gitg/gitg-application.vala
index 7e89314..b8f7286 100644
--- a/gitg/gitg-application.vala
+++ b/gitg/gitg-application.vala
@@ -268,11 +268,25 @@ public class Application : Gtk.Application
                d_preferences.present();
        }
 
+       private void on_app_author_details_global_activated()
+       {
+               unowned List<Gtk.Window> wnds = get_windows();
+               Window? window = null;
+
+               if (wnds != null)
+               {
+                       window = wnds.data as Window;
+               }
+
+               AuthorDetailsDialog.show_global(window);
+       }
+
        private static const ActionEntry[] app_entries = {
                {"new", on_app_new_window_activated},
                {"help", on_app_help_activated},
                {"about", on_app_about_activated},
                {"quit", on_app_quit_activated},
+               {"author-details-global", on_app_author_details_global_activated},
                {"preferences", on_preferences_activated}
        };
 
diff --git a/gitg/gitg-window.vala b/gitg/gitg-window.vala
index c04e5ad..aa8ec9d 100644
--- a/gitg/gitg-window.vala
+++ b/gitg/gitg-window.vala
@@ -143,7 +143,6 @@ public class Window : Gtk.ApplicationWindow, GitgExt.Application, Initable
                {"gear-menu", on_gear_menu_activated, null, "false", null},
                {"close", on_close_activated},
                {"reload", on_reload_activated},
-               {"author-details-global", on_global_author_details_activated},
                {"author-details-repo", on_repo_author_details_activated},
                {"select", on_select_activated, null, "false", null}
        };
@@ -425,6 +424,7 @@ public class Window : Gtk.ApplicationWindow, GitgExt.Application, Initable
                        d_dash_button.show();
                        d_dash_view.add_repository(d_repository);
                        d_gear_menu.menu_model = d_activities_model;
+                       d_gear_menu.show();
                }
                else
                {
@@ -435,6 +435,7 @@ public class Window : Gtk.ApplicationWindow, GitgExt.Application, Initable
                        d_activities_switcher.hide();
                        d_dash_button.hide();
                        d_gear_menu.menu_model = d_dash_model;
+                       d_gear_menu.hide();
                }
 
                d_activities.update();
@@ -481,11 +482,6 @@ public class Window : Gtk.ApplicationWindow, GitgExt.Application, Initable
                catch {}
        }
 
-       private void on_global_author_details_activated()
-       {
-               AuthorDetailsDialog.show_global(this);
-       }
-
        private void on_repo_author_details_activated()
        {
                Ggit.Config repo_config = null;
diff --git a/gitg/resources/ui/gitg-menus.ui b/gitg/resources/ui/gitg-menus.ui
index 7f5beeb..5321279 100644
--- a/gitg/resources/ui/gitg-menus.ui
+++ b/gitg/resources/ui/gitg-menus.ui
@@ -10,6 +10,12 @@
     </section>
     <section>
       <item>
+        <attribute name="label" translatable="yes">_Author Details</attribute>
+        <attribute name="action">app.author-details-global</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
         <attribute name="label" translatable="yes">_Preferences</attribute>
         <attribute name="action">app.preferences</attribute>
       </item>
@@ -30,12 +36,6 @@
     </section>
   </menu>
   <menu id="win-menu-dash">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">_Author Details</attribute>
-        <attribute name="action">win.author-details-global</attribute>
-      </item>
-    </section>
   </menu>
   <menu id="win-menu-views">
     <section>
@@ -71,7 +71,7 @@
     <section>
       <item>
         <attribute name="label" translatable="yes">_Author Details</attribute>
-        <attribute name="action">win.author-details-global</attribute>
+        <attribute name="action">app.author-details-global</attribute>
       </item>
     </section>
     <section>


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