Download as
Browse Code »

Commit e9fcb0068c5e398b42ff0931130ec9bc96600429

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

Implementando cores default para impressão

Showing 2 changed files with 182 additions and 149 deletions   Show diff stats
pw3270.cbp
  Diff comments   View file @e9fcb00
... ... @@ -8,8 +8,8 @@
8 8 <Option compiler="gcc" />
9 9 <Build>
10 10 <Target title="Debug">
11   - <Option output=".bin\Debug\pw3270" prefix_auto="1" extension_auto="1" />
12   - <Option object_output=".obj\Debug\" />
  11 + <Option output=".bin/Debug/pw3270" prefix_auto="1" extension_auto="1" />
  12 + <Option object_output=".obj/Debug/" />
13 13 <Option type="0" />
14 14 <Option compiler="gcc" />
15 15 <Compiler>
... ... @@ -18,8 +18,8 @@
18 18 </Compiler>
19 19 </Target>
20 20 <Target title="Release">
21   - <Option output=".bin\Release\pw3270" prefix_auto="1" extension_auto="1" />
22   - <Option object_output=".obj\Release\" />
  21 + <Option output=".bin/Release/pw3270" prefix_auto="1" extension_auto="1" />
  22 + <Option object_output=".obj/Release/" />
23 23 <Option type="0" />
24 24 <Option compiler="gcc" />
25 25 <Compiler>
... ... @@ -33,287 +33,288 @@
33 33 <Compiler>
34 34 <Add option="-Wall" />
35 35 <Add option="`pkg-config gtk+-3.0 lib3270 --cflags`" />
36   - <Add directory="src\include" />
  36 + <Add directory="src/include" />
37 37 </Compiler>
38 38 <Linker>
39 39 <Add option="`pkg-config gtk+-3.0 lib3270 --libs`" />
40 40 </Linker>
41 41 <Unit filename="Makefile.in" />
  42 + <Unit filename="colors.conf" />
42 43 <Unit filename="configure.ac" />
43 44 <Unit filename="pw3270.spec.in" />
44   - <Unit filename="src\gtk\Makefile.in" />
45   - <Unit filename="src\gtk\actions.c">
  45 + <Unit filename="src/gtk/Makefile.in" />
  46 + <Unit filename="src/gtk/actions.c">
46 47 <Option compilerVar="CC" />
47 48 </Unit>
48   - <Unit filename="src\gtk\common\common.h" />
49   - <Unit filename="src\gtk\common\config.c">
  49 + <Unit filename="src/gtk/common/common.h" />
  50 + <Unit filename="src/gtk/common/config.c">
50 51 <Option compilerVar="CC" />
51 52 </Unit>
52   - <Unit filename="src\gtk\dialog.c">
  53 + <Unit filename="src/gtk/dialog.c">
53 54 <Option compilerVar="CC" />
54 55 </Unit>
55   - <Unit filename="src\gtk\fonts.c">
  56 + <Unit filename="src/gtk/fonts.c">
56 57 <Option compilerVar="CC" />
57 58 </Unit>
58   - <Unit filename="src\gtk\globals.h" />
59   - <Unit filename="src\gtk\main.c">
  59 + <Unit filename="src/gtk/globals.h" />
  60 + <Unit filename="src/gtk/main.c">
60 61 <Option compilerVar="CC" />
61 62 </Unit>
62   - <Unit filename="src\gtk\mainwindow.c">
  63 + <Unit filename="src/gtk/mainwindow.c">
63 64 <Option compilerVar="CC" />
64 65 </Unit>
65   - <Unit filename="src\gtk\print.c">
  66 + <Unit filename="src/gtk/print.c">
66 67 <Option compilerVar="CC" />
67 68 </Unit>
68   - <Unit filename="src\gtk\uiparser\Makefile.in" />
69   - <Unit filename="src\gtk\uiparser\accelerator.c">
  69 + <Unit filename="src/gtk/uiparser/Makefile.in" />
  70 + <Unit filename="src/gtk/uiparser/accelerator.c">
70 71 <Option compilerVar="CC" />
71 72 </Unit>
72   - <Unit filename="src\gtk\uiparser\action.c">
  73 + <Unit filename="src/gtk/uiparser/action.c">
73 74 <Option compilerVar="CC" />
74 75 </Unit>
75   - <Unit filename="src\gtk\uiparser\menu.c">
  76 + <Unit filename="src/gtk/uiparser/menu.c">
76 77 <Option compilerVar="CC" />
77 78 </Unit>
78   - <Unit filename="src\gtk\uiparser\menubar.c">
  79 + <Unit filename="src/gtk/uiparser/menubar.c">
79 80 <Option compilerVar="CC" />
80 81 </Unit>
81   - <Unit filename="src\gtk\uiparser\menuitem.c">
  82 + <Unit filename="src/gtk/uiparser/menuitem.c">
82 83 <Option compilerVar="CC" />
83 84 </Unit>
84   - <Unit filename="src\gtk\uiparser\parsefile.c">
  85 + <Unit filename="src/gtk/uiparser/parsefile.c">
85 86 <Option compilerVar="CC" />
86 87 </Unit>
87   - <Unit filename="src\gtk\uiparser\parser.c">
  88 + <Unit filename="src/gtk/uiparser/parser.c">
88 89 <Option compilerVar="CC" />
89 90 </Unit>
90   - <Unit filename="src\gtk\uiparser\parser.h" />
91   - <Unit filename="src\gtk\uiparser\popup.c">
  91 + <Unit filename="src/gtk/uiparser/parser.h" />
  92 + <Unit filename="src/gtk/uiparser/popup.c">
92 93 <Option compilerVar="CC" />
93 94 </Unit>
94   - <Unit filename="src\gtk\uiparser\private.h" />
95   - <Unit filename="src\gtk\uiparser\script.c">
  95 + <Unit filename="src/gtk/uiparser/private.h" />
  96 + <Unit filename="src/gtk/uiparser/script.c">
96 97 <Option compilerVar="CC" />
97 98 </Unit>
98   - <Unit filename="src\gtk\uiparser\separator.c">
  99 + <Unit filename="src/gtk/uiparser/separator.c">
99 100 <Option compilerVar="CC" />
100 101 </Unit>
101   - <Unit filename="src\gtk\uiparser\sources.mak" />
102   - <Unit filename="src\gtk\uiparser\toolbar.c">
  102 + <Unit filename="src/gtk/uiparser/sources.mak" />
  103 + <Unit filename="src/gtk/uiparser/toolbar.c">
103 104 <Option compilerVar="CC" />
104 105 </Unit>
105   - <Unit filename="src\gtk\uiparser\toolitem.c">
  106 + <Unit filename="src/gtk/uiparser/toolitem.c">
106 107 <Option compilerVar="CC" />
107 108 </Unit>
108   - <Unit filename="src\gtk\v3270\clipboard.c">
  109 + <Unit filename="src/gtk/v3270/clipboard.c">
109 110 <Option compilerVar="CC" />
110 111 </Unit>
111   - <Unit filename="src\gtk\v3270\draw.c">
  112 + <Unit filename="src/gtk/v3270/draw.c">
112 113 <Option compilerVar="CC" />
113 114 </Unit>
114   - <Unit filename="src\gtk\v3270\genmarshal" />
115   - <Unit filename="src\gtk\v3270\iocallback.c">
  115 + <Unit filename="src/gtk/v3270/genmarshal" />
  116 + <Unit filename="src/gtk/v3270/iocallback.c">
116 117 <Option compilerVar="CC" />
117 118 </Unit>
118   - <Unit filename="src\gtk\v3270\keyboard.c">
  119 + <Unit filename="src/gtk/v3270/keyboard.c">
119 120 <Option compilerVar="CC" />
120 121 </Unit>
121   - <Unit filename="src\gtk\v3270\mouse.c">
  122 + <Unit filename="src/gtk/v3270/mouse.c">
122 123 <Option compilerVar="CC" />
123 124 </Unit>
124   - <Unit filename="src\gtk\v3270\oia.c">
  125 + <Unit filename="src/gtk/v3270/oia.c">
125 126 <Option compilerVar="CC" />
126 127 </Unit>
127   - <Unit filename="src\gtk\v3270\private.h" />
128   - <Unit filename="src\gtk\v3270\sources.mak" />
129   - <Unit filename="src\gtk\v3270\v3270.h" />
130   - <Unit filename="src\gtk\v3270\widget.c">
  128 + <Unit filename="src/gtk/v3270/private.h" />
  129 + <Unit filename="src/gtk/v3270/sources.mak" />
  130 + <Unit filename="src/gtk/v3270/v3270.h" />
  131 + <Unit filename="src/gtk/v3270/widget.c">
131 132 <Option compilerVar="CC" />
132 133 </Unit>
133   - <Unit filename="src\include\lib3270.h" />
134   - <Unit filename="src\include\lib3270\action_table.h" />
135   - <Unit filename="src\include\lib3270\actions.h" />
136   - <Unit filename="src\include\lib3270\config.h.in" />
137   - <Unit filename="src\include\lib3270\log.h" />
138   - <Unit filename="src\include\lib3270\popup.h" />
139   - <Unit filename="src\include\lib3270\selection.h" />
140   - <Unit filename="src\include\lib3270\session.h" />
141   - <Unit filename="src\include\pw3270.h" />
142   - <Unit filename="src\include\rules.mak.in" />
143   - <Unit filename="src\lib3270\3270ds.h" />
144   - <Unit filename="src\lib3270\Makefile.in" />
145   - <Unit filename="src\lib3270\X11keysym.h" />
146   - <Unit filename="src\lib3270\XtGlue.c">
  134 + <Unit filename="src/include/lib3270.h" />
  135 + <Unit filename="src/include/lib3270/action_table.h" />
  136 + <Unit filename="src/include/lib3270/actions.h" />
  137 + <Unit filename="src/include/lib3270/config.h.in" />
  138 + <Unit filename="src/include/lib3270/log.h" />
  139 + <Unit filename="src/include/lib3270/popup.h" />
  140 + <Unit filename="src/include/lib3270/selection.h" />
  141 + <Unit filename="src/include/lib3270/session.h" />
  142 + <Unit filename="src/include/pw3270.h" />
  143 + <Unit filename="src/include/rules.mak.in" />
  144 + <Unit filename="src/lib3270/3270ds.h" />
  145 + <Unit filename="src/lib3270/Makefile.in" />
  146 + <Unit filename="src/lib3270/X11keysym.h" />
  147 + <Unit filename="src/lib3270/XtGlue.c">
147 148 <Option compilerVar="CC" />
148 149 </Unit>
149   - <Unit filename="src\lib3270\actions.c">
  150 + <Unit filename="src/lib3270/actions.c">
150 151 <Option compilerVar="CC" />
151 152 </Unit>
152   - <Unit filename="src\lib3270\actionsc.h" />
153   - <Unit filename="src\lib3270\ansi.c">
  153 + <Unit filename="src/lib3270/actionsc.h" />
  154 + <Unit filename="src/lib3270/ansi.c">
154 155 <Option compilerVar="CC" />
155 156 </Unit>
156   - <Unit filename="src\lib3270\ansic.h" />
157   - <Unit filename="src\lib3270\api.h" />
158   - <Unit filename="src\lib3270\apl.c">
  157 + <Unit filename="src/lib3270/ansic.h" />
  158 + <Unit filename="src/lib3270/api.h" />
  159 + <Unit filename="src/lib3270/apl.c">
159 160 <Option compilerVar="CC" />
160 161 </Unit>
161   - <Unit filename="src\lib3270\aplc.h" />
162   - <Unit filename="src\lib3270\appres.h" />
163   - <Unit filename="src\lib3270\arpa_telnet.h" />
164   - <Unit filename="src\lib3270\cg.h" />
165   - <Unit filename="src\lib3270\charset.c">
  162 + <Unit filename="src/lib3270/aplc.h" />
  163 + <Unit filename="src/lib3270/appres.h" />
  164 + <Unit filename="src/lib3270/arpa_telnet.h" />
  165 + <Unit filename="src/lib3270/cg.h" />
  166 + <Unit filename="src/lib3270/charset.c">
166 167 <Option compilerVar="CC" />
167 168 </Unit>
168   - <Unit filename="src\lib3270\charsetc.h" />
169   - <Unit filename="src\lib3270\childc.h" />
170   - <Unit filename="src\lib3270\ctlr.c">
  169 + <Unit filename="src/lib3270/charsetc.h" />
  170 + <Unit filename="src/lib3270/childc.h" />
  171 + <Unit filename="src/lib3270/ctlr.c">
171 172 <Option compilerVar="CC" />
172 173 </Unit>
173   - <Unit filename="src\lib3270\ctlr.h" />
174   - <Unit filename="src\lib3270\ctlrc.h" />
175   - <Unit filename="src\lib3270\dialogc.h" />
176   - <Unit filename="src\lib3270\fallbacks.c">
  174 + <Unit filename="src/lib3270/ctlr.h" />
  175 + <Unit filename="src/lib3270/ctlrc.h" />
  176 + <Unit filename="src/lib3270/dialogc.h" />
  177 + <Unit filename="src/lib3270/fallbacks.c">
177 178 <Option compilerVar="CC" />
178 179 </Unit>
179   - <Unit filename="src\lib3270\ft.c">
  180 + <Unit filename="src/lib3270/ft.c">
180 181 <Option compilerVar="CC" />
181 182 </Unit>
182   - <Unit filename="src\lib3270\ft_cut.c">
  183 + <Unit filename="src/lib3270/ft_cut.c">
183 184 <Option compilerVar="CC" />
184 185 </Unit>
185   - <Unit filename="src\lib3270\ft_cut_ds.h" />
186   - <Unit filename="src\lib3270\ft_cutc.h" />
187   - <Unit filename="src\lib3270\ft_dft.c">
  186 + <Unit filename="src/lib3270/ft_cut_ds.h" />
  187 + <Unit filename="src/lib3270/ft_cutc.h" />
  188 + <Unit filename="src/lib3270/ft_dft.c">
188 189 <Option compilerVar="CC" />
189 190 </Unit>
190   - <Unit filename="src\lib3270\ft_dft_ds.h" />
191   - <Unit filename="src\lib3270\ft_dftc.h" />
192   - <Unit filename="src\lib3270\ftc.h" />
193   - <Unit filename="src\lib3270\globals.h" />
194   - <Unit filename="src\lib3270\glue.c">
  191 + <Unit filename="src/lib3270/ft_dft_ds.h" />
  192 + <Unit filename="src/lib3270/ft_dftc.h" />
  193 + <Unit filename="src/lib3270/ftc.h" />
  194 + <Unit filename="src/lib3270/globals.h" />
  195 + <Unit filename="src/lib3270/glue.c">
195 196 <Option compilerVar="CC" />
196 197 </Unit>
197   - <Unit filename="src\lib3270\gluec.h" />
198   - <Unit filename="src\lib3270\host.c">
  198 + <Unit filename="src/lib3270/gluec.h" />
  199 + <Unit filename="src/lib3270/host.c">
199 200 <Option compilerVar="CC" />
200 201 </Unit>
201   - <Unit filename="src\lib3270\hostc.h" />
202   - <Unit filename="src\lib3270\icmdc.h" />
203   - <Unit filename="src\lib3270\init.c">
  202 + <Unit filename="src/lib3270/hostc.h" />
  203 + <Unit filename="src/lib3270/icmdc.h" />
  204 + <Unit filename="src/lib3270/init.c">
204 205 <Option compilerVar="CC" />
205 206 </Unit>
206   - <Unit filename="src\lib3270\keypadc.h" />
207   - <Unit filename="src\lib3270\kybd.c">
  207 + <Unit filename="src/lib3270/keypadc.h" />
  208 + <Unit filename="src/lib3270/kybd.c">
208 209 <Option compilerVar="CC" />
209 210 </Unit>
210   - <Unit filename="src\lib3270\kybdc.h" />
211   - <Unit filename="src\lib3270\localdefs.h" />
212   - <Unit filename="src\lib3270\log.c">
  211 + <Unit filename="src/lib3270/kybdc.h" />
  212 + <Unit filename="src/lib3270/localdefs.h" />
  213 + <Unit filename="src/lib3270/log.c">
213 214 <Option compilerVar="CC" />
214 215 </Unit>
215   - <Unit filename="src\lib3270\macros.c">
  216 + <Unit filename="src/lib3270/macros.c">
216 217 <Option compilerVar="CC" />
217 218 </Unit>
218   - <Unit filename="src\lib3270\mkfb.c">
  219 + <Unit filename="src/lib3270/mkfb.c">
219 220 <Option compilerVar="CC" />
220 221 </Unit>
221   - <Unit filename="src\lib3270\objects.h" />
222   - <Unit filename="src\lib3270\paste.c">
  222 + <Unit filename="src/lib3270/objects.h" />
  223 + <Unit filename="src/lib3270/paste.c">
223 224 <Option compilerVar="CC" />
224 225 </Unit>
225   - <Unit filename="src\lib3270\popupsc.h" />
226   - <Unit filename="src\lib3270\print.c">
  226 + <Unit filename="src/lib3270/popupsc.h" />
  227 + <Unit filename="src/lib3270/print.c">
227 228 <Option compilerVar="CC" />
228 229 </Unit>
229   - <Unit filename="src\lib3270\printc.h" />
230   - <Unit filename="src\lib3270\printer.c">
  230 + <Unit filename="src/lib3270/printc.h" />
  231 + <Unit filename="src/lib3270/printer.c">
231 232 <Option compilerVar="CC" />
232 233 </Unit>
233   - <Unit filename="src\lib3270\printerc.h" />
234   - <Unit filename="src\lib3270\proxy.c">
  234 + <Unit filename="src/lib3270/printerc.h" />
  235 + <Unit filename="src/lib3270/proxy.c">
235 236 <Option compilerVar="CC" />
236 237 </Unit>
237   - <Unit filename="src\lib3270\proxyc.h" />
238   - <Unit filename="src\lib3270\resolver.c">
  238 + <Unit filename="src/lib3270/proxyc.h" />
  239 + <Unit filename="src/lib3270/resolver.c">
239 240 <Option compilerVar="CC" />
240 241 </Unit>
241   - <Unit filename="src\lib3270\resolverc.h" />
242   - <Unit filename="src\lib3270\resources.c">
  242 + <Unit filename="src/lib3270/resolverc.h" />
  243 + <Unit filename="src/lib3270/resources.c">
243 244 <Option compilerVar="CC" />
244 245 </Unit>
245   - <Unit filename="src\lib3270\resources.h" />
246   - <Unit filename="src\lib3270\rpq.c">
  246 + <Unit filename="src/lib3270/resources.h" />
  247 + <Unit filename="src/lib3270/rpq.c">
247 248 <Option compilerVar="CC" />
248 249 </Unit>
249   - <Unit filename="src\lib3270\savec.h" />
250   - <Unit filename="src\lib3270\screen.c">
  250 + <Unit filename="src/lib3270/savec.h" />
  251 + <Unit filename="src/lib3270/screen.c">
251 252 <Option compilerVar="CC" />
252 253 </Unit>
253   - <Unit filename="src\lib3270\screen.h" />
254   - <Unit filename="src\lib3270\screenc.h" />
255   - <Unit filename="src\lib3270\scrollc.h" />
256   - <Unit filename="src\lib3270\see.c">
  254 + <Unit filename="src/lib3270/screen.h" />
  255 + <Unit filename="src/lib3270/screenc.h" />
  256 + <Unit filename="src/lib3270/scrollc.h" />
  257 + <Unit filename="src/lib3270/see.c">
257 258 <Option compilerVar="CC" />
258 259 </Unit>
259   - <Unit filename="src\lib3270\seec.h" />
260   - <Unit filename="src\lib3270\selection.c">
  260 + <Unit filename="src/lib3270/seec.h" />
  261 + <Unit filename="src/lib3270/selection.c">
261 262 <Option compilerVar="CC" />
262 263 </Unit>
263   - <Unit filename="src\lib3270\sf.c">
  264 + <Unit filename="src/lib3270/sf.c">
264 265 <Option compilerVar="CC" />
265 266 </Unit>
266   - <Unit filename="src\lib3270\sfc.h" />
267   - <Unit filename="src\lib3270\shlobj_missing.h" />
268   - <Unit filename="src\lib3270\statusc.h" />
269   - <Unit filename="src\lib3270\tables.c">
  267 + <Unit filename="src/lib3270/sfc.h" />
  268 + <Unit filename="src/lib3270/shlobj_missing.h" />
  269 + <Unit filename="src/lib3270/statusc.h" />
  270 + <Unit filename="src/lib3270/tables.c">
270 271 <Option compilerVar="CC" />
271 272 </Unit>
272   - <Unit filename="src\lib3270\tablesc.h" />
273   - <Unit filename="src\lib3270\telnet.c">
  273 + <Unit filename="src/lib3270/tablesc.h" />
  274 + <Unit filename="src/lib3270/telnet.c">
274 275 <Option compilerVar="CC" />
275 276 </Unit>
276   - <Unit filename="src\lib3270\telnetc.h" />
277   - <Unit filename="src\lib3270\testprogram.c">
  277 + <Unit filename="src/lib3270/telnetc.h" />
  278 + <Unit filename="src/lib3270/testprogram.c">
278 279 <Option compilerVar="CC" />
279 280 </Unit>
280   - <Unit filename="src\lib3270\tn3270e.h" />
281   - <Unit filename="src\lib3270\toggle.h" />
282   - <Unit filename="src\lib3270\toggles.c">
  281 + <Unit filename="src/lib3270/tn3270e.h" />
  282 + <Unit filename="src/lib3270/toggle.h" />
  283 + <Unit filename="src/lib3270/toggles.c">
283 284 <Option compilerVar="CC" />
284 285 </Unit>
285   - <Unit filename="src\lib3270\togglesc.h" />
286   - <Unit filename="src\lib3270\trace_ds.c">
  286 + <Unit filename="src/lib3270/togglesc.h" />
  287 + <Unit filename="src/lib3270/trace_ds.c">
287 288 <Option compilerVar="CC" />
288 289 </Unit>
289   - <Unit filename="src\lib3270\trace_dsc.h" />
290   - <Unit filename="src\lib3270\utf8.c">
  290 + <Unit filename="src/lib3270/trace_dsc.h" />
  291 + <Unit filename="src/lib3270/utf8.c">
291 292 <Option compilerVar="CC" />
292 293 </Unit>
293   - <Unit filename="src\lib3270\utf8c.h" />
294   - <Unit filename="src\lib3270\util.c">
  294 + <Unit filename="src/lib3270/utf8c.h" />
  295 + <Unit filename="src/lib3270/util.c">
295 296 <Option compilerVar="CC" />
296 297 </Unit>
297   - <Unit filename="src\lib3270\utilc.h" />
298   - <Unit filename="src\lib3270\version.c">
  298 + <Unit filename="src/lib3270/utilc.h" />
  299 + <Unit filename="src/lib3270/version.c">
299 300 <Option compilerVar="CC" />
300 301 </Unit>
301   - <Unit filename="src\lib3270\w3misc.c">
  302 + <Unit filename="src/lib3270/w3misc.c">
302 303 <Option compilerVar="CC" />
303 304 </Unit>
304   - <Unit filename="src\lib3270\w3miscc.h" />
305   - <Unit filename="src\lib3270\widec.h" />
306   - <Unit filename="src\lib3270\winvers.c">
  305 + <Unit filename="src/lib3270/w3miscc.h" />
  306 + <Unit filename="src/lib3270/widec.h" />
  307 + <Unit filename="src/lib3270/winvers.c">
307 308 <Option compilerVar="CC" />
308 309 </Unit>
309   - <Unit filename="src\lib3270\winversc.h" />
310   - <Unit filename="src\lib3270\xio.c">
  310 + <Unit filename="src/lib3270/winversc.h" />
  311 + <Unit filename="src/lib3270/xio.c">
311 312 <Option compilerVar="CC" />
312 313 </Unit>
313   - <Unit filename="src\lib3270\xioc.h" />
314   - <Unit filename="src\lib3270\xl.h" />
315   - <Unit filename="ui\00default.xml" />
316   - <Unit filename="ui\99debug.xml" />
  314 + <Unit filename="src/lib3270/xioc.h" />
  315 + <Unit filename="src/lib3270/xl.h" />
  316 + <Unit filename="ui/00default.xml" />
  317 + <Unit filename="ui/99debug.xml" />
317 318 <Extensions>
318 319 <code_completion />
319 320 <debugger />
... ...
src/gtk/print.c
  Diff comments   View file @e9fcb00
... ... @@ -117,7 +117,38 @@
117 117  
118 118 static GObject * create_custom_widget(GtkPrintOperation *prt, PRINT_INFO *info)
119 119 {
120   - static const gchar * label[] = { N_( "Font:" ), N_( "Colors:" ) };
  120 + static const gchar *def_colors = "white,"
  121 + "black,"
  122 + "black,"
  123 + "black,"
  124 + "black,"
  125 + "black,"
  126 + "black,"
  127 + "black,"
  128 + "black,"
  129 + "black,"
  130 + "black,"
  131 + "black,"
  132 + "black,"
  133 + "black,"
  134 + "black,"
  135 + "black,"
  136 + "black,"
  137 + "black,"
  138 + "black,"
  139 + "black,"
  140 + "black,"
  141 + "white,"
  142 + "black,"
  143 + "black,"
  144 + "black,"
  145 + "white,"
  146 + "black,"
  147 + "black,"
  148 + "black,"
  149 + "black";
  150 +
  151 + static const gchar * label[] = { N_( "Font:" ), N_( "Color scheme:" ) };
121 152 GtkWidget * container = gtk_table_new(2,2,FALSE);
122 153 GtkWidget * widget;
123 154 int f;
... ... @@ -147,6 +178,7 @@
147 178 widget = gtk_combo_box_new();
148 179 #endif // GTK(3,0,0)
149 180  
  181 + info->colorname = get_string_from_config("print","colors",def_colors);
150 182 load_color_schemes(widget,info->colorname);
151 183 gtk_table_attach(GTK_TABLE(container),widget,1,2,1,2,GTK_EXPAND|GTK_FILL,GTK_FILL,5,0);
152 184  
... ...