Ajustando dialogo de configuracao de impressora

perry.werneck@gmail.com
1 parent ed3e5b27
Showing 5 changed files with 41 additions and 12 deletions Show diff stats
src/pw3270/print.c
src/pw3270/uiparser/parsefile.c
src/pw3270/uiparser/private.h
ui/00default.xml
ui/99debug.xml
@@ -352,7 +352,6 @@ static gchar * enum_to_string(GType type, guint enum_value)
 	GtkWidget			* label[G_N_ELEMENTS(text)];
 	GtkWidget			* widget;
 	int					  f;
- 	gchar				* font;
  
 	trace("%s starts",__FUNCTION__);
  
@@ -364,8 +363,14 @@ static gchar * enum_to_string(GType type, guint enum_value)
 	}
  
 	// Font selection button
-	widget = gtk_font_button_new();
-	gtk_label_set_mnemonic_widget(GTK_LABEL(label[0]),widget);
+	{
+		gchar * font = get_string_from_config("print","font","Courier New 10");
+		widget = gtk_font_button_new_with_font(font);
+		gtk_font_button_set_show_size((GtkFontButton *) widget,FALSE);
+		gtk_font_button_set_use_font((GtkFontButton *) widget,TRUE);
+		gtk_label_set_mnemonic_widget(GTK_LABEL(label[0]),widget);
+		g_free(font);
+	}
  
 #if GTK_CHECK_VERSION(3,2,0)
 	gtk_font_chooser_set_filter_func((GtkFontChooser *) widget,filter_monospaced,NULL,NULL);
@@ -374,9 +379,6 @@ static gchar * enum_to_string(GType type, guint enum_value)
  
 	load_settings(info);
  
- 	font = get_string_from_config("print","font","Courier New 10");
-	gtk_font_button_set_font_name((GtkFontButton *) widget, font);
-	g_free(font);
  
     g_signal_connect(G_OBJECT(widget),"font-set",G_CALLBACK(font_set),info);
  
@@ -170,6 +170,33 @@
  	GtkWidget		* widget	= NULL;
  	int				  f;
  
+	name = ui_get_attribute("platform",names,values);
+	if(name)
+	{
+#if defined(WIN32)
+		static const gchar *platname = "windows";
+#elif defined(linux)
+		static const gchar *platname = "linux";
+#elif defined( __APPLE__ )
+		static const gchar *platname = "apple";
+#else
+		static const gchar *platname = "none";
+#endif
+		gchar **plat = g_strsplit(name,",",-1);
+		info->disabled = 1;
+
+		for(f=0;info->disabled && plat[f];f++)
+		{
+			if(!g_strcasecmp(plat[f],platname))
+				info->disabled = 0;
+		}
+
+		g_strfreev(plat);
+
+		if(info->disabled)
+			return;
+	}
+
 	for(f=0;f<G_N_ELEMENTS(element_builder);f++)
 	{
 		if(!g_ascii_strcasecmp(element_name,element_builder[f].name))
@@ -242,14 +269,11 @@
  	GtkWidget *widget = GTK_WIDGET(info->element);
  	int f;
  
-/*
 	if(info->disabled)
 	{
-		info->disabled--;
-//		trace("%s: <%s> disabled=%d",__FUNCTION__,element_name,info->disabled);
+		info->disabled = 0;
 		return;
 	}
-*/
  
 	for(f=0;f<G_N_ELEMENTS(element_builder);f++)
 	{
@@ -82,8 +82,11 @@
 	GHashTable	 			*  actions;			/**< List of actions */
 	GHashTable				*  element_list[UI_ELEMENT_COUNT];
 	const UI_WIDGET_SETUP	*  setup;
+
+	int						   disabled : 1;
+
 #ifdef HAVE_GTKMAC
-	GtkWidget			*  sysmenu[SYSMENU_ITEM_COUNT];
+	GtkWidget				*  sysmenu[SYSMENU_ITEM_COUNT];
 #endif // HAVE_GTKMAC
 	void					*  block_data;
  };
@@ -107,6 +107,7 @@
  
 		<menu name='SettingsMenu' label='Settings'>
 			<menuitem action='editcolors' icon='select-color' label='Colors' />
+			<menuitem action='printsettings' platform='windows' label='Print settings' />
  
 			<!--- Special action - The fontselect menu will be populated with all available monospaced fonts --->
 			<menuitem name='fontselect' icon='select-font' label='Select font' />
@@ -48,7 +48,6 @@
 			<menuitem action='testpattern' group='offline' label='Show test pattern' />
 			<menuitem action='reload' label='Reload buffer contents' />
 			<menuitem action='toggle' id='gdkdebug' label='Debug window updates' />
-			<menuitem action='printsettings' label='Print settings' />
 		</menu>
  
 	</menubar>
...	...	@@ -352,7 +352,6 @@ static gchar * enum_to_string(GType type, guint enum_value)
352	352	GtkWidget * label[G_N_ELEMENTS(text)];
353	353	GtkWidget * widget;
354	354	int f;
355		- gchar * font;
356	355
357	356	trace("%s starts",__FUNCTION__);
358	357
...	...	@@ -364,8 +363,14 @@ static gchar * enum_to_string(GType type, guint enum_value)
364	363	}
365	364
366	365	// Font selection button
367		- widget = gtk_font_button_new();
368		- gtk_label_set_mnemonic_widget(GTK_LABEL(label[0]),widget);
	366	+ {
	367	+ gchar * font = get_string_from_config("print","font","Courier New 10");
	368	+ widget = gtk_font_button_new_with_font(font);
	369	+ gtk_font_button_set_show_size((GtkFontButton *) widget,FALSE);
	370	+ gtk_font_button_set_use_font((GtkFontButton *) widget,TRUE);
	371	+ gtk_label_set_mnemonic_widget(GTK_LABEL(label[0]),widget);
	372	+ g_free(font);
	373	+ }
369	374
370	375	#if GTK_CHECK_VERSION(3,2,0)
371	376	gtk_font_chooser_set_filter_func((GtkFontChooser *) widget,filter_monospaced,NULL,NULL);
...	...	@@ -374,9 +379,6 @@ static gchar * enum_to_string(GType type, guint enum_value)
374	379
375	380	load_settings(info);
376	381
377		- font = get_string_from_config("print","font","Courier New 10");
378		- gtk_font_button_set_font_name((GtkFontButton *) widget, font);
379		- g_free(font);
380	382
381	383	g_signal_connect(G_OBJECT(widget),"font-set",G_CALLBACK(font_set),info);
382	384
...	...
...	...	@@ -170,6 +170,33 @@
170	170	GtkWidget * widget = NULL;
171	171	int f;
172	172
	173	+ name = ui_get_attribute("platform",names,values);
	174	+ if(name)
	175	+ {
	176	+#if defined(WIN32)
	177	+ static const gchar *platname = "windows";
	178	+#elif defined(linux)
	179	+ static const gchar *platname = "linux";
	180	+#elif defined( __APPLE__ )
	181	+ static const gchar *platname = "apple";
	182	+#else
	183	+ static const gchar *platname = "none";
	184	+#endif
	185	+ gchar **plat = g_strsplit(name,",",-1);
	186	+ info->disabled = 1;
	187	+
	188	+ for(f=0;info->disabled && plat[f];f++)
	189	+ {
	190	+ if(!g_strcasecmp(plat[f],platname))
	191	+ info->disabled = 0;
	192	+ }
	193	+
	194	+ g_strfreev(plat);
	195	+
	196	+ if(info->disabled)
	197	+ return;
	198	+ }
	199	+
173	200	for(f=0;f<G_N_ELEMENTS(element_builder);f++)
174	201	{
175	202	if(!g_ascii_strcasecmp(element_name,element_builder[f].name))
...	...	@@ -242,14 +269,11 @@
242	269	GtkWidget *widget = GTK_WIDGET(info->element);
243	270	int f;
244	271
245		-/*
246	272	if(info->disabled)
247	273	{
248		- info->disabled--;
249		-// trace("%s: <%s> disabled=%d",__FUNCTION__,element_name,info->disabled);
	274	+ info->disabled = 0;
250	275	return;
251	276	}
252		-*/
253	277
254	278	for(f=0;f<G_N_ELEMENTS(element_builder);f++)
255	279	{
...	...
...	...	@@ -82,8 +82,11 @@
82	82	GHashTable * actions; /*< List of actions /
83	83	GHashTable * element_list[UI_ELEMENT_COUNT];
84	84	const UI_WIDGET_SETUP * setup;
	85	+
	86	+ int disabled : 1;
	87	+
85	88	#ifdef HAVE_GTKMAC
86		- GtkWidget * sysmenu[SYSMENU_ITEM_COUNT];
	89	+ GtkWidget * sysmenu[SYSMENU_ITEM_COUNT];
87	90	#endif // HAVE_GTKMAC
88	91	void * block_data;
89	92	};
...	...
...	...	@@ -107,6 +107,7 @@
107	107
108	108	<menu name='SettingsMenu' label='Settings'>
109	109	<menuitem action='editcolors' icon='select-color' label='Colors' />
	110	+ <menuitem action='printsettings' platform='windows' label='Print settings' />
110	111
111	112	<!--- Special action - The fontselect menu will be populated with all available monospaced fonts --->
112	113	<menuitem name='fontselect' icon='select-font' label='Select font' />
...	...
...	...	@@ -48,7 +48,6 @@
48	48	<menuitem action='testpattern' group='offline' label='Show test pattern' />
49	49	<menuitem action='reload' label='Reload buffer contents' />
50	50	<menuitem action='toggle' id='gdkdebug' label='Debug window updates' />
51		- <menuitem action='printsettings' label='Print settings' />
52	51	</menu>
53	52
54	53	</menubar>
...	...