Commit f9d2a03f768ef4a894ddad44aba6ed0b8633dd01

Authored by Perry Werneck
1 parent 4465363d
Exists in develop

Default menu visibility is 'true' on windows.

Showing 2 changed files with 6 additions and 5 deletions   Show diff stats
@@ -92,6 +92,7 @@ case "$host" in @@ -92,6 +92,7 @@ case "$host" in
92 AC_SUBST(WINARCH,$app_cv_winarch) 92 AC_SUBST(WINARCH,$app_cv_winarch)
93 AC_SUBST(NSISREDIR,$app_cv_nsisredir) 93 AC_SUBST(NSISREDIR,$app_cv_nsisredir)
94 AC_SUBST(DEFAULT_UI_STYLE,0) 94 AC_SUBST(DEFAULT_UI_STYLE,0)
  95 + AC_SUBST(DEFAULT_MENUBAR_VISIBLE,"true")
95 ;; 96 ;;
96 97
97 *-apple-darwin*) 98 *-apple-darwin*)
@@ -107,9 +108,10 @@ case "$host" in @@ -107,9 +108,10 @@ case "$host" in
107 app_cv_osname="linux" 108 app_cv_osname="linux"
108 app_rls_ldflags="" 109 app_rls_ldflags=""
109 110
110 - CFLAGS="$CFLAGS -pthread -DLIBDIR=\$(libdir)" 111 + CFLAGS="$CFLAGS -pthread -DLIBDIR=\$(libdir) -DDATADIR=\$(datadir)"
111 LDFLAGS="$LDFLAGS -pthread" 112 LDFLAGS="$LDFLAGS -pthread"
112 AC_SUBST(DEFAULT_UI_STYLE,0) 113 AC_SUBST(DEFAULT_UI_STYLE,0)
  114 + AC_SUBST(DEFAULT_MENUBAR_VISIBLE,"false")
113 115
114 esac 116 esac
115 117
@@ -139,7 +141,6 @@ dnl --------------------------------------------------------------------------- @@ -139,7 +141,6 @@ dnl ---------------------------------------------------------------------------
139 141
140 AC_PATH_TOOL([AR], [ar], [ar]) 142 AC_PATH_TOOL([AR], [ar], [ar])
141 AC_PATH_TOOL([CONVERT], [convert], [no]) 143 AC_PATH_TOOL([CONVERT], [convert], [no])
142 -AC_PATH_TOOL([OPTIPNG],[optipng],[no])  
143 AC_PATH_TOOL([ZIP],[zip],[no]) 144 AC_PATH_TOOL([ZIP],[zip],[no])
144 AC_PATH_TOOL([DLLTOOL],[dlltool],[no]) 145 AC_PATH_TOOL([DLLTOOL],[dlltool],[no])
145 AC_PATH_TOOL([WINDRES], [windres], [no]) 146 AC_PATH_TOOL([WINDRES], [windres], [no])
schemas/window.gschema.xml.in
@@ -55,13 +55,13 @@ @@ -55,13 +55,13 @@
55 </key> 55 </key>
56 56
57 <key name="toolbar-visible" type="b"> 57 <key name="toolbar-visible" type="b">
58 - <default>false</default> 58 + <default>true</default>
59 <summary>The toolbar visible state</summary> 59 <summary>The toolbar visible state</summary>
60 <description></description> 60 <description></description>
61 </key> 61 </key>
62 62
63 <key name="menubar-visible" type="b"> 63 <key name="menubar-visible" type="b">
64 - <default>false</default> 64 + <default>@DEFAULT_MENUBAR_VISIBLE@</default>
65 <summary>The menubar visible state</summary> 65 <summary>The menubar visible state</summary>
66 <description></description> 66 <description></description>
67 </key> 67 </key>
@@ -98,7 +98,7 @@ @@ -98,7 +98,7 @@
98 98
99 <key name="toolbar-action-names" type="s"> 99 <key name="toolbar-action-names" type="s">
100 <default>'win.copy,win.paste,win.select-all,separator,win.clear,win.erase-input,separator,win.print,separator,win.zoom-out,win.zoom-fit-best,win.zoom-in'</default> 100 <default>'win.copy,win.paste,win.select-all,separator,win.clear,win.erase-input,separator,win.print,separator,win.zoom-out,win.zoom-fit-best,win.zoom-in'</default>
101 - <summary>The toolbar action list</summary> 101 + <summary>The actions on the toolbar</summary>
102 <description></description> 102 <description></description>
103 </key> 103 </key>
104 104