Download as
Browse Code »

Commit d9af1465df67b71f5291060bd9163bbd990121e8

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

Adjustments in windows UI.

Showing 2 changed files with 44 additions and 4 deletions   Show diff stats
.vscode/c_cpp_properties.json 0 → 100644
  Diff comments   View file @d9af146
... ... @@ -0,0 +1,27 @@
  1 +{
  2 + "configurations": [
  3 + {
  4 + "name": "Win32",
  5 + "includePath": [
  6 + "${workspaceFolder}/**",
  7 + "C:/msys64/mingw64/include",
  8 + "C:/Program Files/pw3270/sdk/include",
  9 + "C:/msys64/mingw64/include/gtk-3.0",
  10 + "C:/msys64/mingw64/include/glib-2.0",
  11 + "${vcpkgRoot}/x64-windows-static/include"
  12 + ],
  13 + "defines": [
  14 + "_DEBUG",
  15 + "DEBUG",
  16 + "UNICODE",
  17 + "_UNICODE"
  18 + ],
  19 + "windowsSdkVersion": "10.0.18362.0",
  20 + "compilerPath": "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.23.28105/bin/Hostx64/x64/cl.exe",
  21 + "cStandard": "c11",
  22 + "cppStandard": "c++17",
  23 + "intelliSenseMode": "msvc-x64"
  24 + }
  25 + ],
  26 + "version": 4
  27 +}
0 28 \ No newline at end of file
... ...
src/objects/settings/dialog.c
  Diff comments   View file @d9af146
... ... @@ -75,7 +75,7 @@ static void PW3270SettingsDialog_init(PW3270SettingsDialog *dialog)
75 75 //gtk_box_set_spacing(GTK_BOX(content_area),18);
76 76 //gtk_container_set_border_width(GTK_CONTAINER(content_area),18);
77 77  
78   - gtk_window_set_deletable(GTK_WINDOW(dialog),FALSE);
  78 +// gtk_window_set_deletable(GTK_WINDOW(dialog),FALSE);
79 79 gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE);
80 80  
81 81 gtk_dialog_add_buttons(
... ... @@ -88,6 +88,11 @@ static void PW3270SettingsDialog_init(PW3270SettingsDialog *dialog)
88 88 // Create notebook for settings widgets
89 89 dialog->tabs = GTK_NOTEBOOK(gtk_notebook_new());
90 90  
  91 +#ifdef _WIN32
  92 + gtk_widget_set_margin_bottom(GTK_WIDGET(dialog->tabs),3);
  93 +// gtk_notebook_set_show_border(dialog->tabs, TRUE);
  94 +#endif // _WIN32
  95 +
91 96 gtk_notebook_set_scrollable(dialog->tabs,TRUE);
92 97 gtk_notebook_set_show_tabs(dialog->tabs,FALSE);
93 98 g_signal_connect(G_OBJECT(dialog->tabs), "page-added", G_CALLBACK(page_changed), dialog);
... ... @@ -95,12 +100,20 @@ static void PW3270SettingsDialog_init(PW3270SettingsDialog *dialog)
95 100 g_signal_connect(G_OBJECT(dialog->tabs), "switch-page", G_CALLBACK(switch_page), dialog);
96 101 gtk_box_pack_start(GTK_BOX(content_area),GTK_WIDGET(dialog->tabs),TRUE,TRUE,0);
97 102  
98   - gtk_window_set_deletable(GTK_WINDOW(dialog),FALSE);
99   -
100 103 }
101 104  
102 105 GtkWidget * pw3270_settings_dialog_new(GAction *action) {
103   -#if GTK_CHECK_VERSION(3,12,0)
  106 +
  107 +#ifdef _WIN32
  108 +
  109 + GtkWidget * dialog =
  110 + GTK_WIDGET(g_object_new(
  111 + GTK_TYPE_PW3270_SETTINGS_DIALOG,
  112 + "use-header-bar", FALSE,
  113 + NULL
  114 + ));
  115 +
  116 +#elif GTK_CHECK_VERSION(3,12,0)
104 117  
105 118 gboolean use_header;
106 119 g_object_get(gtk_settings_get_default(), "gtk-dialogs-use-header", &use_header, NULL);
... ...