SF.net SVN: geany:[5122] trunk

ntrel at users.sourceforge.net ntrel at xxxxx
Tue Aug 10 12:49:16 UTC 2010


Revision: 5122
          http://geany.svn.sourceforge.net/geany/?rev=5122&view=rev
Author:   ntrel
Date:     2010-08-10 12:49:16 +0000 (Tue, 10 Aug 2010)

Log Message:
-----------
Move some interface hidden prefs to ui_utils.c.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/doc/geany.html
    trunk/doc/geany.txt
    trunk/src/keyfile.c
    trunk/src/ui_utils.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-08-10 12:46:30 UTC (rev 5121)
+++ trunk/ChangeLog	2010-08-10 12:49:16 UTC (rev 5122)
@@ -9,6 +9,8 @@
  * src/stash.c:
    Fix writing the default value when a key is missing for hidden
    prefs, even if it was overridden when it was originally read.
+ * src/keyfile.c, src/ui_utils.c, doc/geany.txt, doc/geany.html:
+   Move some interface hidden prefs to ui_utils.c.
 
 
 2010-08-05  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/doc/geany.html
===================================================================
--- trunk/doc/geany.html	2010-08-10 12:46:30 UTC (rev 5121)
+++ trunk/doc/geany.html	2010-08-10 12:49:16 UTC (rev 5122)
@@ -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="2010-07-08" />
+<meta name="date" content="2010-07-09" />
 <style type="text/css">
 
 /*
@@ -139,7 +139,7 @@
 <br />Nick Treleaven
 <br />Frank Lanitz</td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2010-07-08</td></tr>
+<td>2010-07-09</td></tr>
 <tr><th class="docinfo-name">Version:</th>
 <td>0.20</td></tr>
 </tbody>
@@ -4693,6 +4693,12 @@
 <tt class="docutils literal"><span class="pre">Space</span></tt>.</td>
 <td>false</td>
 </tr>
+<tr><td>show_editor_scrollbars</td>
+<td>Whether to display scrollbars. If set to
+false, the horizontal and vertical
+scrollbars are hidden completely.</td>
+<td>true</td>
+</tr>
 <tr><td><strong>Interface related</strong></td>
 <td> </td>
 <td> </td>
@@ -4713,12 +4719,6 @@
 and files can be saved.</td>
 <td>false</td>
 </tr>
-<tr><td>show_editor_scrollbars</td>
-<td>Whether to display scrollbars. If set to
-false, the horizontal and vertical
-scrollbars are hidden completely.</td>
-<td>true</td>
-</tr>
 <tr><td>compiler_tab_autoscroll</td>
 <td>Whether to automatically scroll to the
 last line of the output in the Compiler
@@ -6143,7 +6143,7 @@
 <div class="footer">
 <hr class="footer" />
 <a class="reference" href="geany.txt">View document source</a>.
-Generated on: 2010-07-09 12:18 UTC.
+Generated on: 2010-07-09 15:38 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	2010-08-10 12:46:30 UTC (rev 5121)
+++ trunk/doc/geany.txt	2010-08-10 12:49:16 UTC (rev 5122)
@@ -4049,6 +4049,9 @@
                                   position on the line). Only used when the
                                   keybinding ``Complete snippet`` is set to
                                   ``Space``.
+show_editor_scrollbars            Whether to display scrollbars. If set to     true
+                                  false, the horizontal and vertical
+                                  scrollbars are hidden completely.
 **Interface related**
 show_symbol_list_expanders        Whether to show or hide the small expander   true
                                   icons on the symbol list treeview (only
@@ -4060,9 +4063,6 @@
                                   setting this option to true, the Save
                                   buttons and menu items are always active
                                   and files can be saved.
-show_editor_scrollbars            Whether to display scrollbars. If set to     true
-                                  false, the horizontal and vertical
-                                  scrollbars are hidden completely.
 compiler_tab_autoscroll           Whether to automatically scroll to the       true
                                   last line of the output in the Compiler
                                   tab.

Modified: trunk/src/keyfile.c
===================================================================
--- trunk/src/keyfile.c	2010-08-10 12:46:30 UTC (rev 5121)
+++ trunk/src/keyfile.c	2010-08-10 12:49:16 UTC (rev 5122)
@@ -187,12 +187,6 @@
 		"use_gtk_word_boundaries", TRUE);
 	stash_group_add_boolean(group, &editor_prefs.complete_snippets_whilst_editing,
 		"complete_snippets_whilst_editing", FALSE);
-	stash_group_add_boolean(group, &interface_prefs.show_symbol_list_expanders,
-		"show_symbol_list_expanders", TRUE);
-	stash_group_add_boolean(group, &interface_prefs.compiler_tab_autoscroll,
-		"compiler_tab_autoscroll", TRUE);
-	stash_group_add_boolean(group, &ui_prefs.allow_always_save,
-		"allow_always_save", FALSE);
 	stash_group_add_boolean(group, &file_prefs.use_safe_file_saving,
 		"use_safe_file_saving", FALSE);
 	/* for backwards-compatibility */

Modified: trunk/src/ui_utils.c
===================================================================
--- trunk/src/ui_utils.c	2010-08-10 12:46:30 UTC (rev 5121)
+++ trunk/src/ui_utils.c	2010-08-10 12:49:16 UTC (rev 5122)
@@ -2003,10 +2003,18 @@
 {
 	StashGroup *group = stash_group_new(PACKAGE);
 
+	/* hidden prefs (don't overwrite them so users can edit them manually) */
 	configuration_add_pref_group(group, FALSE);
 	stash_group_set_write_once(group, TRUE);
 
-	stash_group_add_string(group, &statusbar_template, "statusbar_template", "");
+	stash_group_add_boolean(group, &interface_prefs.show_symbol_list_expanders,
+		"show_symbol_list_expanders", TRUE);
+	stash_group_add_boolean(group, &interface_prefs.compiler_tab_autoscroll,
+		"compiler_tab_autoscroll", TRUE);
+	stash_group_add_boolean(group, &ui_prefs.allow_always_save,
+		"allow_always_save", FALSE);
+	stash_group_add_string(group, &statusbar_template,
+		"statusbar_template", "");
 }
 
 


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