Download as
Browse Code »

Commit 3fc204bac8e846142a1a2a80f2d96090fbec86d8

Authored by Perry Werneck
1 parent 2e747f07
Exists in master and in 4 other branches develop, edit-header-bar, keypads, script-support

The defaults for windows and linux aren't the same.

Showing 3 changed files with 109 additions and 106 deletions   Show diff stats
@@ -79,7 +79,10 @@ dnl INSTALL_PACKAGES="windows-lib ${INSTALL_PACKAGES}" @@ -79,7 +79,10 @@ dnl INSTALL_PACKAGES="windows-lib ${INSTALL_PACKAGES}"
79 AC_SUBST(WIN32_FILE_VERSION,$app_win32_file_version) 79 AC_SUBST(WIN32_FILE_VERSION,$app_win32_file_version)
80 80
81 AC_CONFIG_FILES(src/main/windows/resources.rc) 81 AC_CONFIG_FILES(src/main/windows/resources.rc)
  82 +
  83 + # Windows and linux doesn't use the same defaults.
82 AC_CONFIG_FILES(schemas/windows/application.gschema.xml) 84 AC_CONFIG_FILES(schemas/windows/application.gschema.xml)
  85 + AC_CONFIG_FILES(schemas/windows/window.gschema.xml)
83 86
84 if test "$host_cpu" = "x86_64"; then 87 if test "$host_cpu" = "x86_64"; then
85 app_cv_programfiles="PROGRAMFILES64" 88 app_cv_programfiles="PROGRAMFILES64"
@@ -106,13 +109,13 @@ dnl INSTALL_PACKAGES="windows-lib ${INSTALL_PACKAGES}" @@ -106,13 +109,13 @@ dnl INSTALL_PACKAGES="windows-lib ${INSTALL_PACKAGES}"
106 dnl INSTALL_PACKAGES="linux-lib ${INSTALL_PACKAGES}" 109 dnl INSTALL_PACKAGES="linux-lib ${INSTALL_PACKAGES}"
107 110
108 app_cv_static='no' 111 app_cv_static='no'
109 - AC_CONFIG_FILES(schemas/linux/application.gschema.xml)  
110 112
  113 + # Windows and linux doesn't use the same window defaults.
  114 + AC_CONFIG_FILES(schemas/linux/application.gschema.xml)
  115 + AC_CONFIG_FILES(schemas/linux/window.gschema.xml)
111 116
112 esac 117 esac
113 118
114 -AC_CONFIG_FILES(schemas/common/window.gschema.xml)  
115 -  
116 AC_SUBST(OSNAME,$app_cv_osname) 119 AC_SUBST(OSNAME,$app_cv_osname)
117 AC_SUBST(LIBS) 120 AC_SUBST(LIBS)
118 AC_SUBST(LOGDIR) 121 AC_SUBST(LOGDIR)
schemas/common/window.gschema.xml.in
View file @2e747f0
@@ -1,103 +0,0 @@ @@ -1,103 +0,0 @@
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -<!--  
3 -  
4 - Software pw3270, desenvolvido com base nos códigos fontes do WC3270 e X3270  
5 - (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a  
6 - aplicativos mainframe. Registro no INPI sob o nome G3270.  
7 -  
8 - Copyright (C) <2008> <Banco do Brasil S.A.>  
9 -  
10 - Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob  
11 - os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela  
12 - Free Software Foundation.  
13 -  
14 - Este programa é distribuído na expectativa de ser útil, mas SEM QUALQUER  
15 - GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou de ADEQUAÇÃO  
16 - A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para  
17 - obter mais detalhes.  
18 -  
19 - Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este  
20 - programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin  
21 - St, Fifth Floor, Boston, MA 02110-1301 USA  
22 -  
23 -  
24 - Contatos:  
25 -  
26 - perry.werneck@gmail.com (Alexandre Perry de Souza Werneck)  
27 - erico.mendonca@gmail.com (Erico Mascarenhas Mendonça)  
28 -  
29 --->  
30 -  
31 -<schemalist>  
32 -  
33 - <schema id="br.com.bb.@PACKAGE_NAME@.window">  
34 -  
35 - <key name="width" type="i">  
36 - <default>-1</default>  
37 - <summary>The window width.</summary>  
38 - <description></description>  
39 - </key>  
40 -  
41 - <key name="height" type="i">  
42 - <default>-1</default>  
43 - <summary>The window height.</summary>  
44 - <description></description>  
45 - </key>  
46 -  
47 - <key name="is-maximized" type="b">  
48 - <default>false</default>  
49 - <summary>Is the window maximized?</summary>  
50 - <description></description>  
51 - </key>  
52 -  
53 - <key name="is-fullscreen" type="b">  
54 - <default>false</default>  
55 - <summary>Is the window in full screen mode?</summary>  
56 - <description></description>  
57 - </key>  
58 -  
59 - <key name="has-subtitle" type="b">  
60 - <default>false</default>  
61 - <summary>Enable top window subtitle</summary>  
62 - <description>If TRUE, reserve space for a subtitle, even if none is currently set.</description>  
63 - </key>  
64 -  
65 - <key name="toolbar-visible" type="b">  
66 - <default>true</default>  
67 - <summary>The toolbar visible state</summary>  
68 - <description></description>  
69 - </key>  
70 -  
71 - <key name="menubar-visible" type="b">  
72 - <default>true</default>  
73 - <summary>The menubar visible state</summary>  
74 - <description></description>  
75 - </key>  
76 -  
77 - <key name="toolbar-style" type="i">  
78 - <default>-1</default>  
79 - <summary>How to draw the toolbar.</summary>  
80 - <description></description>  
81 - </key>  
82 -  
83 - <key name="toolbar-icon-size" type="i">  
84 - <default>0</default>  
85 - <summary>The size of the icons in a toolbar</summary>  
86 - <description></description>  
87 - </key>  
88 -  
89 - <key name="toolbar-action-names" type="s">  
90 - <default>'win.copy,win.paste,win.select-all,separator,win.connect,win.disconnect,separator,win.session.properties,win.file.transfer,win.print,win.close'</default>  
91 - <summary>The toolbar action list</summary>  
92 - <description></description>  
93 - </key>  
94 -  
95 - <key name="header-action-names" type="s">  
96 - <default>'win.disconnect,win.reconnect,win.file.transfer,win.print:menu.open-menu'</default>  
97 - <summary>The actions in the header bar</summary>  
98 - <description></description>  
99 - </key>  
100 -  
101 - </schema>  
102 -  
103 -</schemalist>  
schemas/linux/window.gschema.xml.in 0 → 100644
  Diff comments   View file @3fc204b
@@ -0,0 +1,103 @@ @@ -0,0 +1,103 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!--
  3 +
  4 + Software pw3270, desenvolvido com base nos códigos fontes do WC3270 e X3270
  5 + (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
  6 + aplicativos mainframe. Registro no INPI sob o nome G3270.
  7 +
  8 + Copyright (C) <2008> <Banco do Brasil S.A.>
  9 +
  10 + Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
  11 + os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela
  12 + Free Software Foundation.
  13 +
  14 + Este programa é distribuído na expectativa de ser útil, mas SEM QUALQUER
  15 + GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou de ADEQUAÇÃO
  16 + A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
  17 + obter mais detalhes.
  18 +
  19 + Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
  20 + programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
  21 + St, Fifth Floor, Boston, MA 02110-1301 USA
  22 +
  23 +
  24 + Contatos:
  25 +
  26 + perry.werneck@gmail.com (Alexandre Perry de Souza Werneck)
  27 + erico.mendonca@gmail.com (Erico Mascarenhas Mendonça)
  28 +
  29 +-->
  30 +
  31 +<schemalist>
  32 +
  33 + <schema id="br.com.bb.@PACKAGE_NAME@.window">
  34 +
  35 + <key name="width" type="i">
  36 + <default>-1</default>
  37 + <summary>The window width.</summary>
  38 + <description></description>
  39 + </key>
  40 +
  41 + <key name="height" type="i">
  42 + <default>-1</default>
  43 + <summary>The window height.</summary>
  44 + <description></description>
  45 + </key>
  46 +
  47 + <key name="is-maximized" type="b">
  48 + <default>false</default>
  49 + <summary>Is the window maximized?</summary>
  50 + <description></description>
  51 + </key>
  52 +
  53 + <key name="is-fullscreen" type="b">
  54 + <default>false</default>
  55 + <summary>Is the window in full screen mode?</summary>
  56 + <description></description>
  57 + </key>
  58 +
  59 + <key name="has-subtitle" type="b">
  60 + <default>false</default>
  61 + <summary>Enable top window subtitle</summary>
  62 + <description>If TRUE, reserve space for a subtitle, even if none is currently set.</description>
  63 + </key>
  64 +
  65 + <key name="toolbar-visible" type="b">
  66 + <default>false</default>
  67 + <summary>The toolbar visible state</summary>
  68 + <description></description>
  69 + </key>
  70 +
  71 + <key name="menubar-visible" type="b">
  72 + <default>false</default>
  73 + <summary>The menubar visible state</summary>
  74 + <description></description>
  75 + </key>
  76 +
  77 + <key name="toolbar-style" type="i">
  78 + <default>-1</default>
  79 + <summary>How to draw the toolbar.</summary>
  80 + <description></description>
  81 + </key>
  82 +
  83 + <key name="toolbar-icon-size" type="i">
  84 + <default>0</default>
  85 + <summary>The size of the icons in a toolbar</summary>
  86 + <description></description>
  87 + </key>
  88 +
  89 + <key name="toolbar-action-names" type="s">
  90 + <default>'win.copy,win.paste,win.select-all,separator,win.connect,win.disconnect,separator,win.session.properties,win.file.transfer,win.print,win.close'</default>
  91 + <summary>The toolbar action list</summary>
  92 + <description></description>
  93 + </key>
  94 +
  95 + <key name="header-action-names" type="s">
  96 + <default>'win.disconnect,win.reconnect,win.file.transfer,win.print:menu.open-menu'</default>
  97 + <summary>The actions in the header bar</summary>
  98 + <description></description>
  99 + </key>
  100 +
  101 + </schema>
  102 +
  103 +</schemalist>