Revision: 1858 http://geany.svn.sourceforge.net/geany/?rev=1858&view=rev Author: ntrel Date: 2007-09-07 08:52:31 -0700 (Fri, 07 Sep 2007)
Log Message: ----------- Replace 'Use tabs...' preference checkbox with Tabs, Spaces radio buttons (should be a bit clearer).
Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/interface.c trunk/src/prefs.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-09-07 12:34:57 UTC (rev 1857) +++ trunk/ChangeLog 2007-09-07 15:52:31 UTC (rev 1858) @@ -6,6 +6,9 @@ Add fixed keybindings for switching to leftmost/rightmost document, Ctrl-Shift-{PageUp,PageDown}. Docs: Add 'Switching documents' keybindings section. + * src/interface.c, src/prefs.c, geany.glade: + Replace 'Use tabs...' preference checkbox with Tabs, Spaces radio + buttons (should be a bit clearer).
2007-09-05 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2007-09-07 12:34:57 UTC (rev 1857) +++ trunk/geany.glade 2007-09-07 15:52:31 UTC (rev 1858) @@ -5449,17 +5449,50 @@ <property name="spacing">0</property>
<child> - <widget class="GtkCheckButton" id="check_use_tabs"> + <widget class="GtkHBox" id="hbox8"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Whenever some whitespace is inserted by Geany it will use tabs when enabled otherwise Geany will use just spaces.</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Use tabs when inserting whitespace</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">False</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">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">Whenever some whitespace is inserted by Geany it will use tabs when enabled otherwise Geany will use just spaces.</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="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="padding">0</property>
Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2007-09-07 12:34:57 UTC (rev 1857) +++ trunk/src/interface.c 2007-09-07 15:52:31 UTC (rev 1858) @@ -2533,7 +2533,10 @@ GtkWidget *frame27; GtkWidget *alignment30; GtkWidget *vbox25; - GtkWidget *check_use_tabs; + GtkWidget *hbox8; + GtkWidget *radio_indent_tabs; + GSList *radio_indent_tabs_group = NULL; + GtkWidget *radio_indent_spaces; GtkWidget *table13; GtkWidget *label116; GtkWidget *label183; @@ -3450,12 +3453,23 @@ gtk_widget_show (vbox25); gtk_container_add (GTK_CONTAINER (alignment30), vbox25);
- check_use_tabs = gtk_check_button_new_with_mnemonic (_("Use tabs when inserting whitespace")); - gtk_widget_show (check_use_tabs); - gtk_box_pack_start (GTK_BOX (vbox25), check_use_tabs, FALSE, FALSE, 0); - gtk_tooltips_set_tip (tooltips, check_use_tabs, _("Whenever some whitespace is inserted by Geany it will use tabs when enabled otherwise Geany will use just spaces."), NULL); - gtk_button_set_focus_on_click (GTK_BUTTON (check_use_tabs), FALSE); + hbox8 = gtk_hbox_new (FALSE, 12); + gtk_widget_show (hbox8); + gtk_box_pack_start (GTK_BOX (vbox25), hbox8, FALSE, FALSE, 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, _("Whenever some whitespace is inserted by Geany it will use tabs when enabled otherwise Geany will use just spaces."), 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_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)); + table13 = gtk_table_new (2, 2, FALSE); gtk_widget_show (table13); gtk_box_pack_start (GTK_BOX (vbox25), table13, FALSE, TRUE, 0); @@ -4289,7 +4303,9 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, frame27, "frame27"); GLADE_HOOKUP_OBJECT (prefs_dialog, alignment30, "alignment30"); GLADE_HOOKUP_OBJECT (prefs_dialog, vbox25, "vbox25"); - GLADE_HOOKUP_OBJECT (prefs_dialog, check_use_tabs, "check_use_tabs"); + 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, table13, "table13"); GLADE_HOOKUP_OBJECT (prefs_dialog, label116, "label116"); GLADE_HOOKUP_OBJECT (prefs_dialog, label183, "label183");
Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2007-09-07 12:34:57 UTC (rev 1857) +++ trunk/src/prefs.c 2007-09-07 15:52:31 UTC (rev 1858) @@ -307,8 +307,11 @@ widget = lookup_widget(ui_widgets.prefs_dialog, "check_smart_home"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.smart_home_key);
- widget = lookup_widget(ui_widgets.prefs_dialog, "check_use_tabs"); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.use_tabs); + 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); @@ -681,7 +684,7 @@ widget = lookup_widget(ui_widgets.prefs_dialog, "check_smart_home"); editor_prefs.smart_home_key = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
- widget = lookup_widget(ui_widgets.prefs_dialog, "check_use_tabs"); + widget = lookup_widget(ui_widgets.prefs_dialog, "radio_indent_tabs"); editor_prefs.use_tabs = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
widget = lookup_widget(ui_widgets.prefs_dialog, "check_symbol_auto_completion");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.