[geany/geany] 6e0d4a: Merge pull request #581 from techee/symbollist_sort
Colomban Wendling
git-noreply at xxxxx
Wed Jan 13 16:43:03 UTC 2016
Branch: refs/heads/master
Author: Colomban Wendling <ban at herbesfolles.org>
Committer: Colomban Wendling <ban at herbesfolles.org>
Date: Wed, 13 Jan 2016 16:43:03 UTC
Commit: 6e0d4ac6ec7153e5efcc16d3cca68afcf51f641b
https://github.com/geany/geany/commit/6e0d4ac6ec7153e5efcc16d3cca68afcf51f641b
Log Message:
-----------
Merge pull request #581 from techee/symbollist_sort
Make it possible to define default symbol_list_sort_mode
Modified Paths:
--------------
data/geany.glade
src/callbacks.c
src/document.c
src/filetypes.c
src/keyfile.c
src/prefs.c
src/ui_utils.h
Modified: data/geany.glade
68 lines changed, 66 insertions(+), 2 deletions(-)
===================================================================
@@ -1543,7 +1543,7 @@
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkVBox" id="vbox46">
+ <object class="GtkVBox" id="box_sidebar_visible_children">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -1555,6 +1555,7 @@
<property name="tooltip_text" translatable="yes">Toggle the symbol list on and off</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_show_symbol_list_toggled" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -1563,6 +1564,69 @@
</packing>
</child>
<child>
+ <object class="GtkAlignment" id="alignment15">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkHBox" id="box_show_symbol_list_children">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Default symbol sorting mode</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label24">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Default sorting mode:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="radio_symbols_sort_by_name">
+ <property name="label" translatable="yes">Name</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_symbols_sort_by_appearance">
+ <property name="label" translatable="yes">Appearance</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_symbols_sort_by_name</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkCheckButton" id="check_list_openfiles">
<property name="label" translatable="yes">Show documents list</property>
<property name="visible">True</property>
@@ -1575,7 +1639,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
Modified: src/callbacks.c
8 lines changed, 8 insertions(+), 0 deletions(-)
===================================================================
@@ -1901,6 +1901,14 @@ static void on_detect_type_from_file_activate(GtkMenuItem *menuitem, gpointer us
}
+static void on_show_symbol_list_toggled(GtkToggleButton *button, gpointer user_data)
+{
+ GtkWidget *widget = ui_lookup_widget(ui_widgets.prefs_dialog, "box_show_symbol_list_children");
+
+ gtk_widget_set_sensitive(widget, gtk_toggle_button_get_active(button));
+}
+
+
static void on_detect_width_from_file_activate(GtkMenuItem *menuitem, gpointer user_data)
{
GeanyDocument *doc = document_get_current();
Modified: src/document.c
5 lines changed, 4 insertions(+), 1 deletions(-)
===================================================================
@@ -2811,7 +2811,10 @@ static void document_load_config(GeanyDocument *doc, GeanyFiletype *type,
editor_set_indentation_guides(doc->editor);
build_menu_update(doc);
queue_colourise(doc);
- doc->priv->symbol_list_sort_mode = type->priv->symbol_list_sort_mode;
+ if (type->priv->symbol_list_sort_mode == SYMBOLS_SORT_USE_PREVIOUS)
+ doc->priv->symbol_list_sort_mode = interface_prefs.symbols_sort_mode;
+ else
+ doc->priv->symbol_list_sort_mode = type->priv->symbol_list_sort_mode;
}
document_update_tags(doc);
Modified: src/filetypes.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -965,7 +965,7 @@ static void load_settings(guint ft_id, GKeyFile *config, GKeyFile *configh)
}
ft->priv->symbol_list_sort_mode = utils_get_setting(integer, configh, config, "settings",
- "symbol_list_sort_mode", SYMBOLS_SORT_BY_NAME);
+ "symbol_list_sort_mode", SYMBOLS_SORT_USE_PREVIOUS);
ft->priv->xml_indent_tags = utils_get_setting(boolean, configh, config, "settings",
"xml_indent_tags", FALSE);
Modified: src/keyfile.c
6 lines changed, 6 insertions(+), 0 deletions(-)
===================================================================
@@ -48,6 +48,7 @@
#include "sciwrappers.h"
#include "stash.h"
#include "support.h"
+#include "symbols.h"
#include "templates.h"
#include "toolbar.h"
#include "ui_utils.h"
@@ -161,6 +162,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.symbols_sort_mode,
+ "symbols_sort_mode", SYMBOLS_SORT_BY_NAME,
+ "radio_symbols_sort_by_name", SYMBOLS_SORT_BY_NAME,
+ "radio_symbols_sort_by_appearance", SYMBOLS_SORT_BY_APPEARANCE,
+ NULL);
stash_group_add_radio_buttons(group, &interface_prefs.msgwin_orientation,
"msgwin_orientation", GTK_ORIENTATION_VERTICAL,
"radio_msgwin_vertical", GTK_ORIENTATION_VERTICAL,
Modified: src/prefs.c
3 lines changed, 1 insertions(+), 2 deletions(-)
===================================================================
@@ -1558,8 +1558,7 @@ static void on_sidebar_visible_toggled(GtkToggleButton *togglebutton, gpointer u
{
gboolean sens = gtk_toggle_button_get_active(togglebutton);
- gtk_widget_set_sensitive(ui_lookup_widget(ui_widgets.prefs_dialog, "check_list_openfiles"), sens);
- gtk_widget_set_sensitive(ui_lookup_widget(ui_widgets.prefs_dialog, "check_list_symbol"), sens);
+ gtk_widget_set_sensitive(ui_lookup_widget(ui_widgets.prefs_dialog, "box_sidebar_visible_children"), sens);
}
Modified: src/ui_utils.h
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -68,6 +68,7 @@ typedef struct GeanyInterfacePrefs
/** whether compiler messages window is automatically scrolled to show new messages */
gboolean compiler_tab_autoscroll;
gint msgwin_orientation; /**< orientation of the message window */
+ gint symbols_sort_mode; /**< symbol list sorting mode */
}
GeanyInterfacePrefs;
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
More information about the Commits
mailing list