SF.net SVN: geany: [2180] trunk

ntrel at users.sourceforge.net ntrel at xxxxx
Fri Jan 18 17:36:14 UTC 2008


Revision: 2180
          http://geany.svn.sourceforge.net/geany/?rev=2180&view=rev
Author:   ntrel
Date:     2008-01-18 09:36:08 -0800 (Fri, 18 Jan 2008)

Log Message:
-----------
Split up Prefs dialog General tab options into Startup, Shutdown
and Projects frames.
Rename 'Load and save session files...' option 'Use project-based
session files'.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/geany.glade
    trunk/src/interface.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-01-17 14:30:40 UTC (rev 2179)
+++ trunk/ChangeLog	2008-01-18 17:36:08 UTC (rev 2180)
@@ -1,3 +1,12 @@
+2008-01-18  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/interface.c, geany.glade:
+   Split up Prefs dialog General tab options into Startup, Shutdown
+   and Projects frames.
+   Rename 'Load and save session files...' option 'Use project-based
+   session files'.
+
+
 2008-01-17  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * data/filetypes.ruby, src/editor.c, src/highlighting.c:

Modified: trunk/geany.glade
===================================================================
--- trunk/geany.glade	2008-01-17 14:30:40 UTC (rev 2179)
+++ trunk/geany.glade	2008-01-18 17:36:08 UTC (rev 2180)
@@ -3184,10 +3184,10 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkCheckButton" id="check_project_session">
-			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">Whether to store project session files and open them when re-opening the project.</property>
-			      <property name="label" translatable="yes">Load and save session files when open and close a project</property>
+			    <widget class="GtkCheckButton" id="check_vte">
+			      <property name="tooltip" translatable="yes">Whether the virtual terminal emulation (VTE) should be loaded at startup. Disable it if you do not need it.</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Load virtual terminal support</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
 			      <property name="focus_on_click">False</property>
@@ -3203,13 +3203,13 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkCheckButton" id="check_vte">
-			      <property name="tooltip" translatable="yes">Whether the virtual terminal emulation (VTE) should be loaded at startup. Disable it if you do not need it.</property>
+			    <widget class="GtkCheckButton" id="check_plugins">
+			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Load virtual terminal support</property>
+			      <property name="label" translatable="yes">Enable plugin support</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">False</property>
+			      <property name="focus_on_click">True</property>
 			      <property name="active">False</property>
 			      <property name="inconsistent">False</property>
 			      <property name="draw_indicator">True</property>
@@ -3220,15 +3220,74 @@
 			      <property name="fill">False</property>
 			    </packing>
 			  </child>
+			</widget>
+		      </child>
+		    </widget>
+		  </child>
 
+		  <child>
+		    <widget class="GtkLabel" id="label162">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes"><b>Startup</b></property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">True</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="type">label_item</property>
+		    </packing>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkFrame" id="frame34">
+		  <property name="visible">True</property>
+		  <property name="label_xalign">0</property>
+		  <property name="label_yalign">0.5</property>
+		  <property name="shadow_type">GTK_SHADOW_NONE</property>
+
+		  <child>
+		    <widget class="GtkAlignment" id="alignment37">
+		      <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">12</property>
+		      <property name="right_padding">0</property>
+
+		      <child>
+			<widget class="GtkVBox" id="vbox34">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
 			  <child>
-			    <widget class="GtkCheckButton" id="check_plugins">
+			    <widget class="GtkCheckButton" id="check_save_win_pos">
 			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Enable plugin support</property>
+			      <property name="tooltip" translatable="yes">Saves the window position and geometry and restores it at the start</property>
+			      <property name="label" translatable="yes">Save window position and geometry</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
+			      <property name="focus_on_click">False</property>
 			      <property name="active">False</property>
 			      <property name="inconsistent">False</property>
 			      <property name="draw_indicator">True</property>
@@ -3241,10 +3300,10 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkCheckButton" id="check_save_win_pos">
+			    <widget class="GtkCheckButton" id="check_ask_for_quit">
 			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">Saves the window position and geometry and restores it at the start</property>
-			      <property name="label" translatable="yes">Save window position and geometry</property>
+			      <property name="tooltip" translatable="yes">Shows a confirmation dialog on exit.</property>
+			      <property name="label" translatable="yes">Confirm exit</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
 			      <property name="focus_on_click">False</property>
@@ -3258,12 +3317,71 @@
 			      <property name="fill">False</property>
 			    </packing>
 			  </child>
+			</widget>
+		      </child>
+		    </widget>
+		  </child>
 
+		  <child>
+		    <widget class="GtkLabel" id="label206">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes"><b>Shutdown</b></property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">True</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="type">label_item</property>
+		    </packing>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkFrame" id="frame35">
+		  <property name="visible">True</property>
+		  <property name="label_xalign">0</property>
+		  <property name="label_yalign">0.5</property>
+		  <property name="shadow_type">GTK_SHADOW_NONE</property>
+
+		  <child>
+		    <widget class="GtkAlignment" id="alignment38">
+		      <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">12</property>
+		      <property name="right_padding">0</property>
+
+		      <child>
+			<widget class="GtkVBox" id="vbox35">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
 			  <child>
-			    <widget class="GtkCheckButton" id="check_ask_for_quit">
+			    <widget class="GtkCheckButton" id="check_project_session">
 			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">Shows a confirmation dialog on exit.</property>
-			      <property name="label" translatable="yes">Confirm exit</property>
+			      <property name="tooltip" translatable="yes">Whether to store a project's session files and open them when re-opening the project.</property>
+			      <property name="label" translatable="yes">Use project-based session files</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
 			      <property name="focus_on_click">False</property>
@@ -3283,9 +3401,9 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkLabel" id="label162">
+		    <widget class="GtkLabel" id="label207">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes"><b>Startup and shutdown</b></property>
+		      <property name="label" translatable="yes"><b>Projects</b></property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>

Modified: trunk/src/interface.c
===================================================================
--- trunk/src/interface.c	2008-01-17 14:30:40 UTC (rev 2179)
+++ trunk/src/interface.c	2008-01-18 17:36:08 UTC (rev 2180)
@@ -2477,12 +2477,20 @@
   GtkWidget *alignment13;
   GtkWidget *vbox4;
   GtkWidget *check_load_session;
-  GtkWidget *check_project_session;
   GtkWidget *check_vte;
   GtkWidget *check_plugins;
+  GtkWidget *label162;
+  GtkWidget *frame34;
+  GtkWidget *alignment37;
+  GtkWidget *vbox34;
   GtkWidget *check_save_win_pos;
   GtkWidget *check_ask_for_quit;
-  GtkWidget *label162;
+  GtkWidget *label206;
+  GtkWidget *frame35;
+  GtkWidget *alignment38;
+  GtkWidget *vbox35;
+  GtkWidget *check_project_session;
+  GtkWidget *label207;
   GtkWidget *frame19;
   GtkWidget *alignment22;
   GtkWidget *vbox21;
@@ -2812,13 +2820,6 @@
   gtk_tooltips_set_tip (tooltips, check_load_session, _("Opens at startup the files from the last session"), NULL);
   gtk_button_set_focus_on_click (GTK_BUTTON (check_load_session), FALSE);
 
-  check_project_session = gtk_check_button_new_with_mnemonic (_("Load and save session files when open and close a project"));
-  gtk_widget_show (check_project_session);
-  gtk_box_pack_start (GTK_BOX (vbox4), check_project_session, FALSE, FALSE, 0);
-  GTK_WIDGET_UNSET_FLAGS (check_project_session, GTK_CAN_FOCUS);
-  gtk_tooltips_set_tip (tooltips, check_project_session, _("Whether to store project session files and open them when re-opening the project."), NULL);
-  gtk_button_set_focus_on_click (GTK_BUTTON (check_project_session), FALSE);
-
   check_vte = gtk_check_button_new_with_mnemonic (_("Load virtual terminal support"));
   gtk_box_pack_start (GTK_BOX (vbox4), check_vte, FALSE, FALSE, 0);
   gtk_tooltips_set_tip (tooltips, check_vte, _("Whether the virtual terminal emulation (VTE) should be loaded at startup. Disable it if you do not need it."), NULL);
@@ -2828,25 +2829,70 @@
   gtk_widget_show (check_plugins);
   gtk_box_pack_start (GTK_BOX (vbox4), check_plugins, FALSE, FALSE, 0);
 
+  label162 = gtk_label_new (_("<b>Startup</b>"));
+  gtk_widget_show (label162);
+  gtk_frame_set_label_widget (GTK_FRAME (frame10), label162);
+  gtk_label_set_use_markup (GTK_LABEL (label162), TRUE);
+
+  frame34 = gtk_frame_new (NULL);
+  gtk_widget_show (frame34);
+  gtk_box_pack_start (GTK_BOX (vbox20), frame34, FALSE, TRUE, 0);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame34), GTK_SHADOW_NONE);
+
+  alignment37 = gtk_alignment_new (0.5, 0.5, 1, 1);
+  gtk_widget_show (alignment37);
+  gtk_container_add (GTK_CONTAINER (frame34), alignment37);
+  gtk_alignment_set_padding (GTK_ALIGNMENT (alignment37), 0, 0, 12, 0);
+
+  vbox34 = gtk_vbox_new (FALSE, 0);
+  gtk_widget_show (vbox34);
+  gtk_container_add (GTK_CONTAINER (alignment37), vbox34);
+
   check_save_win_pos = gtk_check_button_new_with_mnemonic (_("Save window position and geometry"));
   gtk_widget_show (check_save_win_pos);
-  gtk_box_pack_start (GTK_BOX (vbox4), check_save_win_pos, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox34), check_save_win_pos, FALSE, FALSE, 0);
   GTK_WIDGET_UNSET_FLAGS (check_save_win_pos, GTK_CAN_FOCUS);
   gtk_tooltips_set_tip (tooltips, check_save_win_pos, _("Saves the window position and geometry and restores it at the start"), NULL);
   gtk_button_set_focus_on_click (GTK_BUTTON (check_save_win_pos), FALSE);
 
   check_ask_for_quit = gtk_check_button_new_with_mnemonic (_("Confirm exit"));
   gtk_widget_show (check_ask_for_quit);
-  gtk_box_pack_start (GTK_BOX (vbox4), check_ask_for_quit, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox34), check_ask_for_quit, FALSE, FALSE, 0);
   GTK_WIDGET_UNSET_FLAGS (check_ask_for_quit, GTK_CAN_FOCUS);
   gtk_tooltips_set_tip (tooltips, check_ask_for_quit, _("Shows a confirmation dialog on exit."), NULL);
   gtk_button_set_focus_on_click (GTK_BUTTON (check_ask_for_quit), FALSE);
 
-  label162 = gtk_label_new (_("<b>Startup and shutdown</b>"));
-  gtk_widget_show (label162);
-  gtk_frame_set_label_widget (GTK_FRAME (frame10), label162);
-  gtk_label_set_use_markup (GTK_LABEL (label162), TRUE);
+  label206 = gtk_label_new (_("<b>Shutdown</b>"));
+  gtk_widget_show (label206);
+  gtk_frame_set_label_widget (GTK_FRAME (frame34), label206);
+  gtk_label_set_use_markup (GTK_LABEL (label206), TRUE);
 
+  frame35 = gtk_frame_new (NULL);
+  gtk_widget_show (frame35);
+  gtk_box_pack_start (GTK_BOX (vbox20), frame35, FALSE, TRUE, 0);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame35), GTK_SHADOW_NONE);
+
+  alignment38 = gtk_alignment_new (0.5, 0.5, 1, 1);
+  gtk_widget_show (alignment38);
+  gtk_container_add (GTK_CONTAINER (frame35), alignment38);
+  gtk_alignment_set_padding (GTK_ALIGNMENT (alignment38), 0, 0, 12, 0);
+
+  vbox35 = gtk_vbox_new (FALSE, 0);
+  gtk_widget_show (vbox35);
+  gtk_container_add (GTK_CONTAINER (alignment38), vbox35);
+
+  check_project_session = gtk_check_button_new_with_mnemonic (_("Use project-based session files"));
+  gtk_widget_show (check_project_session);
+  gtk_box_pack_start (GTK_BOX (vbox35), check_project_session, FALSE, FALSE, 0);
+  GTK_WIDGET_UNSET_FLAGS (check_project_session, GTK_CAN_FOCUS);
+  gtk_tooltips_set_tip (tooltips, check_project_session, _("Whether to store a project's session files and open them when re-opening the project."), NULL);
+  gtk_button_set_focus_on_click (GTK_BUTTON (check_project_session), FALSE);
+
+  label207 = gtk_label_new (_("<b>Projects</b>"));
+  gtk_widget_show (label207);
+  gtk_frame_set_label_widget (GTK_FRAME (frame35), label207);
+  gtk_label_set_use_markup (GTK_LABEL (label207), TRUE);
+
   frame19 = gtk_frame_new (NULL);
   gtk_widget_show (frame19);
   gtk_box_pack_start (GTK_BOX (vbox20), frame19, FALSE, TRUE, 0);
@@ -4425,12 +4471,20 @@
   GLADE_HOOKUP_OBJECT (prefs_dialog, alignment13, "alignment13");
   GLADE_HOOKUP_OBJECT (prefs_dialog, vbox4, "vbox4");
   GLADE_HOOKUP_OBJECT (prefs_dialog, check_load_session, "check_load_session");
-  GLADE_HOOKUP_OBJECT (prefs_dialog, check_project_session, "check_project_session");
   GLADE_HOOKUP_OBJECT (prefs_dialog, check_vte, "check_vte");
   GLADE_HOOKUP_OBJECT (prefs_dialog, check_plugins, "check_plugins");
+  GLADE_HOOKUP_OBJECT (prefs_dialog, label162, "label162");
+  GLADE_HOOKUP_OBJECT (prefs_dialog, frame34, "frame34");
+  GLADE_HOOKUP_OBJECT (prefs_dialog, alignment37, "alignment37");
+  GLADE_HOOKUP_OBJECT (prefs_dialog, vbox34, "vbox34");
   GLADE_HOOKUP_OBJECT (prefs_dialog, check_save_win_pos, "check_save_win_pos");
   GLADE_HOOKUP_OBJECT (prefs_dialog, check_ask_for_quit, "check_ask_for_quit");
-  GLADE_HOOKUP_OBJECT (prefs_dialog, label162, "label162");
+  GLADE_HOOKUP_OBJECT (prefs_dialog, label206, "label206");
+  GLADE_HOOKUP_OBJECT (prefs_dialog, frame35, "frame35");
+  GLADE_HOOKUP_OBJECT (prefs_dialog, alignment38, "alignment38");
+  GLADE_HOOKUP_OBJECT (prefs_dialog, vbox35, "vbox35");
+  GLADE_HOOKUP_OBJECT (prefs_dialog, check_project_session, "check_project_session");
+  GLADE_HOOKUP_OBJECT (prefs_dialog, label207, "label207");
   GLADE_HOOKUP_OBJECT (prefs_dialog, frame19, "frame19");
   GLADE_HOOKUP_OBJECT (prefs_dialog, alignment22, "alignment22");
   GLADE_HOOKUP_OBJECT (prefs_dialog, vbox21, "vbox21");


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



More information about the Commits mailing list