GNOME.org
 

[anjuta] sourceview: Move preferences in plugins/sourceview

commit 341e730997489a9ae23865f63b87707d9101f245
Author: SÃbastien Granjoux <seb sfo free fr>
Date:   Sat Dec 17 17:28:26 2011 +0100

    sourceview: Move preferences in plugins/sourceview

 plugins/sourceview/Makefile.am                     |    2 +-
 plugins/sourceview/anjuta-editor-sourceview.ui     |   18 +++++-----
 ...gnome.anjuta.plugins.sourceview.gschema.xml.in} |   34 ++++++++++----------
 plugins/sourceview/plugin.c                        |    8 ++--
 plugins/sourceview/sourceview-io.c                 |    2 +-
 plugins/sourceview/sourceview-prefs.c              |   18 +++++-----
 plugins/sourceview/sourceview-print.c              |   10 +++---
 7 files changed, 46 insertions(+), 46 deletions(-)
---
diff --git a/plugins/sourceview/Makefile.am b/plugins/sourceview/Makefile.am
index 2e34820..51fa089 100644
--- a/plugins/sourceview/Makefile.am
+++ b/plugins/sourceview/Makefile.am
@@ -77,7 +77,7 @@ libanjuta_sourceview_la_LIBADD = \
 	$(SOURCEVIEW_LIBS) \
 	$(LIBANJUTA_LIBS)
 
-gsettings_in_file = org.gnome.anjuta.sourceview.gschema.xml.in
+gsettings_in_file = org.gnome.anjuta.plugins.sourceview.gschema.xml.in
 gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
diff --git a/plugins/sourceview/anjuta-editor-sourceview.ui b/plugins/sourceview/anjuta-editor-sourceview.ui
index a73e8e6..4a86a9c 100644
--- a/plugins/sourceview/anjuta-editor-sourceview.ui
+++ b/plugins/sourceview/anjuta-editor-sourceview.ui
@@ -151,7 +151,7 @@
                             <property name="border_width">5</property>
                             <property name="spacing">5</property>
                             <child>
-                              <object class="GtkCheckButton" id="preferences_toggle:bool:1:0:sourceview-syntax-highlight">
+                              <object class="GtkCheckButton" id="preferences_toggle:bool:1:0:syntax-highlight">
                                 <property name="label" translatable="yes">Highlight syntax</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -167,7 +167,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkCheckButton" id="preferences_toggle:bool:0:0:sourceview-brackets-highlight">
+                              <object class="GtkCheckButton" id="preferences_toggle:bool:0:0:brackets-highlight">
                                 <property name="label" translatable="yes">Highlight matching brackets</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -183,7 +183,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkCheckButton" id="preferences_toggle:bool:1:0:sourceview-backup">
+                              <object class="GtkCheckButton" id="preferences_toggle:bool:1:0:backup">
                                 <property name="label" translatable="yes">Create backup files</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -199,7 +199,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkCheckButton" id="preferences_toggle:bool:0:0:sourceview-autocomplete">
+                              <object class="GtkCheckButton" id="preferences_toggle:bool:0:0:autocomplete">
                                 <property name="label" translatable="yes">Enable autocompletion for document words</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -264,7 +264,7 @@
                             <property name="border_width">5</property>
                             <property name="spacing">5</property>
                             <child>
-                              <object class="GtkCheckButton" id="preferences_toggle:bool:0:0:sourceview-currentline-highlight">
+                              <object class="GtkCheckButton" id="preferences_toggle:bool:0:0:currentline-highlight">
                                 <property name="label" translatable="yes">Highlight current line</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -312,7 +312,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkCheckButton" id="preferences_toggle:bool:1:0:sourceview-rightmargin-visible">
+                              <object class="GtkCheckButton" id="preferences_toggle:bool:1:0:rightmargin-visible">
                                 <property name="label" translatable="yes">Show right margin</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -354,7 +354,7 @@
                                   <placeholder/>
                                 </child>
                                 <child>
-                                  <object class="GtkSpinButton" id="preferences_spin:int:80:0:sourceview-rightmargin-position">
+                                  <object class="GtkSpinButton" id="preferences_spin:int:80:0:rightmargin-position">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="invisible_char">â</property>
@@ -453,7 +453,7 @@
                         <property name="column_spacing">5</property>
                         <property name="row_spacing">5</property>
                         <child>
-                          <object class="GtkFontButton" id="preferences_font:font:Monospace 12:0:sourceview-font">
+                          <object class="GtkFontButton" id="preferences_font:font:Monospace 12:0:font">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -467,7 +467,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkCheckButton" id="preferences_toggle:bool:1:0:sourceview-font-use-theme">
+                          <object class="GtkCheckButton" id="preferences_toggle:bool:1:0:font-use-theme">
                             <property name="label" translatable="yes">Use theme font</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
diff --git a/plugins/sourceview/org.gnome.anjuta.sourceview.gschema.xml.in b/plugins/sourceview/org.gnome.anjuta.plugins.sourceview.gschema.xml.in
similarity index 51%
rename from plugins/sourceview/org.gnome.anjuta.sourceview.gschema.xml.in
rename to plugins/sourceview/org.gnome.anjuta.plugins.sourceview.gschema.xml.in
index 22054a4..d2b7cda 100644
--- a/plugins/sourceview/org.gnome.anjuta.sourceview.gschema.xml.in
+++ b/plugins/sourceview/org.gnome.anjuta.plugins.sourceview.gschema.xml.in
@@ -1,21 +1,21 @@
 <schemalist>
-	<schema id="org.gnome.anjuta.sourceview" path="/org/gnome/anjuta/">
-		<key name="sourceview-style" type="s">
+	<schema id="org.gnome.anjuta.plugins.sourceview" path="/org/gnome/anjuta/plugins/sourceview/">
+		<key name="style" type="s">
 			<default>"tango"</default>
 		</key>
-		<key name="sourceview-print-linewrap" type="b">
+		<key name="print-linewrap" type="b">
 			<default>true</default>
 		</key>
-		<key name="sourceview-print-header" type="b">
+		<key name="print-header" type="b">
 			<default>false</default>
 		</key>
-		<key name="sourceview-print-footer" type="b">
+		<key name="print-footer" type="b">
 			<default>false</default>
 		</key>
-		<key name="sourceview-print-highlight" type="b">
+		<key name="print-highlight" type="b">
 			<default>true</default>
 		</key>
-		<key name="sourceview-print-linenumbers" type="b">
+		<key name="print-linenumbers" type="b">
 			<default>false</default>
 		</key>		<key name="tabsize" type="i">
 			<default>4</default>
@@ -23,19 +23,19 @@
 		<key name="use-tabs" type="b">
 			<default>true</default>
 		</key>
-		<key name="sourceview-syntax-highlight" type="b">
+		<key name="syntax-highlight" type="b">
 			<default>true</default>
 		</key>
-		<key name="sourceview-brackets-highlight" type="b">
+		<key name="brackets-highlight" type="b">
 			<default>false</default>
 		</key>
-		<key name="sourceview-backup" type="b">
+		<key name="backup" type="b">
 			<default>true</default>
 		</key>
-		<key name="sourceview-autocomplete" type="b">
+		<key name="autocomplete" type="b">
 			<default>false</default>
 		</key>
-		<key name="sourceview-currentline-highlight" type="b">
+		<key name="currentline-highlight" type="b">
 			<default>false</default>
 		</key>
 		<key name="margin-linenumber-visible" type="b">
@@ -44,17 +44,17 @@
 		<key name="margin-marker-visible" type="b">
 			<default>true</default>
 		</key>
-		<key name="sourceview-rightmargin-visible" type="b">
+		<key name="rightmargin-visible" type="b">
 			<default>true</default>
 		</key>
-		<key name="sourceview-rightmargin-position" type="i">
+		<key name="rightmargin-position" type="i">
 			<default>80</default>
 		</key>
-		<key name="sourceview-font" type="s">
+		<key name="font" type="s">
 			<default>"Monospace 12"</default>
 		</key>
-		<key name="sourceview-font-use-theme" type="b">
+		<key name="font-use-theme" type="b">
 			<default>true</default>
 		</key>
 	</schema>
-</schemalist>
\ No newline at end of file
+</schemalist>
diff --git a/plugins/sourceview/plugin.c b/plugins/sourceview/plugin.c
index 3095003..f704462 100644
--- a/plugins/sourceview/plugin.c
+++ b/plugins/sourceview/plugin.c
@@ -38,15 +38,15 @@
 #include "sourceview.h"
 #include "sourceview-private.h"
 
-#define PREF_SCHEMA "org.gnome.anjuta.sourceview"
+#define PREF_SCHEMA "org.gnome.anjuta.plugins.sourceview"
 #define PREFS_GLADE PACKAGE_DATA_DIR"/glade/anjuta-editor-sourceview.ui"
 #define ICON_FILE "anjuta-editor-sourceview-plugin-48.png"
 
 #define COMBO_STYLES "combo_styles"
-#define SOURCEVIEW_STYLE "sourceview-style"
+#define SOURCEVIEW_STYLE "style"
 
-#define FONT_USE_THEME_BUTTON "preferences_toggle:bool:1:0:sourceview-font-use-theme"
-#define FONT_BUTTON "preferences_font:font:Monospace 12:0:sourceview-font"
+#define FONT_USE_THEME_BUTTON "preferences_toggle:bool:1:0:font-use-theme"
+#define FONT_BUTTON "preferences_font:font:Monospace 12:0:font"
 
 static gpointer parent_class;
 
diff --git a/plugins/sourceview/sourceview-io.c b/plugins/sourceview/sourceview-io.c
index 1d34517..3c749f1 100644
--- a/plugins/sourceview/sourceview-io.c
+++ b/plugins/sourceview/sourceview-io.c
@@ -288,7 +288,7 @@ sourceview_io_save_as (SourceviewIO* sio, GFile* file)
 	cancel_monitor (sio);
 
 	backup = g_settings_get_boolean (sio->sv->priv->settings,
-	                                 "sourceview-backup");
+	                                 "backup");
 
 	if (sio->last_encoding == NULL)
 	{
diff --git a/plugins/sourceview/sourceview-prefs.c b/plugins/sourceview/sourceview-prefs.c
index ae3aa68..29d09f4 100644
--- a/plugins/sourceview/sourceview-prefs.c
+++ b/plugins/sourceview/sourceview-prefs.c
@@ -25,25 +25,25 @@
 #define REGISTER_NOTIFY(settings, key, func) \
 	g_signal_connect (settings, "changed::" key, G_CALLBACK(func), sv);
 
-#define PREF_SCHEMA "org.gnome.anjuta.sourceview"
+#define PREF_SCHEMA "org.gnome.anjuta.plugins.sourceview"
 #define DOCMAN_PREF_SCHEMA "org.gnome.anjuta.document-manager"
 #define MSGMAN_PREF_SCHEMA "org.gnome.anjuta.message-manager"
 
 
 /* Editor preferences */
-#define HIGHLIGHT_SYNTAX           "sourceview-syntax-highlight"
-#define HIGHLIGHT_CURRENT_LINE	   "sourceview-currentline-highlight"
+#define HIGHLIGHT_SYNTAX           "syntax-highlight"
+#define HIGHLIGHT_CURRENT_LINE	   "currentline-highlight"
 #define USE_TABS                   "use-tabs"
-#define HIGHLIGHT_BRACKETS         "sourceview-brackets-highlight"
+#define HIGHLIGHT_BRACKETS         "brackets-highlight"
 #define TAB_SIZE                   "tabsize"
 #define INDENT_SIZE                "indent-size"
-#define AUTOCOMPLETION             "sourceview-autocomplete"
+#define AUTOCOMPLETION             "autocomplete"
 
 #define VIEW_MARKS                 "margin-marker-visible"
 
 #define VIEW_LINENUMBERS           "margin-linenumber-visible"
-#define VIEW_RIGHTMARGIN           "sourceview-rightmargin-visible"
-#define RIGHTMARGIN_POSITION       "sourceview-rightmargin-position"
+#define VIEW_RIGHTMARGIN           "rightmargin-visible"
+#define RIGHTMARGIN_POSITION       "rightmargin-position"
 
 #define DOCMAN_VIEW_WHITE_SPACES          "docman-whitespace"
 #define DOCMAN_VIEW_EOL                   "docman-eol"
@@ -53,8 +53,8 @@
 #define MSGMAN_COLOR_WARNING		  "msgman-color.warning"
 
 
-#define FONT_THEME "sourceview-font-use-theme"
-#define FONT "sourceview-font"
+#define FONT_THEME "font-use-theme"
+#define FONT "font"
 #define DESKTOP_FIXED_FONT "/desktop/gnome/interface/monospace_font_name"
 
 
diff --git a/plugins/sourceview/sourceview-print.c b/plugins/sourceview/sourceview-print.c
index e006cd0..18d3df2 100644
--- a/plugins/sourceview/sourceview-print.c
+++ b/plugins/sourceview/sourceview-print.c
@@ -19,11 +19,11 @@
 #include <gtksourceview/gtksourceprintcompositor.h>
 #include <libanjuta/interfaces/ianjuta-document.h>
 
-#define PRINT_LINEWRAP "sourceview-print-linewrap"
-#define PRINT_HEADER "sourceview-print-header"
-#define PRINT_FOOTER "sourceview-print-footer"
-#define PRINT_HIGHLIGHT "sourceview-print-highlight"
-#define PRINT_LINENUMBERS "sourceview-print-linenumbers"
+#define PRINT_LINEWRAP "print-linewrap"
+#define PRINT_HEADER "print-header"
+#define PRINT_FOOTER "print-footer"
+#define PRINT_HIGHLIGHT "print-highlight"
+#define PRINT_LINENUMBERS "print-linenumbers"
 
 typedef struct _SourceviewPrinting SourceviewPrinting;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]