Download as
Browse Code »

Commit ae0903ea87393a8952bfbf7f0df46ce1912f4fd2

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

Corrigindo apresentação dos menus popup.

Showing 5 changed files with 12 additions and 11 deletions   Show diff stats
src/gtk/common/config.c
  Diff comments   View file @ae0903e
@@ -355,7 +355,7 @@ void set_boolean_to_config(const gchar *group, const gchar *key, gboolean val) @@ -355,7 +355,7 @@ void set_boolean_to_config(const gchar *group, const gchar *key, gboolean val)
355 DWORD disp; 355 DWORD disp;
356 gchar * path = g_strdup_printf("%s\\%s",registry_path,group); 356 gchar * path = g_strdup_printf("%s\\%s",registry_path,group);
357 357
358 - trace("Creating key %s",path); 358 +// trace("Creating key %s",path);
359 if(RegCreateKeyEx(HKEY_CURRENT_USER,path,0,NULL,REG_OPTION_NON_VOLATILE,KEY_SET_VALUE,NULL,&hKey,&disp) == ERROR_SUCCESS) 359 if(RegCreateKeyEx(HKEY_CURRENT_USER,path,0,NULL,REG_OPTION_NON_VOLATILE,KEY_SET_VALUE,NULL,&hKey,&disp) == ERROR_SUCCESS)
360 { 360 {
361 DWORD value = val ? 1 : 0; 361 DWORD value = val ? 1 : 0;
src/gtk/uiparser/menuitem.c
  Diff comments   View file @ae0903e
@@ -89,7 +89,7 @@ @@ -89,7 +89,7 @@
89 89
90 gtk_menu_shell_append((GtkMenuShell *) menu, widget); 90 gtk_menu_shell_append((GtkMenuShell *) menu, widget);
91 91
92 - return G_OBJECT(ui_insert_element(info, action, UI_ELEMENT_MENUITEM, names, values, G_OBJECT(widget), error)); 92 + return G_OBJECT(widget);
93 } 93 }
94 94
95 void ui_end_menuitem(GObject *widget,struct parser *info,GError **error) 95 void ui_end_menuitem(GObject *widget,struct parser *info,GError **error)
src/gtk/uiparser/private.h
  Diff comments   View file @ae0903e
@@ -38,7 +38,6 @@ @@ -38,7 +38,6 @@
38 { 38 {
39 UI_ELEMENT_MENUBAR, 39 UI_ELEMENT_MENUBAR,
40 UI_ELEMENT_MENU, 40 UI_ELEMENT_MENU,
41 - UI_ELEMENT_MENUITEM,  
42 UI_ELEMENT_TOOLBAR, 41 UI_ELEMENT_TOOLBAR,
43 UI_ELEMENT_TOOLITEM, 42 UI_ELEMENT_TOOLITEM,
44 UI_ELEMENT_POPUP, 43 UI_ELEMENT_POPUP,
@@ -49,6 +48,7 @@ @@ -49,6 +48,7 @@
49 #define UI_ELEMENT_SEPARATOR UI_ELEMENT_COUNT+1 48 #define UI_ELEMENT_SEPARATOR UI_ELEMENT_COUNT+1
50 #define UI_ELEMENT_ACCELERATOR UI_ELEMENT_COUNT+2 49 #define UI_ELEMENT_ACCELERATOR UI_ELEMENT_COUNT+2
51 #define UI_ELEMENT_SCRIPT UI_ELEMENT_COUNT+3 50 #define UI_ELEMENT_SCRIPT UI_ELEMENT_COUNT+3
  51 + #define UI_ELEMENT_MENUITEM UI_ELEMENT_COUNT+4
52 52
53 struct parser 53 struct parser
54 { 54 {
src/gtk/uiparser/uiparser.cbp
  Diff comments   View file @ae0903e
@@ -7,8 +7,8 @@ @@ -7,8 +7,8 @@
7 <Option compiler="gcc" /> 7 <Option compiler="gcc" />
8 <Build> 8 <Build>
9 <Target title="Debug"> 9 <Target title="Debug">
10 - <Option output=".bin/Debug/uiparser" prefix_auto="1" extension_auto="1" />  
11 - <Option object_output=".obj/Debug/" /> 10 + <Option output=".bin\Debug\uiparser" prefix_auto="1" extension_auto="1" />
  11 + <Option object_output=".obj\Debug\" />
12 <Option type="1" /> 12 <Option type="1" />
13 <Option compiler="gcc" /> 13 <Option compiler="gcc" />
14 <Compiler> 14 <Compiler>
@@ -17,8 +17,8 @@ @@ -17,8 +17,8 @@
17 </Compiler> 17 </Compiler>
18 </Target> 18 </Target>
19 <Target title="Release"> 19 <Target title="Release">
20 - <Option output=".bin/Release/uiparser" prefix_auto="1" extension_auto="1" />  
21 - <Option object_output=".obj/Release/" /> 20 + <Option output=".bin\Release\uiparser" prefix_auto="1" extension_auto="1" />
  21 + <Option object_output=".obj\Release\" />
22 <Option type="0" /> 22 <Option type="0" />
23 <Option compiler="gcc" /> 23 <Option compiler="gcc" />
24 <Compiler> 24 <Compiler>
@@ -32,13 +32,13 @@ @@ -32,13 +32,13 @@
32 <Compiler> 32 <Compiler>
33 <Add option="-Wall" /> 33 <Add option="-Wall" />
34 <Add option="`pkg-config gtk+-2.0 --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 --libs`" /> 38 <Add option="`pkg-config gtk+-2.0 --libs`" />
39 </Linker> 39 </Linker>
40 - <Unit filename="../common/common.h.in" />  
41 - <Unit filename="../common/config.c"> 40 + <Unit filename="..\common\common.h.in" />
  41 + <Unit filename="..\common\config.c">
42 <Option compilerVar="CC" /> 42 <Option compilerVar="CC" />
43 </Unit> 43 </Unit>
44 <Unit filename="accelerator.c"> 44 <Unit filename="accelerator.c">
@@ -83,6 +83,7 @@ @@ -83,6 +83,7 @@
83 <Unit filename="toolitem.c"> 83 <Unit filename="toolitem.c">
84 <Option compilerVar="CC" /> 84 <Option compilerVar="CC" />
85 </Unit> 85 </Unit>
  86 + <Unit filename="..\..\..\ui\default.xml" />
86 <Extensions> 87 <Extensions>
87 <code_completion /> 88 <code_completion />
88 <debugger /> 89 <debugger />
ui/default.xml
  Diff comments   View file @ae0903e
@@ -155,7 +155,7 @@ @@ -155,7 +155,7 @@
155 <menuitem action='Quit'/> 155 <menuitem action='Quit'/>
156 </popup> 156 </popup>
157 157
158 - <popup name='defaultpopup' type="default"> 158 + <popup name='defaultpopup' type='default'>
159 <menuitem action='Paste'/> 159 <menuitem action='Paste'/>
160 <menuitem action='PasteNext'/> 160 <menuitem action='PasteNext'/>
161 <menuitem action='SelectAll'/> 161 <menuitem action='SelectAll'/>