Download as
Browse Code »

Commit 54d771e64d9a33665bb14d0675f427265e29fe8b

Authored by Perry Werneck
1 parent 5fc33710
Exists in master and in 4 other branches develop, edit-header-bar, keypads, script-support

Working on gear menu.

Showing 6 changed files with 66 additions and 21 deletions   Show diff stats
src/objects/window/actions.c
  Diff comments   View file @54d771e
... ... @@ -34,6 +34,13 @@
34 34 #include "private.h"
35 35 #include <pw3270/application.h>
36 36  
  37 + void pw3270_application_generic_activated(GSimpleAction * action, GVariant *parameter, gpointer application) {
  38 +
  39 + debug("%s",__FUNCTION__);
  40 +
  41 + }
  42 +
  43 +
37 44 void pw3270_application_quit_activated(GSimpleAction * action, GVariant *parameter, gpointer application) {
38 45  
39 46 g_print("Exiting application\n");
... ...
src/objects/window/application.c
  Diff comments   View file @54d771e
... ... @@ -73,12 +73,6 @@
73 73  
74 74 }
75 75  
76   - static void action_activated(GSimpleAction * action, GVariant *parameter, gpointer application) {
77   -
78   - debug("%s",__FUNCTION__);
79   -
80   - }
81   -
82 76 void startup(GApplication *application) {
83 77  
84 78 G_APPLICATION_CLASS(pw3270Application_parent_class)->startup(application);
... ... @@ -86,14 +80,14 @@
86 80 //
87 81 // Setup application default actions.
88 82 //
89   - static GActionEntry app_entries[] = {
  83 + static GActionEntry actions[] = {
90 84 {
91 85 .name = "about",
92   - .activate = action_activated,
  86 + .activate = pw3270_application_generic_activated,
93 87 },
94 88 {
95 89 .name = "preferences",
96   - .activate = action_activated,
  90 + .activate = pw3270_application_generic_activated,
97 91 },
98 92  
99 93 {
... ... @@ -115,8 +109,8 @@
115 109  
116 110 g_action_map_add_action_entries(
117 111 G_ACTION_MAP(application),
118   - app_entries,
119   - G_N_ELEMENTS(app_entries),
  112 + actions,
  113 + G_N_ELEMENTS(actions),
120 114 application
121 115 );
122 116  
... ...
src/objects/window/private.h
  Diff comments   View file @54d771e
... ... @@ -62,6 +62,7 @@
62 62 };
63 63  
64 64 // Actions
  65 + G_GNUC_INTERNAL void pw3270_application_generic_activated(GSimpleAction * action, GVariant *parameter, gpointer application);
65 66 G_GNUC_INTERNAL void pw3270_application_quit_activated(GSimpleAction * action, GVariant *parameter, gpointer application);
66 67 G_GNUC_INTERNAL void pw3270_application_new_tab_activated(GSimpleAction * action, GVariant *parameter, gpointer application);
67 68 G_GNUC_INTERNAL void pw3270_application_new_window_activated(GSimpleAction * action, GVariant *parameter, gpointer application);
... ...
src/objects/window/ui/application.xml
  Diff comments   View file @54d771e
... ... @@ -21,8 +21,8 @@
21 21 </item>
22 22 </section>
23 23 </menu>
24   - <menu id='menubar'>
25 24  
  25 + <menu id='menubar'>
26 26 <submenu>
27 27 <attribute name='label' translatable='yes'>_Edit</attribute>
28 28 <section>
... ...
src/objects/window/ui/window.xml
  Diff comments   View file @54d771e
... ... @@ -3,17 +3,41 @@
3 3 <requires lib="gtk+" version="3.0"/>
4 4 <menu id="gear-menu">
5 5 <section>
6   - <item>
7   - <attribute name="label" translatable="yes">About PW3270</attribute>
8   - <attribute name="action">app.about</attribute>
9   - </item>
  6 +
  7 + <submenu>
  8 + <attribute name="label" translatable="yes">New</attribute>
  9 + <item>
  10 + <attribute name="label" translatable="yes">Tab</attribute>
  11 + <attribute name="action">app.new_tab</attribute>
  12 + </item>
  13 + <item>
  14 + <attribute name="label" translatable="yes">Application Window</attribute>
  15 + <attribute name="action">app.new_window</attribute>
  16 + </item>
  17 + </submenu>
  18 +
  19 + <submenu>
  20 + <attribute name="label" translatable="yes">Open</attribute>
  21 + <item>
  22 + <attribute name="label" translatable="yes">File</attribute>
  23 + <attribute name="action">app.open</attribute>
  24 + </item>
  25 + <item>
  26 + <attribute name="label" translatable="yes">New tab</attribute>
  27 + <attribute name="action">app.new_tab</attribute>
  28 + </item>
  29 + <item>
  30 + <attribute name="label" translatable="yes">New window</attribute>
  31 + <attribute name="action">app.new_window</attribute>
  32 + </item>
  33 + </submenu>
  34 +
  35 + </section>
  36 +
  37 + <section>
10 38 <item>
11 39 <attribute name="label" translatable="yes">Preferences</attribute>
12   - <attribute name="action">app.help</attribute>
13   - </item>
14   - <item>
15   - <attribute name="label" translatable="yes">Quit PW3270</attribute>
16   - <attribute name="action">app.quit</attribute>
  40 + <attribute name="action">win.preferences</attribute>
17 41 </item>
18 42 </section>
19 43 </menu>
... ...
src/objects/window/window.c
  Diff comments   View file @54d771e
... ... @@ -68,6 +68,25 @@
68 68 gtk_widget_show_all(GTK_WIDGET(vBox));
69 69 gtk_container_add(GTK_CONTAINER(widget),GTK_WIDGET(vBox));
70 70  
  71 + //
  72 + // Setup Window actions.
  73 + //
  74 + static GActionEntry actions[] = {
  75 +
  76 + {
  77 + .name = "preferences",
  78 + .activate = pw3270_application_generic_activated,
  79 + },
  80 +
  81 + };
  82 +
  83 + g_action_map_add_action_entries(
  84 + G_ACTION_MAP(widget),
  85 + actions,
  86 + G_N_ELEMENTS(actions),
  87 + widget
  88 + );
  89 +
71 90 }
72 91  
73 92 GtkWidget * pw3270_application_window_new(GtkApplication * application) {
... ...