Commit f9d2a03f768ef4a894ddad44aba6ed0b8633dd01
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
configure.ac
| ... | ... | @@ -92,6 +92,7 @@ case "$host" in |
| 92 | 92 | AC_SUBST(WINARCH,$app_cv_winarch) |
| 93 | 93 | AC_SUBST(NSISREDIR,$app_cv_nsisredir) |
| 94 | 94 | AC_SUBST(DEFAULT_UI_STYLE,0) |
| 95 | + AC_SUBST(DEFAULT_MENUBAR_VISIBLE,"true") | |
| 95 | 96 | ;; |
| 96 | 97 | |
| 97 | 98 | *-apple-darwin*) |
| ... | ... | @@ -107,9 +108,10 @@ case "$host" in |
| 107 | 108 | app_cv_osname="linux" |
| 108 | 109 | app_rls_ldflags="" |
| 109 | 110 | |
| 110 | - CFLAGS="$CFLAGS -pthread -DLIBDIR=\$(libdir)" | |
| 111 | + CFLAGS="$CFLAGS -pthread -DLIBDIR=\$(libdir) -DDATADIR=\$(datadir)" | |
| 111 | 112 | LDFLAGS="$LDFLAGS -pthread" |
| 112 | 113 | AC_SUBST(DEFAULT_UI_STYLE,0) |
| 114 | + AC_SUBST(DEFAULT_MENUBAR_VISIBLE,"false") | |
| 113 | 115 | |
| 114 | 116 | esac |
| 115 | 117 | |
| ... | ... | @@ -139,7 +141,6 @@ dnl --------------------------------------------------------------------------- |
| 139 | 141 | |
| 140 | 142 | AC_PATH_TOOL([AR], [ar], [ar]) |
| 141 | 143 | AC_PATH_TOOL([CONVERT], [convert], [no]) |
| 142 | -AC_PATH_TOOL([OPTIPNG],[optipng],[no]) | |
| 143 | 144 | AC_PATH_TOOL([ZIP],[zip],[no]) |
| 144 | 145 | AC_PATH_TOOL([DLLTOOL],[dlltool],[no]) |
| 145 | 146 | AC_PATH_TOOL([WINDRES], [windres], [no]) | ... | ... |
schemas/window.gschema.xml.in
| ... | ... | @@ -55,13 +55,13 @@ |
| 55 | 55 | </key> |
| 56 | 56 | |
| 57 | 57 | <key name="toolbar-visible" type="b"> |
| 58 | - <default>false</default> | |
| 58 | + <default>true</default> | |
| 59 | 59 | <summary>The toolbar visible state</summary> |
| 60 | 60 | <description></description> |
| 61 | 61 | </key> |
| 62 | 62 | |
| 63 | 63 | <key name="menubar-visible" type="b"> |
| 64 | - <default>false</default> | |
| 64 | + <default>@DEFAULT_MENUBAR_VISIBLE@</default> | |
| 65 | 65 | <summary>The menubar visible state</summary> |
| 66 | 66 | <description></description> |
| 67 | 67 | </key> |
| ... | ... | @@ -98,7 +98,7 @@ |
| 98 | 98 | |
| 99 | 99 | <key name="toolbar-action-names" type="s"> |
| 100 | 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 | 102 | <description></description> |
| 103 | 103 | </key> |
| 104 | 104 | ... | ... |