Download as
Browse Code »

Commit 52e0d15a4509061b094fbed66ef5278cc21f84e1

Authored by perry.werneck@gmail.com
1 parent 60f6a213
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Iniciando implementação dos menus popup

Showing 2 changed files with 20 additions and 4 deletions   Show diff stats
src/gtk/mainwindow.c
  Diff comments   View file @52e0d15
@@ -47,6 +47,16 @@ @@ -47,6 +47,16 @@
47 ACTION_GROUP_MAX 47 ACTION_GROUP_MAX
48 }; 48 };
49 49
  50 + enum popup_group
  51 + {
  52 + POPUP_DEFAULT,
  53 + POPUP_ONLINE,
  54 + POPUP_OFFLINE,
  55 + POPUP_SELECTION,
  56 +
  57 + POPUP_MAX
  58 + };
  59 +
50 static const gchar *groupname[ACTION_GROUP_MAX+1] = { "default", 60 static const gchar *groupname[ACTION_GROUP_MAX+1] = { "default",
51 "online", 61 "online",
52 "offline", 62 "offline",
@@ -56,6 +66,13 @@ @@ -56,6 +66,13 @@
56 "paste", 66 "paste",
57 NULL 67 NULL
58 }; 68 };
  69 +
  70 + static const gchar *popupname[POPUP_MAX+1] = { "default",
  71 + "online",
  72 + "offline",
  73 + "selection",
  74 + NULL
  75 + };
59 /*--[ Implement ]------------------------------------------------------------------------------------*/ 76 /*--[ Implement ]------------------------------------------------------------------------------------*/
60 77
61 static void save_toggle(GtkWidget *widget, LIB3270_TOGGLE id, gboolean toggled, const gchar *name, GtkWindow *toplevel) 78 static void save_toggle(GtkWidget *widget, LIB3270_TOGGLE id, gboolean toggled, const gchar *name, GtkWindow *toplevel)
@@ -208,7 +225,7 @@ @@ -208,7 +225,7 @@
208 } 225 }
209 226
210 // Create window 227 // Create window
211 - window = ui_parse_xml_folder(path,groupname,terminal,widget_setup); 228 + window = ui_parse_xml_folder(path,groupname,popupname,terminal,widget_setup);
212 group = g_object_get_data(G_OBJECT(window),"action_groups"); 229 group = g_object_get_data(G_OBJECT(window),"action_groups");
213 230
214 // Setup action groups 231 // Setup action groups
src/gtk/uiparser/uiparser.cbp
  Diff comments   View file @52e0d15
@@ -31,13 +31,12 @@ @@ -31,13 +31,12 @@
31 </Build> 31 </Build>
32 <Compiler> 32 <Compiler>
33 <Add option="-Wall" /> 33 <Add option="-Wall" />
34 - <Add option="`pkg-config gtk+-2.0 lib3270 --cflags`" /> 34 + <Add option="`pkg-config gtk+-2.0 --cflags`" />
35 <Add directory="../../include" /> 35 <Add directory="../../include" />
36 </Compiler> 36 </Compiler>
37 <Linker> 37 <Linker>
38 - <Add option="`pkg-config gtk+-2.0 lib3270 --libs`" /> 38 + <Add option="`pkg-config gtk+-2.0 --libs`" />
39 </Linker> 39 </Linker>
40 - <Unit filename="../common/common.h" />  
41 <Unit filename="../common/common.h.in" /> 40 <Unit filename="../common/common.h.in" />
42 <Unit filename="../common/config.c"> 41 <Unit filename="../common/config.c">
43 <Option compilerVar="CC" /> 42 <Option compilerVar="CC" />