SF.net SVN: geany:[2859] branches/custom-tab-width

[ntrel at users.sourceforge.net]

Revision: 2859
          http://geany.svn.sourceforge.net/geany/?rev=2859&view=rev
Author:   ntrel
Date:     2008-08-07 11:49:06 +0000 (Thu, 07 Aug 2008)

Log Message:
-----------
Set 'Detect from file' indent type setting insensitive when Tabs &
Spaces is set.

Modified Paths:
--------------
    branches/custom-tab-width/ChangeLog
    branches/custom-tab-width/geany.glade
    branches/custom-tab-width/src/callbacks.c
    branches/custom-tab-width/src/callbacks.h
    branches/custom-tab-width/src/interface.c

Modified: branches/custom-tab-width/ChangeLog
===================================================================
--- branches/custom-tab-width/ChangeLog	2008-08-06 08:35:58 UTC (rev 2858)
+++ branches/custom-tab-width/ChangeLog	2008-08-07 11:49:06 UTC (rev 2859)
@@ -1,3 +1,10 @@
+2008-08-07  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/interface.c, src/callbacks.c, src/callbacks.h, geany.glade:
+   Set 'Detect from file' indent type setting insensitive when Tabs &
+   Spaces is set.
+
+
 2008-08-05  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
 
  * src/editor.c, src/editor.h:

Modified: branches/custom-tab-width/geany.glade
===================================================================
--- branches/custom-tab-width/geany.glade	2008-08-06 08:35:58 UTC (rev 2858)
+++ branches/custom-tab-width/geany.glade	2008-08-07 11:49:06 UTC (rev 2859)
@@ -5557,6 +5557,7 @@
 				      <property name="inconsistent">False</property>
 				      <property name="draw_indicator">True</property>
 				      <property name="group">radio_indent_spaces</property>
+				      <signal name="toggled" handler="on_radio_indent_both_toggled" last_modification_time="Tue, 05 Aug 2008 15:14:37 GMT"/>
 				    </widget>
 				    <packing>
 				      <property name="left_attach">1</property>

Modified: branches/custom-tab-width/src/callbacks.c
===================================================================
--- branches/custom-tab-width/src/callbacks.c	2008-08-06 08:35:58 UTC (rev 2858)
+++ branches/custom-tab-width/src/callbacks.c	2008-08-07 11:49:06 UTC (rev 2859)
@@ -2216,3 +2216,15 @@
 	main_reload_configuration();
 }
 
+
+void
+on_radio_indent_both_toggled           (GtkToggleButton *togglebutton,
+                                        gpointer         user_data)
+{
+	GtkWidget *check = lookup_widget(ui_widgets.prefs_dialog, "check_detect_indent");
+	gboolean active;
+
+	active = gtk_toggle_button_get_active(togglebutton);
+	gtk_widget_set_sensitive(check, !active);
+}
+

Modified: branches/custom-tab-width/src/callbacks.h
===================================================================
--- branches/custom-tab-width/src/callbacks.h	2008-08-06 08:35:58 UTC (rev 2858)
+++ branches/custom-tab-width/src/callbacks.h	2008-08-07 11:49:06 UTC (rev 2859)
@@ -630,3 +630,7 @@
 void
 on_tabs_and_spaces1_activate           (GtkMenuItem     *menuitem,
                                         gpointer         user_data);
+
+void
+on_radio_indent_both_toggled           (GtkToggleButton *togglebutton,
+                                        gpointer         user_data);

Modified: branches/custom-tab-width/src/interface.c
===================================================================
--- branches/custom-tab-width/src/interface.c	2008-08-06 08:35:58 UTC (rev 2858)
+++ branches/custom-tab-width/src/interface.c	2008-08-07 11:49:06 UTC (rev 2859)
@@ -4785,6 +4785,10 @@
   gtk_dialog_add_action_widget (GTK_DIALOG (prefs_dialog), button5, GTK_RESPONSE_OK);
   GTK_WIDGET_SET_FLAGS (button5, GTK_CAN_DEFAULT);
 
+  g_signal_connect ((gpointer) radio_indent_both, "toggled",
+                    G_CALLBACK (on_radio_indent_both_toggled),
+                    NULL);
+
   /* Store pointers to all widgets, for use by lookup_widget(). */
   GLADE_HOOKUP_OBJECT_NO_REF (prefs_dialog, prefs_dialog, "prefs_dialog");
   GLADE_HOOKUP_OBJECT_NO_REF (prefs_dialog, dialog_vbox3, "dialog_vbox3");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.