SF.net SVN: geany:[4378] trunk - Commits

27 Oct 2009

Revision: 4378
          http://geany.svn.sourceforge.net/geany/?rev=4378&view=rev
Author:   ntrel
Date:     2009-10-27 14:59:46 +0000 (Tue, 27 Oct 2009)
Log Message:
-----------
Enable switching the sidebar to the right on Windows again, as it
apparently works after all.
Modified Paths:
--------------
    trunk/ChangeLog
    trunk/doc/geany.html
    trunk/doc/geany.txt
    trunk/src/prefs.c
    trunk/src/ui_utils.c
Modified: trunk/ChangeLog
===================================================================

--- trunk/ChangeLog	2009-10-27 13:40:34 UTC (rev 4377)
+++ trunk/ChangeLog	2009-10-27 14:59:46 UTC (rev 4378)
@@ -7,6 +7,9 @@
    Add some useful commands to editor popup menu under "Commands"
    submenu (thanks to Lex).
    Move 'Duplicate line or selection' from Format -> Commands submenu.
+ * src/prefs.c, src/ui_utils.c, doc/geany.txt, doc/geany.html:
+   Enable switching the sidebar to the right on Windows again, as it
+   apparently works after all.
2009-10-26  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/doc/geany.html
===================================================================
--- trunk/doc/geany.html	2009-10-27 13:40:34 UTC (rev 4377)
+++ trunk/doc/geany.html	2009-10-27 14:59:46 UTC (rev 4378)
@@ -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="2009-10-23" />
+<meta name="date" content="2009-10-22" />
 <style type="text/css">
/*
@@ -139,7 +139,7 @@
 <br />Nick Treleaven
 <br />Frank Lanitz</td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2009-10-23</td></tr>
+<td>2009-10-22</td></tr>
 <tr><th class="docinfo-name">Version:</th>
 <td>0.19</td></tr>
 </tbody>
@@ -2014,12 +2014,7 @@
 change between documents (see <a class="reference" href="#switching-between-documents">Switching between documents</a>) and
 to perform some common operations such as saving, closing and reloading.</dd>
 <dt>Position</dt>
-<dd><p class="first">Whether to place the sidebar on the left or right of the editor window.</p>
-<div class="last note">
-<p class="first admonition-title">Note</p>
-<p class="last">This option is not available on Windows.</p>
-</div>
-</dd>
+<dd>Whether to place the sidebar on the left or right of the editor window.</dd>
 </dl>
 </div>
 <div class="section">
@@ -5809,7 +5804,7 @@
 <div class="footer">
 <hr class="footer" />
 <a class="reference" href="geany.txt">View document source</a>.
-Generated on: 2009-10-26 15:39 UTC.
+Generated on: 2009-10-23 16:09 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	2009-10-27 13:40:34 UTC (rev 4377)
+++ trunk/doc/geany.txt	2009-10-27 14:59:46 UTC (rev 4378)
@@ -1693,9 +1693,6 @@
 Position
     Whether to place the sidebar on the left or right of the editor window.
-    .. note::
-        This option is not available on Windows.
-
 Fonts
 `````
Modified: trunk/src/prefs.c
===================================================================
--- trunk/src/prefs.c	2009-10-27 13:40:34 UTC (rev 4377)
+++ trunk/src/prefs.c	2009-10-27 14:59:46 UTC (rev 4378)
@@ -1636,9 +1636,6 @@
    			"toggled", G_CALLBACK(on_open_encoding_toggled), NULL);
    }
-#ifdef G_OS_WIN32
-	gtk_widget_set_sensitive(ui_lookup_widget(ui_widgets.prefs_dialog, "radio_sidebar_right"), FALSE);
-#endif
    prefs_init_dialog();
    gtk_window_present(GTK_WINDOW(ui_widgets.prefs_dialog));
 }
Modified: trunk/src/ui_utils.c
===================================================================
--- trunk/src/ui_utils.c	2009-10-27 13:40:34 UTC (rev 4377)
+++ trunk/src/ui_utils.c	2009-10-27 14:59:46 UTC (rev 4378)
@@ -1820,8 +1820,6 @@
void ui_swap_sidebar_pos(void)
 {
-/* reparenting scintilla will probably fail on Windows */
-#ifndef G_OS_WIN32
    GtkWidget *pane = ui_lookup_widget(main_widgets.window, "hpaned1");
    GtkWidget *left = gtk_paned_get_child1(GTK_PANED(pane));
    GtkWidget *right = gtk_paned_get_child2(GTK_PANED(pane));
@@ -1835,7 +1833,6 @@
gtk_paned_set_position(GTK_PANED(pane), pane->allocation.width
    	- gtk_paned_get_position(GTK_PANED(pane)));
-#endif
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

    