Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Mon, 01 Oct 2012 19:38:56 Commit: 64a47b9cb691e02a00d013374856aa31708bac3b https://github.com/geany/geany/commit/64a47b9cb691e02a00d013374856aa31708bac...
Log Message: ----------- Allow to switch message window orientation to place it on the right
Modified Paths: -------------- data/geany.glade src/keyfile.c src/main.c src/prefs.c src/ui_utils.h
Modified: data/geany.glade 84 files changed, 82 insertions(+), 2 deletions(-) =================================================================== @@ -1670,6 +1670,86 @@ </packing> </child> <child> + <object class="GtkFrame" id="frame1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="left_padding">12</property> + <child> + <object class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="label5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Position:</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="radio_msgwin_vertical"> + <property name="label" translatable="yes">Bottom</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="radio_msgwin_horizontal"> + <property name="label" translatable="yes">Right</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <property name="group">radio_msgwin_vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes"><b>Message window</b></property> + <property name="use_markup">True</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> <object class="GtkFrame" id="frame4"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -1795,7 +1875,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> @@ -1846,7 +1926,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> </object>
Modified: src/keyfile.c 5 files changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -148,6 +148,11 @@ static void init_pref_groups(void) "radio_sidebar_left", GTK_POS_LEFT, "radio_sidebar_right", GTK_POS_RIGHT, NULL); + stash_group_add_radio_buttons(group, &interface_prefs.msgwin_orientation, + "msgwin_orientation", GTK_ORIENTATION_VERTICAL, + "radio_msgwin_vertical", GTK_ORIENTATION_VERTICAL, + "radio_msgwin_horizontal", GTK_ORIENTATION_HORIZONTAL, + NULL);
/* editor display */ stash_group_add_toggle_button(group, &interface_prefs.highlighting_invert_all,
Modified: src/main.c 3 files changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -219,6 +219,9 @@ static void apply_settings(void)
if (interface_prefs.sidebar_pos != GTK_POS_LEFT) ui_swap_sidebar_pos(); + + gtk_orientable_set_orientation(GTK_ORIENTABLE(ui_lookup_widget(main_widgets.window, "vpaned1")), + interface_prefs.msgwin_orientation); }
Modified: src/prefs.c 3 files changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -857,6 +857,9 @@ static void kb_update(void) if (interface_prefs.sidebar_pos != old_sidebar_pos) ui_swap_sidebar_pos();
+ widget = ui_lookup_widget(main_widgets.window, "vpaned1"); + gtk_orientable_set_orientation(GTK_ORIENTABLE(widget), interface_prefs.msgwin_orientation); + /* General settings */ /* startup */ widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_load_session");
Modified: src/ui_utils.h 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -64,6 +64,7 @@ gboolean use_native_windows_dialogs; /** whether compiler messages window is automatically scrolled to show new messages */ gboolean compiler_tab_autoscroll; + gint msgwin_orientation; /**< orientation of the message window */ } GeanyInterfacePrefs;
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).