Commits July 2008

commits@lists.geany.org

3 participants
105 discussions

SF.net SVN: geany:[2834] branches/custom-tab-width
by ntrel＠users.sourceforge.net 29 Jul '08

29 Jul '08

Revision: 2834 http://geany.svn.sourceforge.net/geany/?rev=2834&view=rev Author: ntrel Date: 2008-07-29 17:46:21 +0000 (Tue, 29 Jul 2008) Log Message: ----------- Replace init_prefs(), update_prefs() with common prefs_action() function. Modified Paths: -------------- branches/custom-tab-width/ChangeLog branches/custom-tab-width/src/prefs.c Modified: branches/custom-tab-width/ChangeLog =================================================================== --- branches/custom-tab-width/ChangeLog 2008-07-29 14:43:34 UTC (rev 2833) +++ branches/custom-tab-width/ChangeLog 2008-07-29 17:46:21 UTC (rev 2834) @@ -2,6 +2,9 @@ * src/prefs.c, src/editor.h: Move detect_tab_mode editor pref to indentation pref 'detect_type'. + * src/prefs.c: + Replace init_prefs(), update_prefs() with common prefs_action() + function. 2008-07-28 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: branches/custom-tab-width/src/prefs.c =================================================================== --- branches/custom-tab-width/src/prefs.c 2008-07-29 14:43:34 UTC (rev 2833) +++ branches/custom-tab-width/src/prefs.c 2008-07-29 17:46:21 UTC (rev 2834) @@ -224,7 +224,7 @@ typedef void (*PrefItemsCallback)(PrefCallbackAction action); -/* List of functions which hold the PrefEntry arrays. This allows access to +/* List of functions which hold the PrefEntry arrays. These allow access to * runtime setting fields like EditorPrefs::indentation->width. */ PrefItemsCallback pref_item_callbacks[] = { toggle_items_foreach, @@ -234,6 +234,15 @@ }; +static void prefs_action(PrefCallbackAction action) +{ + guint i; + + for (i = 0; i < G_N_ELEMENTS(pref_item_callbacks); i++) + pref_item_callbacks[i](action); +} + + enum { KB_TREE_ACTION, @@ -306,21 +315,12 @@ } -static void init_prefs(void) -{ - guint i; - - for (i = 0; i < G_N_ELEMENTS(pref_item_callbacks); i++) - pref_item_callbacks[i](PREF_DISPLAY); -} - - void prefs_init_dialog(void) { GtkWidget *widget; GdkColor *color; - init_prefs(); + prefs_action(PREF_DISPLAY); /* General settings */ /* startup */ @@ -721,15 +721,6 @@ } -static void update_prefs(void) -{ - guint i; - - for (i = 0; i < G_N_ELEMENTS(pref_item_callbacks); i++) - pref_item_callbacks[i](PREF_UPDATE); -} - - /* * callbacks */ @@ -741,7 +732,7 @@ GtkWidget *widget; guint i; - update_prefs(); + prefs_action(PREF_UPDATE); /* General settings */ /* startup */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2833] branches/custom-tab-width
by ntrel＠users.sourceforge.net 29 Jul '08

29 Jul '08

Revision: 2833 http://geany.svn.sourceforge.net/geany/?rev=2833&view=rev Author: ntrel Date: 2008-07-29 14:43:34 +0000 (Tue, 29 Jul 2008) Log Message: ----------- Move detect_tab_mode editor pref to indentation pref 'detect_type'. Modified Paths: -------------- branches/custom-tab-width/ChangeLog branches/custom-tab-width/src/editor.h branches/custom-tab-width/src/prefs.c Modified: branches/custom-tab-width/ChangeLog =================================================================== --- branches/custom-tab-width/ChangeLog 2008-07-28 17:31:33 UTC (rev 2832) +++ branches/custom-tab-width/ChangeLog 2008-07-29 14:43:34 UTC (rev 2833) @@ -1,3 +1,9 @@ +2008-07-29 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/prefs.c, src/editor.h: + Move detect_tab_mode editor pref to indentation pref 'detect_type'. + + 2008-07-28 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/interface.c, src/editor.h, geany.glade: Modified: branches/custom-tab-width/src/editor.h =================================================================== --- branches/custom-tab-width/src/editor.h 2008-07-28 17:31:33 UTC (rev 2832) +++ branches/custom-tab-width/src/editor.h 2008-07-29 14:43:34 UTC (rev 2833) @@ -71,6 +71,7 @@ gint tab_width; /**< Width of a tab, when using GEANY_INDENT_TYPE_BOTH. */ gboolean use_tab_to_indent; /* hidden pref makes pressing Tab key like Ctrl-I */ GeanyAutoIndent auto_indent_mode; + gboolean detect_type; } GeanyIndentPrefs; @@ -106,7 +107,6 @@ gboolean brace_match_ltgt; /* whether to highlight < and > chars (hidden pref) */ gboolean use_gtk_word_boundaries; /* hidden pref */ gboolean complete_snippets_whilst_editing; /* hidden pref */ - gboolean detect_tab_mode; gint line_break_column; gboolean auto_continue_multiline; } GeanyEditorPrefs; Modified: branches/custom-tab-width/src/prefs.c =================================================================== --- branches/custom-tab-width/src/prefs.c 2008-07-28 17:31:33 UTC (rev 2832) +++ branches/custom-tab-width/src/prefs.c 2008-07-29 14:43:34 UTC (rev 2833) @@ -115,6 +115,8 @@ {"check_ask_suppress_search_dialogs", &search_prefs.suppress_dialogs}, {"check_search_use_current_word", &search_prefs.use_current_word}, {"check_fif_current_dir", &search_prefs.use_current_file_dir}, + + {"check_detect_indent", &editor_prefs.indentation->detect_type} }; for (i = 0; i < G_N_ELEMENTS(items); i++) @@ -167,7 +169,8 @@ static void radio_items_foreach(PrefCallbackAction action) { guint i; - /* Only add one widget per radio-group */ + /* Only add one widget per radio-group; the setting is the index of the selected radio item + * in the group. */ PrefEntry items[] = { {"radio_indent_spaces", &editor_prefs.indentation->type}, @@ -531,9 +534,6 @@ widget = lookup_widget(ui_widgets.prefs_dialog, "check_line_end"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.show_line_endings); - widget = lookup_widget(ui_widgets.prefs_dialog, "check_detect_indent"); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.detect_tab_mode); - widget = lookup_widget(ui_widgets.prefs_dialog, "check_line_wrapping"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.line_wrapping); @@ -956,9 +956,6 @@ widget = lookup_widget(ui_widgets.prefs_dialog, "check_newline_strip"); editor_prefs.newline_strip = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - widget = lookup_widget(ui_widgets.prefs_dialog, "check_detect_indent"); - editor_prefs.detect_tab_mode = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - widget = lookup_widget(ui_widgets.prefs_dialog, "check_auto_multiline"); editor_prefs.auto_continue_multiline = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2832] branches/custom-tab-width
by ntrel＠users.sourceforge.net 28 Jul '08

28 Jul '08

Revision: 2832 http://geany.svn.sourceforge.net/geany/?rev=2832&view=rev Author: ntrel Date: 2008-07-28 17:31:33 +0000 (Mon, 28 Jul 2008) Log Message: ----------- Add radio_items_foreach(), combo_items_foreach(). Modified Paths: -------------- branches/custom-tab-width/ChangeLog branches/custom-tab-width/src/prefs.c Modified: branches/custom-tab-width/ChangeLog =================================================================== --- branches/custom-tab-width/ChangeLog 2008-07-28 17:28:19 UTC (rev 2831) +++ branches/custom-tab-width/ChangeLog 2008-07-28 17:31:33 UTC (rev 2832) @@ -17,6 +17,8 @@ * src/ui_utils.c, src/ui_utils.h: Add ui_radio_menu_item_set_active_index(), ui_radio_menu_item_get_active_index(). + * src/prefs.c: + Add radio_items_foreach(), combo_items_foreach(). 2008-07-25 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: branches/custom-tab-width/src/prefs.c =================================================================== --- branches/custom-tab-width/src/prefs.c 2008-07-28 17:28:19 UTC (rev 2831) +++ branches/custom-tab-width/src/prefs.c 2008-07-28 17:31:33 UTC (rev 2832) @@ -164,13 +164,70 @@ } +static void radio_items_foreach(PrefCallbackAction action) +{ + guint i; + /* Only add one widget per radio-group */ + PrefEntry items[] = + { + {"radio_indent_spaces", &editor_prefs.indentation->type}, + }; + + for (i = 0; i < G_N_ELEMENTS(items); i++) + { + PrefEntry *pe = &items[i]; + GtkWidget *widget = lookup_widget(ui_widgets.prefs_dialog, pe->widget_name); + gint *setting = pe->setting; + + switch (action) + { + case PREF_DISPLAY: + ui_radio_menu_item_set_active_index(GTK_RADIO_MENU_ITEM(widget), *setting); + break; + case PREF_UPDATE: + *setting = ui_radio_menu_item_get_active_index(GTK_RADIO_MENU_ITEM(widget)); + break; + } + } +} + + +static void combo_items_foreach(PrefCallbackAction action) +{ + guint i; + PrefEntry items[] = + { + {"combo_auto_indent_mode", &editor_prefs.indentation->type}, + }; + + for (i = 0; i < G_N_ELEMENTS(items); i++) + { + PrefEntry *pe = &items[i]; + GtkWidget *widget = lookup_widget(ui_widgets.prefs_dialog, pe->widget_name); + gint *setting = pe->setting; + + switch (action) + { + case PREF_DISPLAY: + gtk_combo_box_set_active(GTK_COMBO_BOX(widget), *setting); + break; + case PREF_UPDATE: + *setting = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); + break; + } + } +} + + typedef void (*PrefItemsCallback)(PrefCallbackAction action); /* List of functions which hold the PrefEntry arrays. This allows access to * runtime setting fields like EditorPrefs::indentation->width. */ PrefItemsCallback pref_item_callbacks[] = { toggle_items_foreach, - spin_items_foreach + spin_items_foreach, + radio_items_foreach, + combo_items_foreach }; @@ -474,9 +531,6 @@ widget = lookup_widget(ui_widgets.prefs_dialog, "check_line_end"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.show_line_endings); - widget = lookup_widget(ui_widgets.prefs_dialog, "combo_auto_indent_mode"); - gtk_combo_box_set_active(GTK_COMBO_BOX(widget), editor_prefs.indent_mode); - widget = lookup_widget(ui_widgets.prefs_dialog, "check_detect_indent"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.detect_tab_mode); @@ -506,12 +560,6 @@ widget = lookup_widget(ui_widgets.prefs_dialog, "check_newline_strip"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.newline_strip); - if (editor_prefs.use_tabs) - widget = lookup_widget(ui_widgets.prefs_dialog, "radio_indent_tabs"); - else - widget = lookup_widget(ui_widgets.prefs_dialog, "radio_indent_spaces"); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE); - widget = lookup_widget(ui_widgets.prefs_dialog, "check_indicators"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.use_indicators); @@ -887,9 +935,6 @@ widget = lookup_widget(ui_widgets.prefs_dialog, "check_line_end"); editor_prefs.show_line_endings = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - widget = lookup_widget(ui_widgets.prefs_dialog, "combo_auto_indent_mode"); - editor_prefs.indent_mode = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); - widget = lookup_widget(ui_widgets.prefs_dialog, "check_line_wrapping"); editor_prefs.line_wrapping = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); @@ -911,22 +956,6 @@ widget = lookup_widget(ui_widgets.prefs_dialog, "check_newline_strip"); editor_prefs.newline_strip = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - widget = lookup_widget(ui_widgets.prefs_dialog, "radio_indent_tabs"); - { - gboolean use_tabs = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - - /* override each document setting only if the default has changed */ - if (editor_prefs.use_tabs != use_tabs) - { - editor_prefs.use_tabs = use_tabs; - for (i = 0; i < documents_array->len; i++) - { - if (documents[i]->is_valid) - editor_set_use_tabs(documents[i]->editor, editor_prefs.use_tabs); - } - } - } - widget = lookup_widget(ui_widgets.prefs_dialog, "check_detect_indent"); editor_prefs.detect_tab_mode = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2831] branches/custom-tab-width
by ntrel＠users.sourceforge.net 28 Jul '08

28 Jul '08

Revision: 2831 http://geany.svn.sourceforge.net/geany/?rev=2831&view=rev Author: ntrel Date: 2008-07-28 17:28:19 +0000 (Mon, 28 Jul 2008) Log Message: ----------- Add ui_radio_menu_item_set_active_index(), ui_radio_menu_item_get_active_index(). Modified Paths: -------------- branches/custom-tab-width/ChangeLog branches/custom-tab-width/src/ui_utils.c branches/custom-tab-width/src/ui_utils.h Modified: branches/custom-tab-width/ChangeLog =================================================================== --- branches/custom-tab-width/ChangeLog 2008-07-28 13:50:55 UTC (rev 2830) +++ branches/custom-tab-width/ChangeLog 2008-07-28 17:28:19 UTC (rev 2831) @@ -14,6 +14,9 @@ * src/prefs.c: Add spin_items_foreach(). Bind spin_indent_width, spin_tab_width widgets to settings. + * src/ui_utils.c, src/ui_utils.h: + Add ui_radio_menu_item_set_active_index(), + ui_radio_menu_item_get_active_index(). 2008-07-25 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: branches/custom-tab-width/src/ui_utils.c =================================================================== --- branches/custom-tab-width/src/ui_utils.c 2008-07-28 13:50:55 UTC (rev 2830) +++ branches/custom-tab-width/src/ui_utils.c 2008-07-28 17:28:19 UTC (rev 2831) @@ -706,7 +706,8 @@ item = lookup_widget(main_widgets.window, "menu_use_auto_indentation1"); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), doc->editor->auto_indent); - gtk_widget_set_sensitive(item, editor_prefs.indent_mode != INDENT_NONE); + gtk_widget_set_sensitive(item, + editor_prefs.indentation->auto_indent_mode != GEANY_AUTOINDENT_NONE); item = lookup_widget(main_widgets.window, doc->editor->use_tabs ? "tabs1" : "spaces1"); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), TRUE); @@ -1505,3 +1506,43 @@ init_document_widgets(); } + + +void ui_radio_menu_item_set_active_index(GtkRadioMenuItem *widget, guint idx) +{ + GSList *item = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(widget)); + guint i; + + for (i = 0; item != NULL; item = g_slist_next(item), i++) + { + if (i == idx) + { + GtkCheckMenuItem *radio = item->data; + + gtk_check_menu_item_set_active(radio, TRUE); + return; + } + } + g_warning("Index %u is out of range for group of widget %s", + idx, gtk_widget_get_name(GTK_WIDGET(widget))); +} + + +guint ui_radio_menu_item_get_active_index(GtkRadioMenuItem *widget) +{ + GSList *item = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(widget)); + guint i; + + for (i = 0; item != NULL; item = g_slist_next(item), i++) + { + GtkCheckMenuItem *radio = item->data; + + if (gtk_check_menu_item_get_active(radio)) + return i; + } + g_warning("No active group item for widget %s", + gtk_widget_get_name(GTK_WIDGET(widget))); + return 0; +} + + Modified: branches/custom-tab-width/src/ui_utils.h =================================================================== --- branches/custom-tab-width/src/ui_utils.h 2008-07-28 13:50:55 UTC (rev 2830) +++ branches/custom-tab-width/src/ui_utils.h 2008-07-28 17:28:19 UTC (rev 2831) @@ -151,6 +151,10 @@ void ui_table_add_row(GtkTable *table, gint row, ...) G_GNUC_NULL_TERMINATED; +void ui_radio_menu_item_set_active_index(GtkRadioMenuItem *widget, guint index); + +guint ui_radio_menu_item_get_active_index(GtkRadioMenuItem *widget); + /* End of 'generic' functions */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2830] branches/custom-tab-width
by ntrel＠users.sourceforge.net 28 Jul '08

28 Jul '08

Revision: 2830 http://geany.svn.sourceforge.net/geany/?rev=2830&view=rev Author: ntrel Date: 2008-07-28 13:50:55 +0000 (Mon, 28 Jul 2008) Log Message: ----------- Add spin_items_foreach(). Bind spin_indent_width, spin_tab_width widgets to settings. Modified Paths: -------------- branches/custom-tab-width/ChangeLog branches/custom-tab-width/src/prefs.c Modified: branches/custom-tab-width/ChangeLog =================================================================== --- branches/custom-tab-width/ChangeLog 2008-07-28 13:42:14 UTC (rev 2829) +++ branches/custom-tab-width/ChangeLog 2008-07-28 13:50:55 UTC (rev 2830) @@ -11,6 +11,9 @@ array can contain runtime fields, so can read pointer contents. Add pref_item_callbacks array of functions to call like toggle_items_foreach(). + * src/prefs.c: + Add spin_items_foreach(). + Bind spin_indent_width, spin_tab_width widgets to settings. 2008-07-25 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: branches/custom-tab-width/src/prefs.c =================================================================== --- branches/custom-tab-width/src/prefs.c 2008-07-28 13:42:14 UTC (rev 2829) +++ branches/custom-tab-width/src/prefs.c 2008-07-28 13:50:55 UTC (rev 2830) @@ -136,12 +136,41 @@ } +static void spin_items_foreach(PrefCallbackAction action) +{ + guint i; + PrefEntry items[] = + { + {"spin_indent_width", &editor_prefs.indentation->width}, + {"spin_tab_width", &editor_prefs.indentation->tab_width}, + }; + + for (i = 0; i < G_N_ELEMENTS(items); i++) + { + PrefEntry *pe = &items[i]; + GtkWidget *widget = lookup_widget(ui_widgets.prefs_dialog, pe->widget_name); + gint *setting = pe->setting; + + switch (action) + { + case PREF_DISPLAY: + gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), *setting); + break; + case PREF_UPDATE: + *setting = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); + break; + } + } +} + + typedef void (*PrefItemsCallback)(PrefCallbackAction action); /* List of functions which hold the PrefEntry arrays. This allows access to * runtime setting fields like EditorPrefs::indentation->width. */ PrefItemsCallback pref_item_callbacks[] = { - toggle_items_foreach + toggle_items_foreach, + spin_items_foreach }; @@ -433,9 +462,6 @@ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), file_prefs.final_new_line); /* Editor settings */ - widget = lookup_widget(ui_widgets.prefs_dialog, "spin_tab_width"); - gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), editor_prefs.tab_width); - widget = lookup_widget(ui_widgets.prefs_dialog, "check_replace_tabs"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), file_prefs.replace_tabs); @@ -842,9 +868,6 @@ /* Editor settings */ - widget = lookup_widget(ui_widgets.prefs_dialog, "spin_tab_width"); - editor_prefs.tab_width = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); - widget = lookup_widget(ui_widgets.prefs_dialog, "spin_long_line"); editor_prefs.long_line_column = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2829] branches/custom-tab-width
by ntrel＠users.sourceforge.net 28 Jul '08

28 Jul '08

Revision: 2829 http://geany.svn.sourceforge.net/geany/?rev=2829&view=rev Author: ntrel Date: 2008-07-28 13:42:14 +0000 (Mon, 28 Jul 2008) Log Message: ----------- Move toggle_prefs to a function toggle_items_foreach(), which takes a PREF_DISPLAY or PREF_UPDATE argument. This means the PrefEntry array can contain runtime fields, so can read pointer contents. Add pref_item_callbacks array of functions to call like toggle_items_foreach(). Modified Paths: -------------- branches/custom-tab-width/ChangeLog branches/custom-tab-width/src/prefs.c Modified: branches/custom-tab-width/ChangeLog =================================================================== --- branches/custom-tab-width/ChangeLog 2008-07-28 13:38:12 UTC (rev 2828) +++ branches/custom-tab-width/ChangeLog 2008-07-28 13:42:14 UTC (rev 2829) @@ -5,6 +5,12 @@ radio option, and a Tab Width spin entry. Replace GeanyIndentPrefs::use_tabs with GeanyIndentType field 'type'. (Still won't compile ;-)). + * src/prefs.c: + Move toggle_prefs to a function toggle_items_foreach(), which takes + a PREF_DISPLAY or PREF_UPDATE argument. This means the PrefEntry + array can contain runtime fields, so can read pointer contents. + Add pref_item_callbacks array of functions to call like + toggle_items_foreach(). 2008-07-25 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: branches/custom-tab-width/src/prefs.c =================================================================== --- branches/custom-tab-width/src/prefs.c 2008-07-28 13:38:12 UTC (rev 2828) +++ branches/custom-tab-width/src/prefs.c 2008-07-28 13:42:14 UTC (rev 2829) @@ -89,7 +89,14 @@ static void on_prefs_print_page_header_toggled(GtkToggleButton *togglebutton, gpointer user_data); -/* used in e.g. init_toggle_button_prefs(). */ +typedef enum PrefCallbackAction +{ + PREF_DISPLAY, + PREF_UPDATE +} +PrefCallbackAction; + + typedef struct PrefEntry { const gchar *widget_name; @@ -97,14 +104,44 @@ } PrefEntry; -static PrefEntry toggle_prefs[] = + +static void toggle_items_foreach(PrefCallbackAction action) { - {"check_cmdline_new_files", &file_prefs.cmdline_new_files}, + guint i; + PrefEntry items[] = + { + {"check_cmdline_new_files", &file_prefs.cmdline_new_files}, - {"check_ask_suppress_search_dialogs", &search_prefs.suppress_dialogs}, - {"check_search_use_current_word", &search_prefs.use_current_word}, - {"check_fif_current_dir", &search_prefs.use_current_file_dir}, - {NULL, NULL} /* must be terminated */ + {"check_ask_suppress_search_dialogs", &search_prefs.suppress_dialogs}, + {"check_search_use_current_word", &search_prefs.use_current_word}, + {"check_fif_current_dir", &search_prefs.use_current_file_dir}, + }; + + for (i = 0; i < G_N_ELEMENTS(items); i++) + { + PrefEntry *pe = &items[i]; + GtkWidget *widget = lookup_widget(ui_widgets.prefs_dialog, pe->widget_name); + gboolean *setting = pe->setting; + + switch (action) + { + case PREF_DISPLAY: + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), *setting); + break; + case PREF_UPDATE: + *setting = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + break; + } + } +} + + +typedef void (*PrefItemsCallback)(PrefCallbackAction action); + +/* List of functions which hold the PrefEntry arrays. This allows access to + * runtime setting fields like EditorPrefs::indentation->width. */ +PrefItemsCallback pref_item_callbacks[] = { + toggle_items_foreach }; @@ -180,16 +217,12 @@ } -static void init_toggle_button_prefs() +static void init_prefs(void) { - PrefEntry *pe; + guint i; - for (pe = toggle_prefs; pe->widget_name != NULL; pe++) - { - GtkWidget *widget = lookup_widget(ui_widgets.prefs_dialog, pe->widget_name); - - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), *(gboolean*)pe->setting); - } + for (i = 0; i < G_N_ELEMENTS(pref_item_callbacks); i++) + pref_item_callbacks[i](PREF_DISPLAY); } @@ -198,7 +231,7 @@ GtkWidget *widget; GdkColor *color; - init_toggle_button_prefs(); + init_prefs(); /* General settings */ /* startup */ @@ -614,16 +647,12 @@ } -static void update_toggle_button_prefs() +static void update_prefs(void) { - PrefEntry *pe; + guint i; - for (pe = toggle_prefs; pe->widget_name != NULL; pe++) - { - GtkWidget *widget = lookup_widget(ui_widgets.prefs_dialog, pe->widget_name); - - *(gboolean*)pe->setting = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - } + for (i = 0; i < G_N_ELEMENTS(pref_item_callbacks); i++) + pref_item_callbacks[i](PREF_UPDATE); } @@ -638,7 +667,7 @@ GtkWidget *widget; guint i; - update_toggle_button_prefs(); + update_prefs(); /* General settings */ /* startup */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2828] branches/custom-tab-width/src/editor.h
by ntrel＠users.sourceforge.net 28 Jul '08

28 Jul '08

Revision: 2828 http://geany.svn.sourceforge.net/geany/?rev=2828&view=rev Author: ntrel Date: 2008-07-28 13:38:12 +0000 (Mon, 28 Jul 2008) Log Message: ----------- Add missing commas (oops). Modified Paths: -------------- branches/custom-tab-width/src/editor.h Modified: branches/custom-tab-width/src/editor.h =================================================================== --- branches/custom-tab-width/src/editor.h 2008-07-28 11:52:19 UTC (rev 2827) +++ branches/custom-tab-width/src/editor.h 2008-07-28 13:38:12 UTC (rev 2828) @@ -48,8 +48,8 @@ /** Whether to use tabs, spaces or both to indent. */ typedef enum { - GEANY_INDENT_TYPE_TABS /**< Tabs. */ - GEANY_INDENT_TYPE_SPACES /**< Spaces. */ + GEANY_INDENT_TYPE_TABS, /**< Tabs. */ + GEANY_INDENT_TYPE_SPACES, /**< Spaces. */ GEANY_INDENT_TYPE_BOTH /**< Both. */ } GeanyIndentType; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2827] branches/custom-tab-width
by ntrel＠users.sourceforge.net 28 Jul '08

28 Jul '08

Revision: 2827 http://geany.svn.sourceforge.net/geany/?rev=2827&view=rev Author: ntrel Date: 2008-07-28 11:52:19 +0000 (Mon, 28 Jul 2008) Log Message: ----------- Replace 'Custom tab width' option with a 'Tabs & Spaces' Indent Type radio option, and a Tab Width spin entry. Replace GeanyIndentPrefs::use_tabs with GeanyIndentType field 'type'. (Still won't compile ;-)). Modified Paths: -------------- branches/custom-tab-width/ChangeLog branches/custom-tab-width/geany.glade branches/custom-tab-width/src/editor.h branches/custom-tab-width/src/interface.c Modified: branches/custom-tab-width/ChangeLog =================================================================== --- branches/custom-tab-width/ChangeLog 2008-07-27 18:42:21 UTC (rev 2826) +++ branches/custom-tab-width/ChangeLog 2008-07-28 11:52:19 UTC (rev 2827) @@ -1,3 +1,12 @@ +2008-07-28 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/interface.c, src/editor.h, geany.glade: + Replace 'Custom tab width' option with a 'Tabs & Spaces' Indent Type + radio option, and a Tab Width spin entry. + Replace GeanyIndentPrefs::use_tabs with GeanyIndentType field 'type'. + (Still won't compile ;-)). + + 2008-07-25 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/plugindata.h, src/main.c, src/editor.c, src/editor.h: Modified: branches/custom-tab-width/geany.glade =================================================================== --- branches/custom-tab-width/geany.glade 2008-07-27 18:42:21 UTC (rev 2826) +++ branches/custom-tab-width/geany.glade 2008-07-28 11:52:19 UTC (rev 2827) @@ -5354,7 +5354,7 @@ <child> <widget class="GtkTable" id="table13"> <property name="visible">True</property> - <property name="n_rows">5</property> + <property name="n_rows">7</property> <property name="n_columns">2</property> <property name="homogeneous">False</property> <property name="row_spacing">3</property> @@ -5369,7 +5369,7 @@ <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> <property name="selectable">False</property> - <property name="xalign">0.5</property> + <property name="xalign">0</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> @@ -5381,8 +5381,8 @@ <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="top_attach">6</property> + <property name="bottom_attach">7</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> @@ -5401,70 +5401,14 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="top_attach">6</property> + <property name="bottom_attach">7</property> <property name="x_options">fill</property> <property name="y_options">fill</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox8"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkRadioButton" id="radio_indent_tabs"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Whether to use tabs or spaces when indentation is inserted.</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Tabs</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkRadioButton" id="radio_indent_spaces"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Whether to use tabs or spaces when indentation is inserted.</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Spaces</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <property name="group">radio_indent_tabs</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - </packing> - </child> - - <child> <widget class="GtkLabel" id="label200"> <property name="visible">True</property> <property name="label" translatable="yes">Type:</property> @@ -5485,29 +5429,6 @@ <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="check_detect_indent"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Whether to detect the indentation type from file contents when a file is opened.</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Detect from file</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">fill</property> @@ -5536,8 +5457,8 @@ <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> @@ -5559,56 +5480,179 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkRadioButton" id="radio_indent_spaces"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Use spaces when inserting indentation</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">_Spaces</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> + <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkCheckButton" id="check_custom_tab_width"> + <widget class="GtkRadioButton" id="radio_indent_tabs"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Make tabs have a different size from the indent width</property> + <property name="tooltip" translatable="yes">Use one tab per indent</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Custom tab width:</property> + <property name="label" translatable="yes">_Tabs</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> + <property name="group">radio_indent_spaces</property> </widget> <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkSpinButton" id="spin_tab_width"> + <widget class="GtkRadioButton" id="radio_indent_both"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">The width in chars, which one tab character will take</property> + <property name="tooltip" translatable="yes">Use spaces if the total indent is less than the tab width, otherwise use both</property> <property name="can_focus">True</property> - <property name="climb_rate">1</property> - <property name="digits">0</property> - <property name="numeric">True</property> - <property name="update_policy">GTK_UPDATE_IF_VALID</property> - <property name="snap_to_ticks">False</property> - <property name="wrap">True</property> - <property name="adjustment">1 1 99 1 10 10</property> + <property name="label" translatable="yes">T_abs & Spaces</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <property name="group">radio_indent_spaces</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">3</property> <property name="bottom_attach">4</property> + <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> + + <child> + <widget class="GtkAlignment" id="alignment41"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xscale">1</property> + <property name="yscale">1</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">24</property> + <property name="right_padding">0</property> + + <child> + <widget class="GtkHBox" id="hbox12"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child> + <widget class="GtkLabel" id="label221"> + <property name="visible">True</property> + <property name="label" translatable="yes">Tab Width:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkSpinButton" id="spin_tab_width"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">The width of a tab when Tabs & Spaces is set for a document</property> + <property name="can_focus">True</property> + <property name="climb_rate">1</property> + <property name="digits">0</property> + <property name="numeric">True</property> + <property name="update_policy">GTK_UPDATE_IF_VALID</property> + <property name="snap_to_ticks">False</property> + <property name="wrap">True</property> + <property name="adjustment">8 1 99 1 10 10</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + </child> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + <property name="x_options">fill</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="check_detect_indent"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Whether to detect the indentation type from file contents when a file is opened.</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Detect from file</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> </widget> <packing> <property name="padding">0</property> Modified: branches/custom-tab-width/src/editor.h =================================================================== --- branches/custom-tab-width/src/editor.h 2008-07-27 18:42:21 UTC (rev 2826) +++ branches/custom-tab-width/src/editor.h 2008-07-28 11:52:19 UTC (rev 2827) @@ -45,22 +45,32 @@ #define SSM(s, m, w, l) scintilla_send_message(s, m, w, l) +/** Whether to use tabs, spaces or both to indent. */ typedef enum { - INDENT_NONE = 0, - INDENT_BASIC, - INDENT_CURRENTCHARS, - INDENT_MATCHBRACES -} GeanyIndentMode; + GEANY_INDENT_TYPE_TABS /**< Tabs. */ + GEANY_INDENT_TYPE_SPACES /**< Spaces. */ + GEANY_INDENT_TYPE_BOTH /**< Both. */ +} +GeanyIndentType; +typedef enum +{ + GEANY_AUTOINDENT_NONE = 0, + GEANY_AUTOINDENT_BASIC, + GEANY_AUTOINDENT_CURRENTCHARS, + GEANY_AUTOINDENT_MATCHBRACES +} +GeanyAutoIndent; + + typedef struct GeanyIndentPrefs { - gint width; /**< Indent width. */ - gint tab_width; /**< Width of a tab, if @c custom_tab_width is set. */ - gboolean custom_tab_width; /**< Whether a tab is a different size from an indent. */ - gboolean use_tabs; /**< Whether to (mainly) use tabs or spaces to indent. */ - gboolean use_tab_to_indent; /* hidden pref */ - GeanyIndentMode mode; + gint width; /**< Indent width. */ + GeanyIndentType type; /**< Whether to use tabs, spaces or both to indent. */ + gint tab_width; /**< Width of a tab, when using GEANY_INDENT_TYPE_BOTH. */ + gboolean use_tab_to_indent; /* hidden pref makes pressing Tab key like Ctrl-I */ + GeanyAutoIndent auto_indent_mode; } GeanyIndentPrefs; Modified: branches/custom-tab-width/src/interface.c =================================================================== --- branches/custom-tab-width/src/interface.c 2008-07-27 18:42:21 UTC (rev 2826) +++ branches/custom-tab-width/src/interface.c 2008-07-28 11:52:19 UTC (rev 2827) @@ -2669,18 +2669,20 @@ GtkWidget *table13; GtkWidget *label183; GtkWidget *combo_auto_indent_mode; - GtkWidget *hbox8; - GtkWidget *radio_indent_tabs; - GSList *radio_indent_tabs_group = NULL; - GtkWidget *radio_indent_spaces; GtkWidget *label200; - GtkWidget *check_detect_indent; GtkWidget *label220; GtkObject *spin_indent_width_adj; GtkWidget *spin_indent_width; - GtkWidget *check_custom_tab_width; + GtkWidget *radio_indent_spaces; + GSList *radio_indent_spaces_group = NULL; + GtkWidget *radio_indent_tabs; + GtkWidget *radio_indent_both; + GtkWidget *alignment41; + GtkWidget *hbox12; + GtkWidget *label221; GtkObject *spin_tab_width_adj; GtkWidget *spin_tab_width; + GtkWidget *check_detect_indent; GtkWidget *label195; GtkWidget *frame14; GtkWidget *alignment17; @@ -3591,7 +3593,7 @@ gtk_widget_show (vbox25); gtk_container_add (GTK_CONTAINER (alignment30), vbox25); - table13 = gtk_table_new (5, 2, FALSE); + table13 = gtk_table_new (7, 2, FALSE); gtk_widget_show (table13); gtk_box_pack_start (GTK_BOX (vbox25), table13, FALSE, TRUE, 0); gtk_table_set_row_spacings (GTK_TABLE (table13), 3); @@ -3599,13 +3601,14 @@ label183 = gtk_label_new (_("Auto-indent mode:")); gtk_widget_show (label183); - gtk_table_attach (GTK_TABLE (table13), label183, 0, 1, 4, 5, + gtk_table_attach (GTK_TABLE (table13), label183, 0, 1, 6, 7, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment (GTK_MISC (label183), 0, 0.5); combo_auto_indent_mode = gtk_combo_box_new_text (); gtk_widget_show (combo_auto_indent_mode); - gtk_table_attach (GTK_TABLE (table13), combo_auto_indent_mode, 1, 2, 4, 5, + gtk_table_attach (GTK_TABLE (table13), combo_auto_indent_mode, 1, 2, 6, 7, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); gtk_combo_box_append_text (GTK_COMBO_BOX (combo_auto_indent_mode), _("None")); @@ -3613,43 +3616,16 @@ gtk_combo_box_append_text (GTK_COMBO_BOX (combo_auto_indent_mode), _("Current chars")); gtk_combo_box_append_text (GTK_COMBO_BOX (combo_auto_indent_mode), _("Match braces")); - hbox8 = gtk_hbox_new (FALSE, 12); - gtk_widget_show (hbox8); - gtk_table_attach (GTK_TABLE (table13), hbox8, 1, 2, 0, 1, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); - - radio_indent_tabs = gtk_radio_button_new_with_mnemonic (NULL, _("_Tabs")); - gtk_widget_show (radio_indent_tabs); - gtk_box_pack_start (GTK_BOX (hbox8), radio_indent_tabs, FALSE, FALSE, 0); - gtk_tooltips_set_tip (tooltips, radio_indent_tabs, _("Whether to use tabs or spaces when indentation is inserted."), NULL); - gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_indent_tabs), radio_indent_tabs_group); - radio_indent_tabs_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_indent_tabs)); - - radio_indent_spaces = gtk_radio_button_new_with_mnemonic (NULL, _("_Spaces")); - gtk_widget_show (radio_indent_spaces); - gtk_box_pack_start (GTK_BOX (hbox8), radio_indent_spaces, FALSE, FALSE, 0); - gtk_tooltips_set_tip (tooltips, radio_indent_spaces, _("Whether to use tabs or spaces when indentation is inserted."), NULL); - gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_indent_spaces), radio_indent_tabs_group); - radio_indent_tabs_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_indent_spaces)); - label200 = gtk_label_new (_("Type:")); gtk_widget_show (label200); - gtk_table_attach (GTK_TABLE (table13), label200, 0, 1, 0, 1, + gtk_table_attach (GTK_TABLE (table13), label200, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (label200), 0, 0.5); - check_detect_indent = gtk_check_button_new_with_mnemonic (_("Detect from file")); - gtk_widget_show (check_detect_indent); - gtk_table_attach (GTK_TABLE (table13), check_detect_indent, 1, 2, 1, 2, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip (tooltips, check_detect_indent, _("Whether to detect the indentation type from file contents when a file is opened."), NULL); - label220 = gtk_label_new (_("Width:")); gtk_widget_show (label220); - gtk_table_attach (GTK_TABLE (table13), label220, 0, 1, 2, 3, + gtk_table_attach (GTK_TABLE (table13), label220, 0, 1, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (label220), 0, 0.5); @@ -3657,7 +3633,7 @@ spin_indent_width_adj = gtk_adjustment_new (1, 1, 99, 1, 10, 10); spin_indent_width = gtk_spin_button_new (GTK_ADJUSTMENT (spin_indent_width_adj), 1, 0); gtk_widget_show (spin_indent_width); - gtk_table_attach (GTK_TABLE (table13), spin_indent_width, 1, 2, 2, 3, + gtk_table_attach (GTK_TABLE (table13), spin_indent_width, 1, 2, 0, 1, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_tooltips_set_tip (tooltips, spin_indent_width, _("The width in chars of a single indent"), NULL); @@ -3665,24 +3641,64 @@ gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (spin_indent_width), GTK_UPDATE_IF_VALID); gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spin_indent_width), TRUE); - check_custom_tab_width = gtk_check_button_new_with_mnemonic (_("Custom tab width:")); - gtk_widget_show (check_custom_tab_width); - gtk_table_attach (GTK_TABLE (table13), check_custom_tab_width, 0, 1, 3, 4, + radio_indent_spaces = gtk_radio_button_new_with_mnemonic (NULL, _("_Spaces")); + gtk_widget_show (radio_indent_spaces); + gtk_table_attach (GTK_TABLE (table13), radio_indent_spaces, 1, 2, 2, 3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip (tooltips, check_custom_tab_width, _("Make tabs have a different size from the indent width"), NULL); + gtk_tooltips_set_tip (tooltips, radio_indent_spaces, _("Use spaces when inserting indentation"), NULL); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_indent_spaces), radio_indent_spaces_group); + radio_indent_spaces_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_indent_spaces)); - spin_tab_width_adj = gtk_adjustment_new (1, 1, 99, 1, 10, 10); + radio_indent_tabs = gtk_radio_button_new_with_mnemonic (NULL, _("_Tabs")); + gtk_widget_show (radio_indent_tabs); + gtk_table_attach (GTK_TABLE (table13), radio_indent_tabs, 1, 2, 1, 2, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_tooltips_set_tip (tooltips, radio_indent_tabs, _("Use one tab per indent"), NULL); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_indent_tabs), radio_indent_spaces_group); + radio_indent_spaces_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_indent_tabs)); + + radio_indent_both = gtk_radio_button_new_with_mnemonic (NULL, _("T_abs & Spaces")); + gtk_widget_show (radio_indent_both); + gtk_table_attach (GTK_TABLE (table13), radio_indent_both, 1, 2, 3, 4, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_tooltips_set_tip (tooltips, radio_indent_both, _("Use spaces if the total indent is less than the tab width, otherwise use both"), NULL); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_indent_both), radio_indent_spaces_group); + radio_indent_spaces_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_indent_both)); + + alignment41 = gtk_alignment_new (0.5, 0.5, 1, 1); + gtk_widget_show (alignment41); + gtk_table_attach (GTK_TABLE (table13), alignment41, 1, 2, 4, 5, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); + gtk_alignment_set_padding (GTK_ALIGNMENT (alignment41), 0, 0, 24, 0); + + hbox12 = gtk_hbox_new (FALSE, 12); + gtk_widget_show (hbox12); + gtk_container_add (GTK_CONTAINER (alignment41), hbox12); + + label221 = gtk_label_new (_("Tab Width:")); + gtk_widget_show (label221); + gtk_box_pack_start (GTK_BOX (hbox12), label221, FALSE, FALSE, 0); + + spin_tab_width_adj = gtk_adjustment_new (8, 1, 99, 1, 10, 10); spin_tab_width = gtk_spin_button_new (GTK_ADJUSTMENT (spin_tab_width_adj), 1, 0); gtk_widget_show (spin_tab_width); - gtk_table_attach (GTK_TABLE (table13), spin_tab_width, 1, 2, 3, 4, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip (tooltips, spin_tab_width, _("The width in chars, which one tab character will take"), NULL); + gtk_box_pack_start (GTK_BOX (hbox12), spin_tab_width, TRUE, TRUE, 0); + gtk_tooltips_set_tip (tooltips, spin_tab_width, _("The width of a tab when Tabs & Spaces is set for a document"), NULL); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_tab_width), TRUE); gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (spin_tab_width), GTK_UPDATE_IF_VALID); gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spin_tab_width), TRUE); + check_detect_indent = gtk_check_button_new_with_mnemonic (_("Detect from file")); + gtk_widget_show (check_detect_indent); + gtk_table_attach (GTK_TABLE (table13), check_detect_indent, 1, 2, 5, 6, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_tooltips_set_tip (tooltips, check_detect_indent, _("Whether to detect the indentation type from file contents when a file is opened."), NULL); + label195 = gtk_label_new (_("<b>Indentation</b>")); gtk_widget_show (label195); gtk_frame_set_label_widget (GTK_FRAME (frame27), label195); @@ -4886,15 +4902,17 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, table13, "table13"); GLADE_HOOKUP_OBJECT (prefs_dialog, label183, "label183"); GLADE_HOOKUP_OBJECT (prefs_dialog, combo_auto_indent_mode, "combo_auto_indent_mode"); - GLADE_HOOKUP_OBJECT (prefs_dialog, hbox8, "hbox8"); - GLADE_HOOKUP_OBJECT (prefs_dialog, radio_indent_tabs, "radio_indent_tabs"); - GLADE_HOOKUP_OBJECT (prefs_dialog, radio_indent_spaces, "radio_indent_spaces"); GLADE_HOOKUP_OBJECT (prefs_dialog, label200, "label200"); - GLADE_HOOKUP_OBJECT (prefs_dialog, check_detect_indent, "check_detect_indent"); GLADE_HOOKUP_OBJECT (prefs_dialog, label220, "label220"); GLADE_HOOKUP_OBJECT (prefs_dialog, spin_indent_width, "spin_indent_width"); - GLADE_HOOKUP_OBJECT (prefs_dialog, check_custom_tab_width, "check_custom_tab_width"); + GLADE_HOOKUP_OBJECT (prefs_dialog, radio_indent_spaces, "radio_indent_spaces"); + GLADE_HOOKUP_OBJECT (prefs_dialog, radio_indent_tabs, "radio_indent_tabs"); + GLADE_HOOKUP_OBJECT (prefs_dialog, radio_indent_both, "radio_indent_both"); + GLADE_HOOKUP_OBJECT (prefs_dialog, alignment41, "alignment41"); + GLADE_HOOKUP_OBJECT (prefs_dialog, hbox12, "hbox12"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label221, "label221"); GLADE_HOOKUP_OBJECT (prefs_dialog, spin_tab_width, "spin_tab_width"); + GLADE_HOOKUP_OBJECT (prefs_dialog, check_detect_indent, "check_detect_indent"); GLADE_HOOKUP_OBJECT (prefs_dialog, label195, "label195"); GLADE_HOOKUP_OBJECT (prefs_dialog, frame14, "frame14"); GLADE_HOOKUP_OBJECT (prefs_dialog, alignment17, "alignment17"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2826] trunk
by eht16＠users.sourceforge.net 28 Jul '08

28 Jul '08

Revision: 2826 http://geany.svn.sourceforge.net/geany/?rev=2826&view=rev Author: eht16 Date: 2008-07-27 18:42:21 +0000 (Sun, 27 Jul 2008) Log Message: ----------- Add a small border to all notebook pages in the preferences dialog. Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/interface.c trunk/src/vte.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-07-27 18:41:07 UTC (rev 2825) +++ trunk/ChangeLog 2008-07-27 18:42:21 UTC (rev 2826) @@ -6,6 +6,8 @@ * geany.glade, doc/geany.html, doc/geany.txt, src/editor.c, src/interface.c, src/keyfile.c, src/plugindata.h, src/prefs.c: Add a preference for the comment toggle mark string("~ " by default). + * geany.glade, src/interface.c, src/vte.c: + Add a small border to all notebook pages in the preferences dialog. 2008-07-25 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2008-07-27 18:41:07 UTC (rev 2825) +++ trunk/geany.glade 2008-07-27 18:42:21 UTC (rev 2826) @@ -3223,6 +3223,7 @@ <child> <widget class="GtkVBox" id="vbox20"> + <property name="border_width">5</property> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">10</property> @@ -3908,6 +3909,7 @@ <child> <widget class="GtkVBox" id="vbox14"> + <property name="border_width">5</property> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">10</property> @@ -4733,6 +4735,7 @@ <child> <widget class="GtkVBox" id="vbox15"> + <property name="border_width">5</property> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">10</property> @@ -5322,6 +5325,7 @@ <child> <widget class="GtkVBox" id="vbox5"> + <property name="border_width">5</property> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">10</property> @@ -5956,6 +5960,7 @@ <child> <widget class="GtkFrame" id="frame18"> + <property name="border_width">5</property> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="label_yalign">0.5</property> @@ -6233,6 +6238,7 @@ <child> <widget class="GtkVBox" id="vbox24"> + <property name="border_width">5</property> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">10</property> @@ -6700,6 +6706,7 @@ <child> <widget class="GtkVBox" id="vbox18"> + <property name="border_width">5</property> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">10</property> @@ -7370,6 +7377,7 @@ <child> <widget class="GtkFrame" id="frame36"> + <property name="border_width">5</property> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="label_yalign">0.5</property> @@ -7508,6 +7516,7 @@ <child> <widget class="GtkVBox" id="vbox23"> + <property name="border_width">5</property> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">10</property> @@ -8091,6 +8100,7 @@ <child> <widget class="GtkFrame" id="frame21"> + <property name="border_width">5</property> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="label_yalign">0.5</property> @@ -8605,6 +8615,7 @@ <child> <widget class="GtkFrame" id="frame22"> + <property name="border_width">5</property> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="label_yalign">0.5</property> @@ -8763,6 +8774,7 @@ <child> <widget class="GtkVBox" id="vbox27"> + <property name="border_width">5</property> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">0</property> Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2008-07-27 18:41:07 UTC (rev 2825) +++ trunk/src/interface.c 2008-07-27 18:42:21 UTC (rev 2826) @@ -2904,6 +2904,7 @@ vbox20 = gtk_vbox_new (FALSE, 10); gtk_widget_show (vbox20); gtk_container_add (GTK_CONTAINER (notebook2), vbox20); + gtk_container_set_border_width (GTK_CONTAINER (vbox20), 5); frame10 = gtk_frame_new (NULL); gtk_widget_show (frame10); @@ -3120,6 +3121,7 @@ vbox14 = gtk_vbox_new (FALSE, 10); gtk_widget_show (vbox14); gtk_container_add (GTK_CONTAINER (notebook2), vbox14); + gtk_container_set_border_width (GTK_CONTAINER (vbox14), 5); frame7 = gtk_frame_new (NULL); gtk_widget_show (frame7); @@ -3379,6 +3381,7 @@ vbox15 = gtk_vbox_new (FALSE, 10); gtk_widget_show (vbox15); gtk_container_add (GTK_CONTAINER (notebook2), vbox15); + gtk_container_set_border_width (GTK_CONTAINER (vbox15), 5); frame28 = gtk_frame_new (NULL); gtk_widget_show (frame28); @@ -3576,6 +3579,7 @@ vbox5 = gtk_vbox_new (FALSE, 10); gtk_widget_show (vbox5); gtk_container_add (GTK_CONTAINER (notebook4), vbox5); + gtk_container_set_border_width (GTK_CONTAINER (vbox5), 5); frame27 = gtk_frame_new (NULL); gtk_widget_show (frame27); @@ -3764,6 +3768,7 @@ frame18 = gtk_frame_new (NULL); gtk_widget_show (frame18); gtk_container_add (GTK_CONTAINER (notebook4), frame18); + gtk_container_set_border_width (GTK_CONTAINER (frame18), 5); gtk_frame_set_shadow_type (GTK_FRAME (frame18), GTK_SHADOW_NONE); alignment21 = gtk_alignment_new (0.5, 0.5, 1, 1); @@ -3849,6 +3854,7 @@ vbox24 = gtk_vbox_new (FALSE, 10); gtk_widget_show (vbox24); gtk_container_add (GTK_CONTAINER (notebook4), vbox24); + gtk_container_set_border_width (GTK_CONTAINER (vbox24), 5); frame5 = gtk_frame_new (NULL); gtk_widget_show (frame5); @@ -3988,6 +3994,7 @@ vbox18 = gtk_vbox_new (FALSE, 10); gtk_widget_show (vbox18); gtk_container_add (GTK_CONTAINER (notebook2), vbox18); + gtk_container_set_border_width (GTK_CONTAINER (vbox18), 5); frame6 = gtk_frame_new (NULL); gtk_widget_show (frame6); @@ -4208,6 +4215,7 @@ frame36 = gtk_frame_new (NULL); gtk_widget_show (frame36); gtk_container_add (GTK_CONTAINER (notebook2), frame36); + gtk_container_set_border_width (GTK_CONTAINER (frame36), 5); gtk_frame_set_shadow_type (GTK_FRAME (frame36), GTK_SHADOW_NONE); alignment39 = gtk_alignment_new (0.5, 0.5, 1, 1); @@ -4249,6 +4257,7 @@ vbox23 = gtk_vbox_new (FALSE, 10); gtk_widget_show (vbox23); gtk_container_add (GTK_CONTAINER (notebook2), vbox23); + gtk_container_set_border_width (GTK_CONTAINER (vbox23), 5); frame20 = gtk_frame_new (NULL); gtk_widget_show (frame20); @@ -4426,6 +4435,7 @@ frame21 = gtk_frame_new (NULL); gtk_widget_show (frame21); gtk_container_add (GTK_CONTAINER (notebook2), frame21); + gtk_container_set_border_width (GTK_CONTAINER (frame21), 5); gtk_frame_set_shadow_type (GTK_FRAME (frame21), GTK_SHADOW_NONE); alignment24 = gtk_alignment_new (0.5, 0.5, 1, 1); @@ -4571,6 +4581,7 @@ frame22 = gtk_frame_new (NULL); gtk_widget_show (frame22); gtk_container_add (GTK_CONTAINER (notebook2), frame22); + gtk_container_set_border_width (GTK_CONTAINER (frame22), 5); gtk_frame_set_shadow_type (GTK_FRAME (frame22), GTK_SHADOW_NONE); alignment25 = gtk_alignment_new (0.5, 0.5, 1, 1); @@ -4618,6 +4629,7 @@ vbox27 = gtk_vbox_new (FALSE, 0); gtk_widget_show (vbox27); gtk_container_add (GTK_CONTAINER (notebook2), vbox27); + gtk_container_set_border_width (GTK_CONTAINER (vbox27), 5); frame32 = gtk_frame_new (NULL); gtk_widget_show (frame32); Modified: trunk/src/vte.c =================================================================== --- trunk/src/vte.c 2008-07-27 18:41:07 UTC (rev 2825) +++ trunk/src/vte.c 2008-07-27 18:42:21 UTC (rev 2826) @@ -686,6 +686,7 @@ notebook = lookup_widget(ui_widgets.prefs_dialog, "notebook2"); frame = ui_frame_new_with_alignment(_("Terminal plugin"), &alignment); + gtk_container_set_border_width(GTK_CONTAINER(frame), 5); vbox = gtk_vbox_new(FALSE, 12); gtk_container_add(GTK_CONTAINER(alignment), vbox); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2825] trunk
by eht16＠users.sourceforge.net 28 Jul '08

28 Jul '08

Revision: 2825 http://geany.svn.sourceforge.net/geany/?rev=2825&view=rev Author: eht16 Date: 2008-07-27 18:41:07 +0000 (Sun, 27 Jul 2008) Log Message: ----------- Add a preference for the comment toggle mark string("~ " by default). Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt trunk/geany.glade trunk/src/editor.c trunk/src/editor.h trunk/src/interface.c trunk/src/keyfile.c trunk/src/main.c trunk/src/plugindata.h trunk/src/prefs.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-07-27 18:38:46 UTC (rev 2824) +++ trunk/ChangeLog 2008-07-27 18:41:07 UTC (rev 2825) @@ -3,6 +3,9 @@ * configure.in, wscript: Add support for retrieving the SVN revision number also when using a git-svn. + * geany.glade, doc/geany.html, doc/geany.txt, src/editor.c, + src/interface.c, src/keyfile.c, src/plugindata.h, src/prefs.c: + Add a preference for the comment toggle mark string("~ " by default). 2008-07-25 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2008-07-27 18:38:46 UTC (rev 2824) +++ trunk/doc/geany.html 2008-07-27 18:41:07 UTC (rev 2825) @@ -6,7 +6,7 @@ <meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" /> <title>Geany</title> <meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" /> -<meta name="date" content="2008-07-13" /> +<meta name="date" content="$Date$" /> <style type="text/css"> /* @@ -139,7 +139,7 @@ <br />Nick Treleaven <br />Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>2008-07-13</td></tr> +<td>$Date$</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.15</td></tr> </tbody> @@ -1718,6 +1718,9 @@ <dt>Line breaking column</dt> <dd>The editor column number to insert a newline at when Line Breaking is enabled for the current document.</dd> +<dt>Comment toggle marker</dt> +<dd>A string which is added when toggling a line comment in a source file. +It is used to mark the comment as toggled.</dd> </dl> </div> </div> @@ -4172,7 +4175,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference" href="geany.txt">View document source</a>. -Generated on: 2008-07-13 11:47 UTC. +Generated on: 2008-07-27 18:22 UTC. Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2008-07-27 18:38:46 UTC (rev 2824) +++ trunk/doc/geany.txt 2008-07-27 18:41:07 UTC (rev 2825) @@ -1499,7 +1499,11 @@ The editor column number to insert a newline at when Line Breaking is enabled for the current document. +Comment toggle marker + A string which is added when toggling a line comment in a source file. + It is used to mark the comment as toggled. + Editor Completions tab in preferences dialog ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2008-07-27 18:38:46 UTC (rev 2824) +++ trunk/geany.glade 2008-07-27 18:41:07 UTC (rev 2825) @@ -5828,6 +5828,64 @@ <property name="fill">True</property> </packing> </child> + + <child> + <widget class="GtkHBox" id="hbox12"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child> + <widget class="GtkLabel" id="label220"> + <property name="visible">True</property> + <property name="label" translatable="yes">Comment toggle marker:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkEntry" id="entry_toggle_mark"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">A string which is added when toggling a line comment in a source file. It is used to mark the comment as toggled.</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">*</property> + <property name="activates_default">False</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> </widget> </child> </widget> Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2008-07-27 18:38:46 UTC (rev 2824) +++ trunk/src/editor.c 2008-07-27 18:41:07 UTC (rev 2825) @@ -1977,14 +1977,13 @@ /* use single line comment */ if (cc == NULL || strlen(cc) == 0) { - gsize tm_len = strlen(GEANY_TOGGLE_MARK); - single_line = TRUE; if (toggle) { + gsize tm_len = strlen(editor_prefs.comment_toggle_mark); if (strncmp(sel + x, co, co_len) != 0 || - strncmp(sel + x + co_len, GEANY_TOGGLE_MARK, tm_len) != 0) + strncmp(sel + x + co_len, editor_prefs.comment_toggle_mark, tm_len) != 0) continue; co_len += tm_len; @@ -2067,7 +2066,7 @@ gboolean break_loop = FALSE, single_line = FALSE; gboolean first_line_was_comment = FALSE; gsize co_len; - gsize tm_len = strlen(GEANY_TOGGLE_MARK); + gsize tm_len = strlen(editor_prefs.comment_toggle_mark); GeanyFiletype *ft; if (doc == NULL || doc->file_type == NULL) @@ -2127,7 +2126,7 @@ single_line = TRUE; if (strncmp(sel + x, co, co_len) == 0 && - strncmp(sel + x + co_len, GEANY_TOGGLE_MARK, tm_len) == 0) + strncmp(sel + x + co_len, editor_prefs.comment_toggle_mark, tm_len) == 0) { do_continue = TRUE; } @@ -2310,7 +2309,7 @@ if (toggle) { - gchar *text = g_strconcat(co, GEANY_TOGGLE_MARK, NULL); + gchar *text = g_strconcat(co, editor_prefs.comment_toggle_mark, NULL); sci_insert_text(doc->editor->sci, start, text); g_free(text); } Modified: trunk/src/editor.h =================================================================== --- trunk/src/editor.h 2008-07-27 18:38:46 UTC (rev 2824) +++ trunk/src/editor.h 2008-07-27 18:41:07 UTC (rev 2825) @@ -94,6 +94,7 @@ gboolean detect_tab_mode; gint line_break_column; gboolean auto_continue_multiline; + gchar *comment_toggle_mark; } GeanyEditorPrefs; extern GeanyEditorPrefs editor_prefs; Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2008-07-27 18:38:46 UTC (rev 2824) +++ trunk/src/interface.c 2008-07-27 18:41:07 UTC (rev 2825) @@ -2693,6 +2693,9 @@ GtkWidget *label209; GtkObject *spin_line_break_adj; GtkWidget *spin_line_break; + GtkWidget *hbox12; + GtkWidget *label220; + GtkWidget *entry_toggle_mark; GtkWidget *label172; GtkWidget *label211; GtkWidget *frame18; @@ -3736,6 +3739,19 @@ gtk_box_pack_start (GTK_BOX (hbox11), spin_line_break, FALSE, TRUE, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_line_break), TRUE); + hbox12 = gtk_hbox_new (FALSE, 12); + gtk_widget_show (hbox12); + gtk_box_pack_start (GTK_BOX (vbox17), hbox12, TRUE, TRUE, 0); + + label220 = gtk_label_new (_("Comment toggle marker:")); + gtk_widget_show (label220); + gtk_box_pack_start (GTK_BOX (hbox12), label220, FALSE, FALSE, 0); + + entry_toggle_mark = gtk_entry_new (); + gtk_widget_show (entry_toggle_mark); + gtk_box_pack_start (GTK_BOX (hbox12), entry_toggle_mark, FALSE, TRUE, 0); + gtk_tooltips_set_tip (tooltips, entry_toggle_mark, _("A string which is added when toggling a line comment in a source file. It is used to mark the comment as toggled."), NULL); + label172 = gtk_label_new (_("<b>Features</b>")); gtk_widget_show (label172); gtk_frame_set_label_widget (GTK_FRAME (frame14), label172); @@ -4886,6 +4902,9 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, hbox11, "hbox11"); GLADE_HOOKUP_OBJECT (prefs_dialog, label209, "label209"); GLADE_HOOKUP_OBJECT (prefs_dialog, spin_line_break, "spin_line_break"); + GLADE_HOOKUP_OBJECT (prefs_dialog, hbox12, "hbox12"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label220, "label220"); + GLADE_HOOKUP_OBJECT (prefs_dialog, entry_toggle_mark, "entry_toggle_mark"); GLADE_HOOKUP_OBJECT (prefs_dialog, label172, "label172"); GLADE_HOOKUP_OBJECT (prefs_dialog, label211, "label211"); GLADE_HOOKUP_OBJECT (prefs_dialog, frame18, "frame18"); Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2008-07-27 18:38:46 UTC (rev 2824) +++ trunk/src/keyfile.c 2008-07-27 18:41:07 UTC (rev 2825) @@ -276,6 +276,7 @@ g_key_file_set_boolean(config, PACKAGE, "pref_editor_newline_strip", editor_prefs.newline_strip); g_key_file_set_integer(config, PACKAGE, "line_break_column", editor_prefs.line_break_column); g_key_file_set_boolean(config, PACKAGE, "auto_continue_multiline", editor_prefs.auto_continue_multiline); + g_key_file_set_string(config, PACKAGE, "comment_toggle_mark", editor_prefs.comment_toggle_mark); /* files */ g_key_file_set_string(config, PACKAGE, "pref_editor_default_new_encoding", encodings[file_prefs.default_new_encoding].charset); @@ -600,6 +601,7 @@ editor_prefs.scroll_stop_at_last_line = utils_get_setting_boolean(config, PACKAGE, "scroll_stop_at_last_line", FALSE); editor_prefs.line_break_column = utils_get_setting_integer(config, PACKAGE, "line_break_column", 72); editor_prefs.auto_continue_multiline = utils_get_setting_boolean(config, PACKAGE, "auto_continue_multiline", TRUE); + editor_prefs.comment_toggle_mark = utils_get_setting_string(config, PACKAGE, "comment_toggle_mark", GEANY_TOGGLE_MARK); /* Files * use current locale encoding as default for new files (should be UTF-8 in most cases) */ Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2008-07-27 18:38:46 UTC (rev 2824) +++ trunk/src/main.c 2008-07-27 18:41:07 UTC (rev 2825) @@ -954,6 +954,7 @@ g_free(interface_prefs.tagbar_font); g_free(interface_prefs.msgwin_font); g_free(editor_prefs.long_line_color); + g_free(editor_prefs.comment_toggle_mark); g_free(tool_prefs.context_action_cmd); g_free(template_prefs.developer); g_free(template_prefs.company); Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2008-07-27 18:38:46 UTC (rev 2824) +++ trunk/src/plugindata.h 2008-07-27 18:41:07 UTC (rev 2825) @@ -36,7 +36,7 @@ /* The API version should be incremented whenever any plugin data types below are * modified or appended to. */ -static const gint api_version = 82; +static const gint api_version = 83; /* The ABI version should be incremented whenever existing fields in the plugin * data types below have to be changed or reordered. It should stay the same if fields Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2008-07-27 18:38:46 UTC (rev 2824) +++ trunk/src/prefs.c 2008-07-27 18:41:07 UTC (rev 2825) @@ -403,6 +403,9 @@ widget = lookup_widget(ui_widgets.prefs_dialog, "spin_tab_width"); gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), editor_prefs.tab_width); + widget = lookup_widget(ui_widgets.prefs_dialog, "entry_toggle_mark"); + gtk_entry_set_text(GTK_ENTRY(widget), editor_prefs.comment_toggle_mark); + widget = lookup_widget(ui_widgets.prefs_dialog, "check_replace_tabs"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), file_prefs.replace_tabs); @@ -813,6 +816,10 @@ /* Editor settings */ + widget = lookup_widget(ui_widgets.prefs_dialog, "entry_toggle_mark"); + setptr(editor_prefs.comment_toggle_mark, + gtk_editable_get_chars(GTK_EDITABLE(widget), 0, -1)); + widget = lookup_widget(ui_widgets.prefs_dialog, "spin_tab_width"); editor_prefs.tab_width = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2008