Indicator Applet

Merge lp:~muktupavels/indicator-applet/about-menu into lp:indicator-applet

  1. about-menu
  2. Merge into trunk.14.04
Proposed by Alberts Muktupāvels
Status: Merged
Approved by: Dmitry Shachnev
Approved revision: 447
Merged at revision: 447
Proposed branch: lp:~muktupavels/indicator-applet/about-menu
Merge into: lp:indicator-applet
Diff against target: 199 lines (+89/-13)
5 files modified
src/indicator-applet-appmenu.c (+21/-0)
src/indicator-applet-complete.c (+21/-0)
src/indicator-applet-session.c (+21/-1)
src/indicator-applet.c (+24/-12)
src/indicator-applet.h (+2/-0)
To merge this branch: bzr merge lp:~muktupavels/indicator-applet/about-menu
Reviewer Review Type Date Requested Status
Dmitry Shachnev Pending
Review via email: mp+381992@code.launchpad.net

Commit message

Restore applet menu.

To post a comment you must log in.
lp:~muktupavels/indicator-applet/about-menu updated
447. By Alberts Muktupāvels

Restore applet menu.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/indicator-applet-appmenu.c'
--- src/indicator-applet-appmenu.c 2020-03-22 12:39:10 +0000
+++ src/indicator-applet-appmenu.c 2020-04-09 11:05:51 +0000
@@ -65,6 +65,26 @@
65 return "<Super>F1";65 return "<Super>F1";
66}66}
6767
68static const char *
69indicator_applet_appmenu_get_menu_xml (void)
70{
71 const char *menu_xml;
72
73 menu_xml = ""
74 "<interface>"
75 " <menu id=\"indicator-appmenu-menu\">"
76 " <section>"
77 " <item>"
78 " <attribute name=\"label\" translatable=\"yes\">_About</attribute>"
79 " <attribute name=\"action\">indicator-appmenu.about</attribute>"
80 " </item>"
81 " </section>"
82 " </menu>"
83 "</interface>";
84
85 return menu_xml;
86}
87
68static void88static void
69indicator_applet_appmenu_class_init (IndicatorAppletAppmenuClass *self_class)89indicator_applet_appmenu_class_init (IndicatorAppletAppmenuClass *self_class)
70{90{
@@ -78,6 +98,7 @@
78 applet_class->load_module = indicator_applet_appmenu_load_module;98 applet_class->load_module = indicator_applet_appmenu_load_module;
79 applet_class->load_indicator = indicator_applet_appmenu_load_indicator;99 applet_class->load_indicator = indicator_applet_appmenu_load_indicator;
80 applet_class->get_hotkey_keycode = indicator_applet_appmenu_get_hotkey_keycode;100 applet_class->get_hotkey_keycode = indicator_applet_appmenu_get_hotkey_keycode;
101 applet_class->get_menu_xml = indicator_applet_appmenu_get_menu_xml;
81}102}
82103
83static void104static void
84105
=== modified file 'src/indicator-applet-complete.c'
--- src/indicator-applet-complete.c 2020-03-22 12:39:10 +0000
+++ src/indicator-applet-complete.c 2020-04-09 11:05:51 +0000
@@ -71,6 +71,26 @@
71 return "<Super>S";71 return "<Super>S";
72}72}
7373
74static const char *
75indicator_applet_complete_get_menu_xml (void)
76{
77 const char *menu_xml;
78
79 menu_xml = ""
80 "<interface>"
81 " <menu id=\"indicator-complete-menu\">"
82 " <section>"
83 " <item>"
84 " <attribute name=\"label\" translatable=\"yes\">_About</attribute>"
85 " <attribute name=\"action\">indicator-complete.about</attribute>"
86 " </item>"
87 " </section>"
88 " </menu>"
89 "</interface>";
90
91 return menu_xml;
92}
93
74static void94static void
75indicator_applet_complete_class_init (IndicatorAppletCompleteClass *self_class)95indicator_applet_complete_class_init (IndicatorAppletCompleteClass *self_class)
76{96{
@@ -84,6 +104,7 @@
84 applet_class->load_module = indicator_applet_complete_load_module;104 applet_class->load_module = indicator_applet_complete_load_module;
85 applet_class->load_indicator = indicator_applet_complete_load_indicator;105 applet_class->load_indicator = indicator_applet_complete_load_indicator;
86 applet_class->get_hotkey_keycode = indicator_applet_complete_get_hotkey_keycode;106 applet_class->get_hotkey_keycode = indicator_applet_complete_get_hotkey_keycode;
107 applet_class->get_menu_xml = indicator_applet_complete_get_menu_xml;
87}108}
88109
89static void110static void
90111
=== modified file 'src/indicator-applet-session.c'
--- src/indicator-applet-session.c 2020-03-22 12:39:10 +0000
+++ src/indicator-applet-session.c 2020-04-09 11:05:51 +0000
@@ -67,6 +67,26 @@
67 return "<Super>S";67 return "<Super>S";
68}68}
6969
70static const char *
71indicator_applet_session_get_menu_xml (void)
72{
73 const char *menu_xml;
74
75 menu_xml = ""
76 "<interface>"
77 " <menu id=\"indicator-session-menu\">"
78 " <section>"
79 " <item>"
80 " <attribute name=\"label\" translatable=\"yes\">_About</attribute>"
81 " <attribute name=\"action\">indicator-session.about</attribute>"
82 " </item>"
83 " </section>"
84 " </menu>"
85 "</interface>";
86
87 return menu_xml;
88}
89
70static void90static void
71indicator_applet_session_class_init (IndicatorAppletSessionClass *self_class)91indicator_applet_session_class_init (IndicatorAppletSessionClass *self_class)
72{92{
@@ -79,8 +99,8 @@
79 applet_class->get_indicator_env = indicator_applet_session_get_indicator_env;99 applet_class->get_indicator_env = indicator_applet_session_get_indicator_env;
80 applet_class->load_module = indicator_applet_session_load_module;100 applet_class->load_module = indicator_applet_session_load_module;
81 applet_class->load_indicator = indicator_applet_session_load_indicator;101 applet_class->load_indicator = indicator_applet_session_load_indicator;
82
83 applet_class->get_hotkey_keycode = indicator_applet_session_get_hotkey_keycode;102 applet_class->get_hotkey_keycode = indicator_applet_session_get_hotkey_keycode;
103 applet_class->get_menu_xml = indicator_applet_session_get_menu_xml;
84}104}
85105
86static void106static void
87107
=== modified file 'src/indicator-applet.c'
--- src/indicator-applet.c 2020-03-29 14:43:47 +0000
+++ src/indicator-applet.c 2020-04-09 11:05:51 +0000
@@ -857,17 +857,6 @@
857 {"about", about_cb },857 {"about", about_cb },
858 { NULL }858 { NULL }
859 };859 };
860 static const gchar *menu_xml = ""
861 "<interface>"
862 "<menu id=\"indicator-applet-menu\">"
863 "<section>"
864 "<item>"
865 "<attribute name=\"label\" translatable=\"yes\">_About</attribute>"
866 "<attribute name=\"action\">indicator-applet.about</attribute>"
867 "</item>"
868 "</section>"
869 "</menu>"
870 "</interface>";
871860
872 static gboolean first_time = FALSE;861 static gboolean first_time = FALSE;
873 gint indicators_loaded = 0;862 gint indicators_loaded = 0;
@@ -892,7 +881,9 @@
892 gp_applet_set_flags (applet, GP_APPLET_FLAGS_EXPAND_MINOR);881 gp_applet_set_flags (applet, GP_APPLET_FLAGS_EXPAND_MINOR);
893 priv->menubar = gtk_menu_bar_new ();882 priv->menubar = gtk_menu_bar_new ();
894883
895 gp_applet_setup_menu (applet, menu_xml, menu_actions);884 gp_applet_setup_menu (applet,
885 INDICATOR_APPLET_GET_CLASS (self)->get_menu_xml (),
886 menu_actions);
896887
897 gtk_widget_set_name(GTK_WIDGET (applet), "fast-user-switch-applet");888 gtk_widget_set_name(GTK_WIDGET (applet), "fast-user-switch-applet");
898889
@@ -1009,6 +1000,26 @@
1009 return "<Super>M";1000 return "<Super>M";
1010}1001}
10111002
1003static const char *
1004indicator_applet_get_menu_xml (void)
1005{
1006 const char *menu_xml;
1007
1008 menu_xml = ""
1009 "<interface>"
1010 " <menu id=\"indicator-menu\">"
1011 " <section>"
1012 " <item>"
1013 " <attribute name=\"label\" translatable=\"yes\">_About</attribute>"
1014 " <attribute name=\"action\">indicator.about</attribute>"
1015 " </item>"
1016 " </section>"
1017 " </menu>"
1018 "</interface>";
1019
1020 return menu_xml;
1021}
1022
1012static void1023static void
1013indicator_applet_class_init (IndicatorAppletClass *self_class)1024indicator_applet_class_init (IndicatorAppletClass *self_class)
1014{1025{
@@ -1025,6 +1036,7 @@
1025 self_class->load_module = indicator_applet_load_module;1036 self_class->load_module = indicator_applet_load_module;
1026 self_class->load_indicator = indicator_applet_load_indicator;1037 self_class->load_indicator = indicator_applet_load_indicator;
1027 self_class->get_hotkey_keycode = indicator_applet_get_hotkey_keycode;1038 self_class->get_hotkey_keycode = indicator_applet_get_hotkey_keycode;
1039 self_class->get_menu_xml = indicator_applet_get_menu_xml;
1028}1040}
10291041
1030static void1042static void
10311043
=== modified file 'src/indicator-applet.h'
--- src/indicator-applet.h 2020-03-22 12:39:10 +0000
+++ src/indicator-applet.h 2020-04-09 11:05:51 +0000
@@ -39,6 +39,8 @@
39 gboolean (* load_indicator) (const char *name);39 gboolean (* load_indicator) (const char *name);
4040
41 const char * (* get_hotkey_keycode) (void);41 const char * (* get_hotkey_keycode) (void);
42
43 const char * (* get_menu_xml) (void);
42};44};
4345
44G_END_DECLS46G_END_DECLS

Subscribers

People subscribed via source and target branches