GNOME.org
 

[anjuta] language-support-python: Move preferences in plugins/python

commit 54c88839910183cee40fda6c1c304055962c1a13
Author: SÃbastien Granjoux <seb sfo free fr>
Date:   Sun Apr 22 18:20:27 2012 +0200

    language-support-python: Move preferences in plugins/python

 plugins/language-support-python/Makefile.am        |    2 +-
 .../org.gnome.anjuta.plugins.python.gschema.xml.in |   31 ++++++++++++++++++++
 .../org.gnome.anjuta.python.gschema.xml.in         |   31 --------------------
 plugins/language-support-python/plugin.c           |    6 ++--
 plugins/language-support-python/python-assist.c    |   10 +++---
 .../language-support-python/python-indentation.c   |    8 ++--
 .../python-plugin-properties.ui                    |   16 +++++-----
 po/POTFILES.in                                     |    2 +-
 8 files changed, 53 insertions(+), 53 deletions(-)
---
diff --git a/plugins/language-support-python/Makefile.am b/plugins/language-support-python/Makefile.am
index 4887813..8789043 100644
--- a/plugins/language-support-python/Makefile.am
+++ b/plugins/language-support-python/Makefile.am
@@ -42,7 +42,7 @@ libpython_plugin_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 libpython_plugin_la_LIBADD = \
 	$(LIBANJUTA_LIBS) 
 
-gsettings_in_file = org.gnome.anjuta.python.gschema.xml.in
+gsettings_in_file = org.gnome.anjuta.plugins.python.gschema.xml.in
 gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
diff --git a/plugins/language-support-python/org.gnome.anjuta.plugins.python.gschema.xml.in b/plugins/language-support-python/org.gnome.anjuta.plugins.python.gschema.xml.in
new file mode 100644
index 0000000..1f1fc23
--- /dev/null
+++ b/plugins/language-support-python/org.gnome.anjuta.plugins.python.gschema.xml.in
@@ -0,0 +1,31 @@
+<schemalist>
+	<schema id="org.gnome.anjuta.plugins.python" path="/org/gnome/anjuta/plugins/python/">
+		<key name="no-rope-warning" type="b">
+			<default>false</default>
+		</key>
+		<key name="indent-automatic" type="b">
+			<default>true</default>
+		</key>
+		<key name="indent-adaptive" type="b">
+			<default>true</default>
+		</key>
+		<key name="indent-brace-size" type="i">
+			<default>0</default>
+		</key>
+		<key name="completion-enable" type="b">
+			<default>true</default>
+		</key>
+		<key name="completion-func-space" type="b">
+			<default>true</default>
+		</key>
+		<key name="completion-func-brace" type="b">
+			<default>true</default>
+		</key>
+		<key name="calltip-enable" type="b">
+			<default>true</default>
+		</key>
+		<key name="interpreter-path" type="s">
+			<default>"/usr/bin/python"</default>
+		</key>
+	</schema>
+</schemalist>
diff --git a/plugins/language-support-python/plugin.c b/plugins/language-support-python/plugin.c
index c0d6cbd..f70770b 100644
--- a/plugins/language-support-python/plugin.c
+++ b/plugins/language-support-python/plugin.c
@@ -66,11 +66,11 @@
 /* Preferences keys */
 
 #define ANJUTA_PREF_SCHEMA_PREFIX "org.gnome.anjuta."
-#define PREF_SCHEMA "org.gnome.anjuta.python"
+#define PREF_SCHEMA "org.gnome.anjuta.plugins.python"
 
 
-#define PREF_NO_ROPE_WARNING "python-no-rope-warning"
-#define PREF_INTERPRETER_PATH "python-interpreter-path"
+#define PREF_NO_ROPE_WARNING "no-rope-warning"
+#define PREF_INTERPRETER_PATH "interpreter-path"
 
 static gpointer parent_class;
 
diff --git a/plugins/language-support-python/python-assist.c b/plugins/language-support-python/python-assist.c
index aeb07da..f2031e9 100644
--- a/plugins/language-support-python/python-assist.c
+++ b/plugins/language-support-python/python-assist.c
@@ -42,11 +42,11 @@
 #include "python-assist.h"
 #include "python-utils.h"
 
-#define PREF_AUTOCOMPLETE_ENABLE "python-completion-enable"
-#define PREF_AUTOCOMPLETE_SPACE_AFTER_FUNC "python-completion-func-space"
-#define PREF_AUTOCOMPLETE_BRACE_AFTER_FUNC "python-completion-func-brace"
-#define PREF_CALLTIP_ENABLE "python-calltip-enable"
-#define PREF_INTERPRETER_PATH "python-interpreter-path"
+#define PREF_AUTOCOMPLETE_ENABLE "completion-enable"
+#define PREF_AUTOCOMPLETE_SPACE_AFTER_FUNC "completion-func-space"
+#define PREF_AUTOCOMPLETE_BRACE_AFTER_FUNC "completion-func-brace"
+#define PREF_CALLTIP_ENABLE "calltip-enable"
+#define PREF_INTERPRETER_PATH "interpreter-path"
 #define MAX_COMPLETIONS 30
 #define BRACE_SEARCH_LIMIT 500
 #define SCOPE_BRACE_JUMP_LIMIT 50
diff --git a/plugins/language-support-python/python-indentation.c b/plugins/language-support-python/python-indentation.c
index bee9c61..3924278 100644
--- a/plugins/language-support-python/python-indentation.c
+++ b/plugins/language-support-python/python-indentation.c
@@ -39,10 +39,10 @@
 
 #include "python-indentation.h"
 
-#define PREF_INDENT_AUTOMATIC "python-indent-automatic"
-#define PREF_INDENT_ADAPTIVE "python-indent-adaptive"
-#define PREF_INDENT_TAB_INDENTS "python-indent-tab-indents"
-#define PREF_INDENT_BRACE_SIZE "python-indent-brace-size"
+#define PREF_INDENT_AUTOMATIC "indent-automatic"
+#define PREF_INDENT_ADAPTIVE "indent-adaptive"
+#define PREF_INDENT_TAB_INDENTS "indent-tab-indents"
+#define PREF_INDENT_BRACE_SIZE "indent-brace-size"
 
 #define TAB_SIZE (ianjuta_editor_get_tabsize (editor, NULL))
 
diff --git a/plugins/language-support-python/python-plugin-properties.ui b/plugins/language-support-python/python-plugin-properties.ui
index 156be63..7aa2583 100755
--- a/plugins/language-support-python/python-plugin-properties.ui
+++ b/plugins/language-support-python/python-plugin-properties.ui
@@ -36,7 +36,7 @@
                     <property name="can_focus">False</property>
                     <property name="spacing">5</property>
                     <child>
-                      <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:python-indent-automatic">
+                      <object class="GtkCheckButton" id="preferences:indent-automatic">
                         <property name="label" translatable="yes">Enable smart indentation</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -54,7 +54,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:python-indent-adaptive">
+                      <object class="GtkCheckButton" id="preferences:indent-adaptive">
                         <property name="label" translatable="yes">Enable adaptive indentation</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -98,7 +98,7 @@
                             <property name="column_spacing">5</property>
                             <property name="row_spacing">5</property>
                             <child>
-                              <object class="GtkSpinButton" id="preferences_spin:int:0:1:python-indent-brace-size">
+                              <object class="GtkSpinButton" id="preferences:indent-brace-size">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="adjustment">adjustment2</property>
@@ -216,7 +216,7 @@
                     <property name="can_focus">False</property>
                     <property name="spacing">5</property>
                     <child>
-                      <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:python-completion-enable">
+                      <object class="GtkCheckButton" id="preferences:completion-enable">
                         <property name="label" translatable="yes">Enable code completion</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -234,7 +234,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:python-completion-func-space">
+                      <object class="GtkCheckButton" id="preferences:completion-func-space">
                         <property name="label" translatable="yes">Add a space after function call autocompletion</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -252,7 +252,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:python-completion-func-brace">
+                      <object class="GtkCheckButton" id="preferences:completion-func-brace">
                         <property name="label" translatable="yes">Add '(' after function call autocompletion</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -307,7 +307,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
-                          <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:python-calltip-enable">
+                          <object class="GtkCheckButton" id="preferences:calltip-enable">
                             <property name="label" translatable="yes">Show calltips</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -396,7 +396,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkEntry" id="preferences_entry:text:/usr/bin/python:1:python-interpreter-path">
+                          <object class="GtkEntry" id="preferences:interpreter-path">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="invisible_char">â</property>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a0ac8ef..bc54fe4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -169,7 +169,7 @@ plugins/language-support-js/js-parser-y-tab.c
 [type: gettext/ini]plugins/language-support-js/js-support-plugin.plugin.in
 plugins/language-support-js/org.gnome.anjuta.js.gschema.xml.in
 plugins/language-support-js/plugin.c
-plugins/language-support-python/org.gnome.anjuta.python.gschema.xml.in
+plugins/language-support-python/org.gnome.anjuta.plugins.python.gschema.xml.in
 plugins/language-support-python/plugin.c
 plugins/language-support-python/python-assist.c
 [type: gettext/glade]plugins/language-support-python/python-plugin-properties.ui
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]