From 3fc204bac8e846142a1a2a80f2d96090fbec86d8 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Fri, 31 Jan 2020 14:59:40 -0300 Subject: [PATCH] The defaults for windows and linux aren't the same. --- configure.ac | 9 ++++++--- schemas/common/window.gschema.xml.in | 103 ------------------------------------------------------------------------------------------------------- schemas/linux/window.gschema.xml.in | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 109 insertions(+), 106 deletions(-) delete mode 100644 schemas/common/window.gschema.xml.in create mode 100644 schemas/linux/window.gschema.xml.in diff --git a/configure.ac b/configure.ac index 97bf7b6..fa0c356 100644 --- a/configure.ac +++ b/configure.ac @@ -79,7 +79,10 @@ dnl INSTALL_PACKAGES="windows-lib ${INSTALL_PACKAGES}" AC_SUBST(WIN32_FILE_VERSION,$app_win32_file_version) AC_CONFIG_FILES(src/main/windows/resources.rc) + + # Windows and linux doesn't use the same defaults. AC_CONFIG_FILES(schemas/windows/application.gschema.xml) + AC_CONFIG_FILES(schemas/windows/window.gschema.xml) if test "$host_cpu" = "x86_64"; then app_cv_programfiles="PROGRAMFILES64" @@ -106,13 +109,13 @@ dnl INSTALL_PACKAGES="windows-lib ${INSTALL_PACKAGES}" dnl INSTALL_PACKAGES="linux-lib ${INSTALL_PACKAGES}" app_cv_static='no' - AC_CONFIG_FILES(schemas/linux/application.gschema.xml) + # Windows and linux doesn't use the same window defaults. + AC_CONFIG_FILES(schemas/linux/application.gschema.xml) + AC_CONFIG_FILES(schemas/linux/window.gschema.xml) esac -AC_CONFIG_FILES(schemas/common/window.gschema.xml) - AC_SUBST(OSNAME,$app_cv_osname) AC_SUBST(LIBS) AC_SUBST(LOGDIR) diff --git a/schemas/common/window.gschema.xml.in b/schemas/common/window.gschema.xml.in deleted file mode 100644 index cece3bf..0000000 --- a/schemas/common/window.gschema.xml.in +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - -1 - The window width. - - - - - -1 - The window height. - - - - - false - Is the window maximized? - - - - - false - Is the window in full screen mode? - - - - - false - Enable top window subtitle - If TRUE, reserve space for a subtitle, even if none is currently set. - - - - true - The toolbar visible state - - - - - true - The menubar visible state - - - - - -1 - How to draw the toolbar. - - - - - 0 - The size of the icons in a toolbar - - - - - 'win.copy,win.paste,win.select-all,separator,win.connect,win.disconnect,separator,win.session.properties,win.file.transfer,win.print,win.close' - The toolbar action list - - - - - 'win.disconnect,win.reconnect,win.file.transfer,win.print:menu.open-menu' - The actions in the header bar - - - - - - diff --git a/schemas/linux/window.gschema.xml.in b/schemas/linux/window.gschema.xml.in new file mode 100644 index 0000000..d5f47ae --- /dev/null +++ b/schemas/linux/window.gschema.xml.in @@ -0,0 +1,103 @@ + + + + + + + + + -1 + The window width. + + + + + -1 + The window height. + + + + + false + Is the window maximized? + + + + + false + Is the window in full screen mode? + + + + + false + Enable top window subtitle + If TRUE, reserve space for a subtitle, even if none is currently set. + + + + false + The toolbar visible state + + + + + false + The menubar visible state + + + + + -1 + How to draw the toolbar. + + + + + 0 + The size of the icons in a toolbar + + + + + 'win.copy,win.paste,win.select-all,separator,win.connect,win.disconnect,separator,win.session.properties,win.file.transfer,win.print,win.close' + The toolbar action list + + + + + 'win.disconnect,win.reconnect,win.file.transfer,win.print:menu.open-menu' + The actions in the header bar + + + + + + -- libgit2 0.21.2