Fixing windows visual style for settings dialog.

Perry Werneck
1 parent 079a4b76
Showing 2 changed files with 40 additions and 25 deletions Show diff stats
locale/pt_BR.po
src/dialogs/settings/dialog.c
@@ -5,7 +5,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: pw3270 5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-31 11:36-0300\n"
+"POT-Creation-Date: 2020-02-07 16:25-0300\n"
 "PO-Revision-Date: 2020-01-31 11:36-0300\n"
 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
 "Language-Team: Português <>\n"
@@ -201,7 +201,7 @@ msgstr &quot;Erro ao converter valor do cgcsid&quot;
 msgid "Can't parse character value"
 msgstr "Erro ao analisar valor de caractere"
-#: src/selection/linux/paste.c:80 src/selection/linux/paste.c:115
+#: src/selection/windows/paste.c:79 src/selection/windows/paste.c:119
 msgid "Can't paste"
 msgstr "Não é possivel colar"
@@ -227,8 +227,8 @@ msgstr &quot;Não foi possível registrar manipuladores de I/O 3270&quot;
 msgid "Can't start file transfer session"
 msgstr "Não foi possível iniciar transferência de arquivo"
-#: src/terminal/callbacks.c:393 src/filetransfer/v3270ftprogress.c:433
-#: src/filetransfer/transfer.c:89 src/dialogs/load.c:111
+#: src/terminal/callbacks.c:393 src/filetransfer/transfer.c:89
+#: src/filetransfer/v3270ftprogress.c:433 src/dialogs/load.c:111
 #: src/dialogs/save/save.c:136 src/dialogs/settings/host.c:369
 msgid "Cancel"
 msgstr "_Cancelar"
@@ -412,7 +412,7 @@ msgstr &quot;Não perguntar de novo&quot;
 msgid "ETA:"
 msgstr "ETA:"
-#: src/terminal/actions/pfkey.c:98 src/terminal/actions/pakey.c:98
+#: src/terminal/actions/pakey.c:98 src/terminal/actions/pfkey.c:98
 msgid "Emit a PA Key action"
 msgstr "Emite uma ação de tecla PA"
@@ -613,11 +613,11 @@ msgstr &quot;Atalhos de teclado&quot;
 msgid "L_U Names"
 msgstr "Nomes de L_U"
-#: src/filetransfer/v3270ft.c:198 src/filetransfer/activitylist.c:384
+#: src/filetransfer/activitylist.c:384 src/filetransfer/v3270ft.c:198
 msgid "Load"
 msgstr "Load"
-#: src/filetransfer/v3270ft.c:197 src/filetransfer/activitylist.c:383
+#: src/filetransfer/activitylist.c:383 src/filetransfer/v3270ft.c:197
 msgid "Load queue from file"
 msgstr "Ler a fila de um arquivo"
@@ -697,10 +697,6 @@ msgstr &quot;Nenhum (Não exporta cores)&quot;
 msgid "None (Don't export font name)"
 msgstr "Nenhuma (Não exporta fontes)"
-#: src/selection/linux/paste.c:117
-msgid "None of the screens in the clipboard match with the current one."
-msgstr "Nenhuma das telas da área de transferência corresponde à atual."
-
 #: src/dialogs/settings/colors.c:174
 msgid "Normal/Protected"
 msgstr "Normal/Protegido"
@@ -709,7 +705,7 @@ msgstr &quot;Normal/Protegido&quot;
 msgid "Normal/Unprotected"
 msgstr "Normal/Desprotegido"
-#: src/selection/linux/paste.c:76
+#: src/selection/windows/paste.c:75
 msgid "Not the same terminal type"
 msgstr "O tipo de terminal é diferente"
@@ -990,8 +986,8 @@ msgstr &quot;&quot;
 msgid "Same of the screen"
 msgstr "Igual ao terminal"
-#: src/terminal/actions/table.c:252 src/filetransfer/v3270ft.c:215
-#: src/filetransfer/activitylist.c:453 src/trace/trace.c:477
+#: src/terminal/actions/table.c:252 src/filetransfer/activitylist.c:453
+#: src/filetransfer/v3270ft.c:215 src/trace/trace.c:477
 #: src/dialogs/transfer.c:69
 msgid "Save"
 msgstr "Salvar"
@@ -1012,7 +1008,7 @@ msgstr &quot;Salvar tela&quot;
 msgid "Save copy"
 msgstr "Salvar cópia"
-#: src/filetransfer/v3270ft.c:214 src/filetransfer/activitylist.c:452
+#: src/filetransfer/activitylist.c:452 src/filetransfer/v3270ft.c:214
 msgid "Save queue to file"
 msgstr "Salvar a fila para um arquivo"
@@ -1471,8 +1467,9 @@ msgstr &quot;Turquesa&quot;
 msgid "UTF-8"
 msgstr "UTF-8"
-#: src/selection/linux/paste.c:116
-msgid "Unable to paste formatted data."
+#: src/selection/windows/paste.c:115
+#, fuzzy
+msgid "Unable to paste formatted data"
 msgstr "Incapaz de colar texto formatado."
 #: src/filetransfer/tables.c:92
@@ -1494,7 +1491,7 @@ msgstr &quot;Modo inesperado %d&quot;
 msgid "Unexpected status %d in print operation"
 msgstr "Estado inesperado %d na operação de impressão"
-#: src/dialogs/save/save.c:149
+#: src/dialogs/windows/select.c:169 src/dialogs/save/save.c:149
 msgid "Untitled document"
 msgstr "Documento sem título"
@@ -1696,9 +1693,9 @@ msgstr &quot;Texto _ASCII&quot;
 msgid "_Apply"
 msgstr "_Aplicar"
-#: src/selection/linux/paste.c:84 src/selection/linux/paste.c:118
-#: src/dialogs/load.c:202 src/dialogs/load.c:221 src/dialogs/linux/select.c:51
-#: src/dialogs/linux/select.c:77 src/dialogs/print/settingsdialog.c:410
+#: src/selection/windows/paste.c:83 src/selection/windows/paste.c:123
+#: src/dialogs/load.c:202 src/dialogs/load.c:221
+#: src/dialogs/windows/select.c:158 src/dialogs/print/settingsdialog.c:410
 #: src/dialogs/print/settingsdialog.c:429 src/dialogs/save/save.c:264
 #: src/dialogs/save/save.c:283 src/dialogs/settings/dialog.c:229
 msgid "_Cancel"
@@ -1749,7 +1746,7 @@ msgstr &quot;_Modelo&quot;
 msgid "_Operation"
 msgstr "_Operação:"
-#: src/selection/linux/paste.c:85 src/selection/linux/paste.c:119
+#: src/selection/windows/paste.c:84 src/selection/windows/paste.c:124
 msgid "_Paste as text"
 msgstr "_Colar como texto"
@@ -2918,6 +2915,9 @@ msgstr &quot;Diminui o tamanho da fonte&quot;
 #~ msgid "Non zero if the host is TSO."
 #~ msgstr "Diferente de zero se o host é TSO"
+#~ msgid "None of the screens in the clipboard match with the current one."
+#~ msgstr "Nenhuma das telas da área de transferência corresponde à atual."
+
 #~ msgid "Not available"
 #~ msgstr "Não disponível"
@@ -215,13 +215,15 @@ static void V3270SettingsDialog_init(V3270SettingsDialog *dialog)
 	GtkWidget * content_area = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
 	// Get use of header bar.
+#ifndef _WIN32
 	g_object_get(gtk_settings_get_default(), "gtk-dialogs-use-header", &dialog->has_subtitle, NULL);
+#endif // _WIN32
 	// https://developer.gnome.org/hig/stable/visual-layout.html.en
 	//gtk_box_set_spacing(GTK_BOX(content_area),18);
 	//gtk_container_set_border_width(GTK_CONTAINER(content_area),18);
-	gtk_window_set_deletable(GTK_WINDOW(dialog),FALSE);
+//	gtk_window_set_deletable(GTK_WINDOW(dialog),FALSE);
     gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE);
 	gtk_dialog_add_buttons(
@@ -234,9 +236,13 @@ static void V3270SettingsDialog_init(V3270SettingsDialog *dialog)
 	// Create notebook for settings widgets
 	dialog->tabs = GTK_NOTEBOOK(gtk_notebook_new());
+#ifdef _WIN32
+	gtk_widget_set_margin_bottom(GTK_WIDGET(dialog->tabs),3);
+//	gtk_notebook_set_show_border(dialog->tabs, TRUE);
+#endif // _WIN32
+
 	gtk_notebook_set_scrollable(dialog->tabs,TRUE);
 	gtk_notebook_set_show_tabs(dialog->tabs,FALSE);
-	// gtk_notebook_set_show_border(dialog->tabs, TRUE);
 	g_signal_connect(G_OBJECT(dialog->tabs), "page-added", G_CALLBACK(on_page_changed), dialog);
 	g_signal_connect(G_OBJECT(dialog->tabs), "page-removed", G_CALLBACK(on_page_changed), dialog);
 	g_signal_connect(G_OBJECT(dialog->tabs), "switch-page", G_CALLBACK(on_switch_page), dialog);
@@ -247,7 +253,16 @@ static void V3270SettingsDialog_init(V3270SettingsDialog *dialog)
 GtkWidget * v3270_settings_dialog_new()
 {
-#if GTK_CHECK_VERSION(3,12,0)
+#ifdef _WIN32
+
+	GtkWidget * dialog =
+		GTK_WIDGET(g_object_new(
+			GTK_TYPE_V3270_SETTINGS_DIALOG,
+			"use-header-bar", FALSE,
+			NULL
+		));
+
+#elif GTK_CHECK_VERSION(3,12,0)
 	gboolean use_header;
 	g_object_get(gtk_settings_get_default(), "gtk-dialogs-use-header", &use_header, NULL);