Download as
Browse Code »

Commit c413483b45665cbabc2d2bbe9edf18fe2a3403d4

Authored by Perry Werneck
1 parent 079a4b76
Exists in master and in 1 other branch develop

Fixing windows visual style for settings dialog.

Showing 2 changed files with 40 additions and 25 deletions   Show diff stats
locale/pt_BR.po
  Diff comments   View file @c413483
... ... @@ -5,7 +5,7 @@ msgid ""
5 5 msgstr ""
6 6 "Project-Id-Version: pw3270 5.0\n"
7 7 "Report-Msgid-Bugs-To: \n"
8   -"POT-Creation-Date: 2020-01-31 11:36-0300\n"
  8 +"POT-Creation-Date: 2020-02-07 16:25-0300\n"
9 9 "PO-Revision-Date: 2020-01-31 11:36-0300\n"
10 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 11 "Language-Team: Português <>\n"
... ... @@ -201,7 +201,7 @@ msgstr &quot;Erro ao converter valor do cgcsid&quot;
201 201 msgid "Can't parse character value"
202 202 msgstr "Erro ao analisar valor de caractere"
203 203  
204   -#: src/selection/linux/paste.c:80 src/selection/linux/paste.c:115
  204 +#: src/selection/windows/paste.c:79 src/selection/windows/paste.c:119
205 205 msgid "Can't paste"
206 206 msgstr "Não é possivel colar"
207 207  
... ... @@ -227,8 +227,8 @@ msgstr &quot;Não foi possível registrar manipuladores de I/O 3270&quot;
227 227 msgid "Can't start file transfer session"
228 228 msgstr "Não foi possível iniciar transferência de arquivo"
229 229  
230   -#: src/terminal/callbacks.c:393 src/filetransfer/v3270ftprogress.c:433
231   -#: src/filetransfer/transfer.c:89 src/dialogs/load.c:111
  230 +#: src/terminal/callbacks.c:393 src/filetransfer/transfer.c:89
  231 +#: src/filetransfer/v3270ftprogress.c:433 src/dialogs/load.c:111
232 232 #: src/dialogs/save/save.c:136 src/dialogs/settings/host.c:369
233 233 msgid "Cancel"
234 234 msgstr "_Cancelar"
... ... @@ -412,7 +412,7 @@ msgstr &quot;Não perguntar de novo&quot;
412 412 msgid "ETA:"
413 413 msgstr "ETA:"
414 414  
415   -#: src/terminal/actions/pfkey.c:98 src/terminal/actions/pakey.c:98
  415 +#: src/terminal/actions/pakey.c:98 src/terminal/actions/pfkey.c:98
416 416 msgid "Emit a PA Key action"
417 417 msgstr "Emite uma ação de tecla PA"
418 418  
... ... @@ -613,11 +613,11 @@ msgstr &quot;Atalhos de teclado&quot;
613 613 msgid "L_U Names"
614 614 msgstr "Nomes de L_U"
615 615  
616   -#: src/filetransfer/v3270ft.c:198 src/filetransfer/activitylist.c:384
  616 +#: src/filetransfer/activitylist.c:384 src/filetransfer/v3270ft.c:198
617 617 msgid "Load"
618 618 msgstr "Load"
619 619  
620   -#: src/filetransfer/v3270ft.c:197 src/filetransfer/activitylist.c:383
  620 +#: src/filetransfer/activitylist.c:383 src/filetransfer/v3270ft.c:197
621 621 msgid "Load queue from file"
622 622 msgstr "Ler a fila de um arquivo"
623 623  
... ... @@ -697,10 +697,6 @@ msgstr &quot;Nenhum (Não exporta cores)&quot;
697 697 msgid "None (Don't export font name)"
698 698 msgstr "Nenhuma (Não exporta fontes)"
699 699  
700   -#: src/selection/linux/paste.c:117
701   -msgid "None of the screens in the clipboard match with the current one."
702   -msgstr "Nenhuma das telas da área de transferência corresponde à atual."
703   -
704 700 #: src/dialogs/settings/colors.c:174
705 701 msgid "Normal/Protected"
706 702 msgstr "Normal/Protegido"
... ... @@ -709,7 +705,7 @@ msgstr &quot;Normal/Protegido&quot;
709 705 msgid "Normal/Unprotected"
710 706 msgstr "Normal/Desprotegido"
711 707  
712   -#: src/selection/linux/paste.c:76
  708 +#: src/selection/windows/paste.c:75
713 709 msgid "Not the same terminal type"
714 710 msgstr "O tipo de terminal é diferente"
715 711  
... ... @@ -990,8 +986,8 @@ msgstr &quot;&quot;
990 986 msgid "Same of the screen"
991 987 msgstr "Igual ao terminal"
992 988  
993   -#: src/terminal/actions/table.c:252 src/filetransfer/v3270ft.c:215
994   -#: src/filetransfer/activitylist.c:453 src/trace/trace.c:477
  989 +#: src/terminal/actions/table.c:252 src/filetransfer/activitylist.c:453
  990 +#: src/filetransfer/v3270ft.c:215 src/trace/trace.c:477
995 991 #: src/dialogs/transfer.c:69
996 992 msgid "Save"
997 993 msgstr "Salvar"
... ... @@ -1012,7 +1008,7 @@ msgstr &quot;Salvar tela&quot;
1012 1008 msgid "Save copy"
1013 1009 msgstr "Salvar cópia"
1014 1010  
1015   -#: src/filetransfer/v3270ft.c:214 src/filetransfer/activitylist.c:452
  1011 +#: src/filetransfer/activitylist.c:452 src/filetransfer/v3270ft.c:214
1016 1012 msgid "Save queue to file"
1017 1013 msgstr "Salvar a fila para um arquivo"
1018 1014  
... ... @@ -1471,8 +1467,9 @@ msgstr &quot;Turquesa&quot;
1471 1467 msgid "UTF-8"
1472 1468 msgstr "UTF-8"
1473 1469  
1474   -#: src/selection/linux/paste.c:116
1475   -msgid "Unable to paste formatted data."
  1470 +#: src/selection/windows/paste.c:115
  1471 +#, fuzzy
  1472 +msgid "Unable to paste formatted data"
1476 1473 msgstr "Incapaz de colar texto formatado."
1477 1474  
1478 1475 #: src/filetransfer/tables.c:92
... ... @@ -1494,7 +1491,7 @@ msgstr &quot;Modo inesperado %d&quot;
1494 1491 msgid "Unexpected status %d in print operation"
1495 1492 msgstr "Estado inesperado %d na operação de impressão"
1496 1493  
1497   -#: src/dialogs/save/save.c:149
  1494 +#: src/dialogs/windows/select.c:169 src/dialogs/save/save.c:149
1498 1495 msgid "Untitled document"
1499 1496 msgstr "Documento sem título"
1500 1497  
... ... @@ -1696,9 +1693,9 @@ msgstr &quot;Texto _ASCII&quot;
1696 1693 msgid "_Apply"
1697 1694 msgstr "_Aplicar"
1698 1695  
1699   -#: src/selection/linux/paste.c:84 src/selection/linux/paste.c:118
1700   -#: src/dialogs/load.c:202 src/dialogs/load.c:221 src/dialogs/linux/select.c:51
1701   -#: src/dialogs/linux/select.c:77 src/dialogs/print/settingsdialog.c:410
  1696 +#: src/selection/windows/paste.c:83 src/selection/windows/paste.c:123
  1697 +#: src/dialogs/load.c:202 src/dialogs/load.c:221
  1698 +#: src/dialogs/windows/select.c:158 src/dialogs/print/settingsdialog.c:410
1702 1699 #: src/dialogs/print/settingsdialog.c:429 src/dialogs/save/save.c:264
1703 1700 #: src/dialogs/save/save.c:283 src/dialogs/settings/dialog.c:229
1704 1701 msgid "_Cancel"
... ... @@ -1749,7 +1746,7 @@ msgstr &quot;_Modelo&quot;
1749 1746 msgid "_Operation"
1750 1747 msgstr "_Operação:"
1751 1748  
1752   -#: src/selection/linux/paste.c:85 src/selection/linux/paste.c:119
  1749 +#: src/selection/windows/paste.c:84 src/selection/windows/paste.c:124
1753 1750 msgid "_Paste as text"
1754 1751 msgstr "_Colar como texto"
1755 1752  
... ... @@ -2918,6 +2915,9 @@ msgstr &quot;Diminui o tamanho da fonte&quot;
2918 2915 #~ msgid "Non zero if the host is TSO."
2919 2916 #~ msgstr "Diferente de zero se o host é TSO"
2920 2917  
  2918 +#~ msgid "None of the screens in the clipboard match with the current one."
  2919 +#~ msgstr "Nenhuma das telas da área de transferência corresponde à atual."
  2920 +
2921 2921 #~ msgid "Not available"
2922 2922 #~ msgstr "Não disponível"
2923 2923  
... ...
src/dialogs/settings/dialog.c
  Diff comments   View file @c413483
... ... @@ -215,13 +215,15 @@ static void V3270SettingsDialog_init(V3270SettingsDialog *dialog)
215 215 GtkWidget * content_area = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
216 216  
217 217 // Get use of header bar.
  218 +#ifndef _WIN32
218 219 g_object_get(gtk_settings_get_default(), "gtk-dialogs-use-header", &dialog->has_subtitle, NULL);
  220 +#endif // _WIN32
219 221  
220 222 // https://developer.gnome.org/hig/stable/visual-layout.html.en
221 223 //gtk_box_set_spacing(GTK_BOX(content_area),18);
222 224 //gtk_container_set_border_width(GTK_CONTAINER(content_area),18);
223 225  
224   - gtk_window_set_deletable(GTK_WINDOW(dialog),FALSE);
  226 +// gtk_window_set_deletable(GTK_WINDOW(dialog),FALSE);
225 227 gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE);
226 228  
227 229 gtk_dialog_add_buttons(
... ... @@ -234,9 +236,13 @@ static void V3270SettingsDialog_init(V3270SettingsDialog *dialog)
234 236 // Create notebook for settings widgets
235 237 dialog->tabs = GTK_NOTEBOOK(gtk_notebook_new());
236 238  
  239 +#ifdef _WIN32
  240 + gtk_widget_set_margin_bottom(GTK_WIDGET(dialog->tabs),3);
  241 +// gtk_notebook_set_show_border(dialog->tabs, TRUE);
  242 +#endif // _WIN32
  243 +
237 244 gtk_notebook_set_scrollable(dialog->tabs,TRUE);
238 245 gtk_notebook_set_show_tabs(dialog->tabs,FALSE);
239   - // gtk_notebook_set_show_border(dialog->tabs, TRUE);
240 246 g_signal_connect(G_OBJECT(dialog->tabs), "page-added", G_CALLBACK(on_page_changed), dialog);
241 247 g_signal_connect(G_OBJECT(dialog->tabs), "page-removed", G_CALLBACK(on_page_changed), dialog);
242 248 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)
247 253  
248 254 GtkWidget * v3270_settings_dialog_new()
249 255 {
250   -#if GTK_CHECK_VERSION(3,12,0)
  256 +#ifdef _WIN32
  257 +
  258 + GtkWidget * dialog =
  259 + GTK_WIDGET(g_object_new(
  260 + GTK_TYPE_V3270_SETTINGS_DIALOG,
  261 + "use-header-bar", FALSE,
  262 + NULL
  263 + ));
  264 +
  265 +#elif GTK_CHECK_VERSION(3,12,0)
251 266  
252 267 gboolean use_header;
253 268 g_object_get(gtk_settings_get_default(), "gtk-dialogs-use-header", &use_header, NULL);
... ...