Download as
Browse Code »

Commit 6ecc74f1b7606f66ae92a7421c4ed5d1db8a45af

Authored by Perry Werneck
1 parent cad6def6
Exists in master and in 2 other branches develop, script-support

Use 'gnome' style as default on linux and classic in other OSs.

Showing 2 changed files with 15 additions and 8 deletions   Show diff stats
src/objects/actions/view.c
  Diff comments   View file @6ecc74f
... ... @@ -255,7 +255,7 @@
255 255 return (Pw3270ActionList *) list;
256 256 }
257 257  
258   - Pw3270ActionList * pw3270_action_list_append(Pw3270ActionList *action_list, const gchar *label, GdkPixbuf *pixbuf, const gchar *action_name, const PW3270ActionViewFlag flags) {
  258 + Pw3270ActionList * pw3270_action_list_append(Pw3270ActionList *action_list, const gchar *label, GdkPixbuf *pixbuf, const gchar *action_name, const PW3270ActionViewFlag G_GNUC_UNUSED(flags)) {
259 259  
260 260 struct ListElement * element = (struct ListElement *)
261 261 g_malloc0(
... ...
src/objects/window/window.c
  Diff comments   View file @6ecc74f
... ... @@ -600,19 +600,26 @@
600 600 {
601 601 g_autoptr(GSettings) settings = pw3270_application_window_settings_new();
602 602  
  603 +#ifdef DEBUG
  604 + PW3270_UI_STYLE style = PW3270_UI_STYLE_AUTOMATIC;
  605 +#else
603 606 PW3270_UI_STYLE style = pw3270_application_get_ui_style(G_APPLICATION(application));
  607 +#endif // DEBUG
604 608  
605 609 if(style == PW3270_UI_STYLE_AUTOMATIC) {
606 610  
607   - if(gtk_application_get_app_menu(application)) {
608   - style = PW3270_UI_STYLE_GNOME;
609   - } else {
610   - style = PW3270_UI_STYLE_CLASSICAL;
611   - g_settings_set_boolean(settings,"menubar-visible",TRUE);
612   - g_settings_set_boolean(settings,"toolbar-visible",TRUE);
613   - }
  611 +#ifdef G_OS_UNIX
  612 + style = PW3270_UI_STYLE_GNOME;
  613 + g_settings_set_boolean(settings,"menubar-visible",FALSE);
  614 +#else
  615 + style = PW3270_UI_STYLE_CLASSICAL;
  616 + g_settings_set_boolean(settings,"menubar-visible",TRUE);
  617 +#endif // G_OS_UNIX
  618 +
  619 + g_settings_set_boolean(settings,"toolbar-visible",TRUE);
614 620  
615 621 pw3270_application_set_ui_style(G_APPLICATION(application),style);
  622 +
616 623 }
617 624  
618 625 if(style == PW3270_UI_STYLE_GNOME) {
... ...