Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Mon, 26 Jan 2015 16:24:19 UTC Commit: 526294d72c2a2de94c4bc7712dd7d3e7e3c8f233 https://github.com/geany/geany/commit/526294d72c2a2de94c4bc7712dd7d3e7e3c8f2...

Log Message: ----------- Merge pull request #399 from b4n/ui/message-window-hierarchy

Drop useless scrolled window around the message window notebook

Modified Paths: -------------- data/geany.glade src/main.c src/msgwindow.c

Modified: data/geany.glade 231 lines changed, 108 insertions(+), 123 deletions(-) =================================================================== @@ -8208,140 +8208,125 @@ </packing> </child> <child> - <object class="GtkScrolledWindow" id="scrolledwindow1"> + <object class="GtkNotebook" id="notebook_info"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">never</property> + <property name="tab_pos">left</property> + <property name="scrollable">True</property> <child> - <object class="GtkViewport" id="viewport1"> + <object class="GtkScrolledWindow" id="scrolledwindow4"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <child> + <object class="GtkTreeView" id="treeview3"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="headers_visible">False</property> + <property name="rules_hint">True</property> + </object> + </child> + </object> + </child> + <child type="tab"> + <object class="GtkLabel" id="notebook_info_label_status"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="shadow_type">none</property> + <property name="label" translatable="yes">Status</property> + </object> + <packing> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow3"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> <child> - <object class="GtkNotebook" id="notebook_info"> + <object class="GtkTreeView" id="treeview5"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tab_pos">left</property> - <property name="scrollable">True</property> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow4"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> - <child> - <object class="GtkTreeView" id="treeview3"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">False</property> - <property name="rules_hint">True</property> - </object> - </child> - </object> - </child> - <child type="tab"> - <object class="GtkLabel" id="notebook_info_label_status"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Status</property> - </object> - <packing> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow3"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> - <child> - <object class="GtkTreeView" id="treeview5"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">False</property> - </object> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="notebook_info_label_compiler"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Compiler</property> - </object> - <packing> - <property name="position">1</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow5"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> - <child> - <object class="GtkTreeView" id="treeview4"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">False</property> - <property name="rules_hint">True</property> - </object> - </child> - </object> - <packing> - <property name="position">2</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="notebook_info_label_msg"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Messages</property> - </object> - <packing> - <property name="position">2</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow6"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> - <child> - <object class="GtkTextView" id="textview_scribble"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="buffer">textbuffer1</property> - <signal name="motion-notify-event" handler="on_motion_event" swapped="no"/> - </object> - </child> - </object> - <packing> - <property name="position">3</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="notebook_info_label_scribble"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Scribble</property> - </object> - <packing> - <property name="position">3</property> - <property name="tab_fill">False</property> - </packing> - </child> + <property name="headers_visible">False</property> + </object> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel" id="notebook_info_label_compiler"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Compiler</property> + </object> + <packing> + <property name="position">1</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow5"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <child> + <object class="GtkTreeView" id="treeview4"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="headers_visible">False</property> + <property name="rules_hint">True</property> + </object> + </child> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel" id="notebook_info_label_msg"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Messages</property> + </object> + <packing> + <property name="position">2</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow6"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <child> + <object class="GtkTextView" id="textview_scribble"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="buffer">textbuffer1</property> + <signal name="motion-notify-event" handler="on_motion_event" swapped="no"/> </object> </child> </object> + <packing> + <property name="position">3</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel" id="notebook_info_label_scribble"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Scribble</property> + </object> + <packing> + <property name="position">3</property> + <property name="tab_fill">False</property> + </packing> </child> </object> <packing>

Modified: src/main.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -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)

Modified: src/msgwindow.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -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); }

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).