From d48859db8e5e91fd1dbfb1951917087dc781a1ef Mon Sep 17 00:00:00 2001 From: Colomban Wendling Date: Fri, 2 Jan 2015 19:48:06 +0100 Subject: [PATCH] Drop useless scrolled window around the message window notebook --- data/geany.glade | 233 ++++++++++++++++++++++------------------------- src/main.c | 2 +- src/msgwindow.c | 2 +- 3 files changed, 111 insertions(+), 126 deletions(-) diff --git a/data/geany.glade b/data/geany.glade index e74ff34c..bc314d55 100644 --- a/data/geany.glade +++ b/data/geany.glade @@ -8208,141 +8208,126 @@ - + True True - never - never + left + True - + True - False - none + True + automatic + automatic - + True True - left - True - - - True - True - automatic - automatic - - - True - True - False - True - - - - - - - True - False - Status - - - False - - - - - True - True - automatic - automatic - - - True - True - False - - - - - 1 - - - - - True - False - Compiler - - - 1 - False - - - - - True - True - automatic - automatic - - - True - True - False - True - - - - - 2 - - - - - True - False - Messages - - - 2 - False - - - - - True - True - automatic - automatic - - - True - True - textbuffer1 - - - - - - 3 - - - - - True - False - Scribble - - - 3 - False - - + False + True + + + True + False + Status + + + False + + + + + True + True + automatic + automatic + + + True + True + False + + + + + 1 + + + + + True + False + Compiler + + + 1 + False + + + + + True + True + automatic + automatic + + + True + True + False + True + + + + + 2 + + + + + True + False + Messages + + + 2 + False + + + + + True + True + automatic + automatic + + + True + True + textbuffer1 + + + + + + 3 + + + + + True + False + Scribble + + + 3 + False + + True diff --git a/src/main.c b/src/main.c index af4a9a1f..4deae958 100644 --- a/src/main.c +++ b/src/main.c @@ -176,7 +176,7 @@ static void apply_settings(void) { ignore_callback = TRUE; gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(ui_lookup_widget(main_widgets.window, "menu_show_messages_window1")), FALSE); - gtk_widget_hide(ui_lookup_widget(main_widgets.window, "scrolledwindow1")); + gtk_widget_hide(main_widgets.message_window_notebook); ignore_callback = FALSE; } if (! ui_prefs.sidebar_visible) diff --git a/src/msgwindow.c b/src/msgwindow.c index 1aed38de..21f66fc3 100644 --- a/src/msgwindow.c +++ b/src/msgwindow.c @@ -340,7 +340,7 @@ void msgwin_show_hide(gboolean show) GTK_CHECK_MENU_ITEM(ui_lookup_widget(main_widgets.window, "menu_show_messages_window1")), show); ignore_callback = FALSE; - ui_widget_show_hide(ui_lookup_widget(main_widgets.window, "scrolledwindow1"), show); + ui_widget_show_hide(main_widgets.message_window_notebook, show); /* set the input focus back to the editor */ keybindings_send_command(GEANY_KEY_GROUP_FOCUS, GEANY_KEYS_FOCUS_EDITOR); }