GNOME.org
 

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

commit b6bf99d3587b4bec711f7f2a70e94b8aa7b72012
Author: SÃbastien Granjoux <seb sfo free fr>
Date:   Sun Apr 22 18:44:44 2012 +0200

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

 plugins/language-support-cpp-java/Makefile.am      |    2 +-
 .../anjuta-language-cpp-java.ui                    |   34 ++++++------
 .../language-support-cpp-java/cpp-java-assist.c    |   10 ++--
 .../cpp-java-indentation.c                         |   10 ++--
 plugins/language-support-cpp-java/cpp-packages.c   |    6 +-
 .../org.gnome.anjuta.cpp.gschema.xml.in            |   55 --------------------
 .../org.gnome.anjuta.plugins.cpp.gschema.xml.in    |   55 ++++++++++++++++++++
 plugins/language-support-cpp-java/plugin.c         |   24 ++++----
 po/POTFILES.in                                     |    2 +-
 9 files changed, 99 insertions(+), 99 deletions(-)
---
diff --git a/plugins/language-support-cpp-java/Makefile.am b/plugins/language-support-cpp-java/Makefile.am
index d8a7133..05837bd 100644
--- a/plugins/language-support-cpp-java/Makefile.am
+++ b/plugins/language-support-cpp-java/Makefile.am
@@ -67,7 +67,7 @@ libanjuta_language_cpp_java_la_LIBADD = \
 	$(LIBANJUTA_LIBS) \
 	cxxparser/libcxxparser.la
 	
-gsettings_in_file = org.gnome.anjuta.cpp.gschema.xml.in
+gsettings_in_file = org.gnome.anjuta.plugins.cpp.gschema.xml.in
 gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
diff --git a/plugins/language-support-cpp-java/anjuta-language-cpp-java.ui b/plugins/language-support-cpp-java/anjuta-language-cpp-java.ui
index 9fa1733..fbb44a6 100644
--- a/plugins/language-support-cpp-java/anjuta-language-cpp-java.ui
+++ b/plugins/language-support-cpp-java/anjuta-language-cpp-java.ui
@@ -53,7 +53,7 @@
                     <property name="column_spacing">5</property>
                     <property name="row_spacing">5</property>
                     <child>
-                      <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:cpp-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>
@@ -69,7 +69,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:cpp-multiline-leading-asterisk">
+                      <object class="GtkCheckButton" id="preferences:multiline-leading-asterisk">
                         <property name="label" translatable="yes">Leading asterisk in multi-line comment</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -87,7 +87,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:cpp-indent-modeline">
+                      <object class="GtkCheckButton" id="preferences:indent-modeline">
                         <property name="label" translatable="yes">Prefer vim/emacs modelines over indentation settings</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -135,7 +135,7 @@
                                 <property name="column_spacing">5</property>
                                 <property name="row_spacing">5</property>
                                 <child>
-                                  <object class="GtkSpinButton" id="preferences_spin:int:0:1:cpp-indent-brace-size">
+                                  <object class="GtkSpinButton" id="preferences:indent-brace-size">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="invisible_char">â</property>
@@ -243,7 +243,7 @@
                             <property name="column_spacing">5</property>
                             <property name="row_spacing">5</property>
                             <child>
-                              <object class="GtkRadioButton" id="preferences_toggle:bool:1:0:cpp-indent-paranthese-lineup">
+                              <object class="GtkRadioButton" id="preferences:indent-paranthese-lineup">
                                 <property name="label" translatable="yes">Line up parentheses</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -251,7 +251,7 @@
                                 <property name="use_action_appearance">False</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
-                                <property name="group">preferences_toggle:bool:0:0:cpp-indent-paranthese-indent</property>
+                                <property name="group">preferences:indent-paranthese-indent</property>
                               </object>
                               <packing>
                                 <property name="x_options">GTK_FILL</property>
@@ -259,7 +259,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkRadioButton" id="preferences_toggle:bool:0:0:cpp-indent-paranthese-indent">
+                              <object class="GtkRadioButton" id="preferences:indent-paranthese-indent">
                                 <property name="label" translatable="yes">Indent:</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -276,7 +276,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkSpinButton" id="preferences_spin:int:4:1:cpp-indent-paranthese-size">
+                              <object class="GtkSpinButton" id="preferences:indent-paranthese-size">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="invisible_char">â</property>
@@ -359,7 +359,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:cpp-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>
@@ -391,7 +391,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:cpp-completion-space-after-func">
+                                  <object class="GtkCheckButton" id="preferences:completion-space-after-func">
                                     <property name="label" translatable="yes">Add a space after function call autocompletion</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -408,7 +408,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:cpp-completion-brace-after-func">
+                                  <object class="GtkCheckButton" id="preferences:completion-brace-after-func">
                                     <property name="label" translatable="yes">Add '(' after function call autocompletion</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -425,7 +425,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:cpp-completion-closebrace-after-func">
+                                  <object class="GtkCheckButton" id="preferences:completion-closebrace-after-func">
                                     <property name="label" translatable="yes">Add ')' after function call autocompletion</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -456,7 +456,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="preferences_toggle:bool:0:1:cpp-brace-autocompletion">
+                      <object class="GtkCheckButton" id="preferences:brace-autocompletion">
                         <property name="label" translatable="yes">Enable smart brace completion</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -513,7 +513,7 @@
                         <property name="can_focus">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <child>
-                          <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:cpp-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>
@@ -574,7 +574,7 @@
             <property name="can_focus">False</property>
             <property name="spacing">5</property>
             <child>
-              <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:cpp-load-project-packages">
+              <object class="GtkCheckButton" id="preferences:load-project-packages">
                 <property name="label" translatable="yes">Automatically load required libraries of the project</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -590,7 +590,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:cpp-load-libc">
+              <object class="GtkCheckButton" id="preferences:load-libc">
                 <property name="label" translatable="yes">Load API tags for C standard library</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -606,7 +606,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:cpp-load-stdcpp">
+              <object class="GtkCheckButton" id="preferences:load-stdcpp">
                 <property name="label" translatable="yes">Load API tags for C++ standard template library</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
diff --git a/plugins/language-support-cpp-java/cpp-java-assist.c b/plugins/language-support-cpp-java/cpp-java-assist.c
index 4e72329..c548147 100644
--- a/plugins/language-support-cpp-java/cpp-java-assist.c
+++ b/plugins/language-support-cpp-java/cpp-java-assist.c
@@ -39,11 +39,11 @@
 #include "cpp-java-assist.h"
 #include "cpp-java-utils.h"
 
-#define PREF_AUTOCOMPLETE_ENABLE "cpp-completion-enable"
-#define PREF_AUTOCOMPLETE_SPACE_AFTER_FUNC "cpp-completion-space-after-func"
-#define PREF_AUTOCOMPLETE_BRACE_AFTER_FUNC "cpp-completion-brace-after-func"
-#define PREF_AUTOCOMPLETE_CLOSEBRACE_AFTER_FUNC "cpp-completion-closebrace-after-func"
-#define PREF_CALLTIP_ENABLE "cpp-calltip-enable"
+#define PREF_AUTOCOMPLETE_ENABLE "completion-enable"
+#define PREF_AUTOCOMPLETE_SPACE_AFTER_FUNC "completion-space-after-func"
+#define PREF_AUTOCOMPLETE_BRACE_AFTER_FUNC "completion-brace-after-func"
+#define PREF_AUTOCOMPLETE_CLOSEBRACE_AFTER_FUNC "completion-closebrace-after-func"
+#define PREF_CALLTIP_ENABLE "calltip-enable"
 #define BRACE_SEARCH_LIMIT 500
 
 static void cpp_java_assist_iface_init(IAnjutaProviderIface* iface);
diff --git a/plugins/language-support-cpp-java/cpp-java-indentation.c b/plugins/language-support-cpp-java/cpp-java-indentation.c
index ca0cfa2..6a45c47 100644
--- a/plugins/language-support-cpp-java/cpp-java-indentation.c
+++ b/plugins/language-support-cpp-java/cpp-java-indentation.c
@@ -34,11 +34,11 @@
 #include "cpp-java-indentation.h"
 #include "cpp-java-utils.h"
 
-#define PREF_INDENT_BRACE_SIZE "cpp-indent-brace-size"
-#define PREF_INDENT_PARANTHESE_LINEUP "cpp-indent-paranthese-lineup"
-#define PREF_INDENT_PARANTHESE_SIZE "cpp-indent-paranthese-size"
-#define PREF_BRACE_AUTOCOMPLETION "cpp-brace-autocompletion"
-#define PREF_COMMENT_LEADING_ASTERISK "cpp-multiline-leading-asterisk"
+#define PREF_INDENT_BRACE_SIZE "indent-brace-size"
+#define PREF_INDENT_PARANTHESE_LINEUP "indent-paranthese-lineup"
+#define PREF_INDENT_PARANTHESE_SIZE "indent-paranthese-size"
+#define PREF_BRACE_AUTOCOMPLETION "brace-autocompletion"
+#define PREF_COMMENT_LEADING_ASTERISK "multiline-leading-asterisk"
 
 #define TAB_SIZE (ianjuta_editor_get_tabsize (editor, NULL))
 #define USE_SPACES_FOR_INDENTATION (ianjuta_editor_get_use_spaces (editor, NULL))
diff --git a/plugins/language-support-cpp-java/cpp-packages.c b/plugins/language-support-cpp-java/cpp-packages.c
index c596e1e..3c4cb69 100644
--- a/plugins/language-support-cpp-java/cpp-packages.c
+++ b/plugins/language-support-cpp-java/cpp-packages.c
@@ -27,9 +27,9 @@
 #include <libanjuta/anjuta-debug.h>
 #include <libanjuta/anjuta-preferences.h>
 
-#define PREF_PROJECT_PACKAGES "cpp-load-project-packages"
-#define PREF_USER_PACKAGES "cpp-user-packages"
-#define PREF_LIBC "cpp-load-libc"
+#define PREF_PROJECT_PACKAGES "load-project-packages"
+#define PREF_USER_PACKAGES "user-packages"
+#define PREF_LIBC "load-libc"
 
 #define PROJECT_LOADED "__cpp_packages_loaded"
 #define USER_LOADED "__cpp_user_packages_loaded"
diff --git a/plugins/language-support-cpp-java/org.gnome.anjuta.plugins.cpp.gschema.xml.in b/plugins/language-support-cpp-java/org.gnome.anjuta.plugins.cpp.gschema.xml.in
new file mode 100644
index 0000000..1bed0f8
--- /dev/null
+++ b/plugins/language-support-cpp-java/org.gnome.anjuta.plugins.cpp.gschema.xml.in
@@ -0,0 +1,55 @@
+<schemalist>
+	<schema id="org.gnome.anjuta.plugins.cpp" path="/org/gnome/anjuta/plugins/cpp/">
+		<key name="user-packages" type="s">
+			<default>""</default>
+		</key>
+		<key name="indent-automatic" type="b">
+			<default>true</default>
+		</key>
+		<key name="multiline-leading-asterisk" type="b">
+			<default>true</default>
+		</key>
+		<key name="indent-modeline" type="b">
+			<default>true</default>
+		</key>
+		<key name="indent-brace-size" type="i">
+			<default>0</default>
+		</key>
+		<key name="indent-paranthese-lineup" type="b">
+			<default>true</default>
+		</key>
+		<key name="indent-paranthese-indent" type="b">
+			<default>false</default>
+		</key>
+		<key name="indent-paranthese-size" type="i">
+			<default>4</default>
+		</key>
+		<key name="completion-enable" type="b">
+			<default>true</default>
+		</key>
+		<key name="completion-space-after-func" type="b">
+			<default>true</default>
+		</key>
+		<key name="completion-brace-after-func" type="b">
+			<default>true</default>
+		</key>
+		<key name="completion-closebrace-after-func" type="b">
+			<default>true</default>
+		</key>
+		<key name="brace-autocompletion" type="b">
+			<default>false</default>
+		</key>
+		<key name="calltip-enable" type="b">
+			<default>true</default>
+		</key>
+		<key name="load-project-packages" type="b">
+			<default>true</default>
+		</key>
+		<key name="load-libc" type="b">
+			<default>true</default>
+		</key>
+		<key name="load-stdcpp" type="b">
+			<default>true</default>
+		</key>
+	</schema>
+</schemalist>
diff --git a/plugins/language-support-cpp-java/plugin.c b/plugins/language-support-cpp-java/plugin.c
index 7b0821e..14f4701 100644
--- a/plugins/language-support-cpp-java/plugin.c
+++ b/plugins/language-support-cpp-java/plugin.c
@@ -64,11 +64,11 @@
 /* Preferences keys */
 
 #define ANJUTA_PREF_SCHEMA_PREFIX "org.gnome.anjuta."
-#define PREF_SCHEMA "org.gnome.anjuta.cpp"
-#define PREF_INDENT_AUTOMATIC "cpp-indent-automatic"
-#define PREF_INDENT_MODELINE "cpp-indent-modeline"
-#define PREF_USER_PACKAGES "cpp-user-packages"
-#define PREF_PROJECT_PACKAGES "cpp-load-project-packages"
+#define PREF_SCHEMA "org.gnome.anjuta.plugins.cpp"
+#define PREF_INDENT_AUTOMATIC "indent-automatic"
+#define PREF_INDENT_MODELINE "indent-modeline"
+#define PREF_USER_PACKAGES "user-packages"
+#define PREF_PROJECT_PACKAGES "load-project-packages"
 
 /* Callback generator defines */
 #define C_SEPARATOR "\n"
@@ -870,7 +870,7 @@ glade_widget_member_of_scope (gchar *widget_name, IAnjutaIterable *members)
 {
        do {
               IAnjutaSymbol *symbol = IANJUTA_SYMBOL (members);
-              gchar *member_name = ianjuta_symbol_get_string (symbol, IANJUTA_SYMBOL_FIELD_NAME, NULL);
+              const gchar *member_name = ianjuta_symbol_get_string (symbol, IANJUTA_SYMBOL_FIELD_NAME, NULL);
               /* Checks if member already exists... */
               if (g_strcmp0 (member_name, widget_name) == 0) {
                      return TRUE;
@@ -930,7 +930,7 @@ glade_widget_already_in_scope (IAnjutaEditor* editor, gchar* widget_name,
 
               if (members)
               {
-                     ret = glade_widget_member_of_scope (widget_name, IANJUTA_SYMBOL (members));
+                     ret = glade_widget_member_of_scope (widget_name, members);
                      g_object_unref(members);
               }
        }
@@ -1557,11 +1557,11 @@ cpp_java_plugin_class_init (GObjectClass *klass)
 	klass->dispose = cpp_java_plugin_dispose;
 }
 
-#define PREF_WIDGET_SPACE "preferences_toggle:bool:1:1:cpp-completion-space-after-func"
-#define PREF_WIDGET_BRACE "preferences_toggle:bool:1:1:cpp-completion-brace-after-func"
-#define PREF_WIDGET_CLOSEBRACE "preferences_toggle:bool:1:1:cpp-completion-closebrace-after-func"
-#define PREF_WIDGET_AUTO "preferences_toggle:bool:1:1:cpp-completion-enable"
-#define PREF_WIDGET_PACKAGES "preferences_toggle:bool:1:1:cpp-load-project-packages"
+#define PREF_WIDGET_SPACE "preferences:completion-space-after-func"
+#define PREF_WIDGET_BRACE "preferences:completion-brace-after-func"
+#define PREF_WIDGET_CLOSEBRACE "preferences:completion-closebrace-after-func"
+#define PREF_WIDGET_AUTO "preferences:completion-enable"
+#define PREF_WIDGET_PACKAGES "preferences:load-project-packages"
 #define PREF_WIDGET_PKG_CONFIG "pkg_config_chooser1"
 
 static void
diff --git a/po/POTFILES.in b/po/POTFILES.in
index bc54fe4..167249a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -162,7 +162,7 @@ plugins/js-debugger/plugin.c
 [type: gettext/ini]plugins/language-support-cpp-java/anjuta-language-cpp-java.plugin.in
 [type: gettext/glade]plugins/language-support-cpp-java/anjuta-language-cpp-java.ui
 plugins/language-support-cpp-java/cpp-java-assist.c
-plugins/language-support-cpp-java/org.gnome.anjuta.cpp.gschema.xml.in
+plugins/language-support-cpp-java/org.gnome.anjuta.plugins.cpp.gschema.xml.in
 plugins/language-support-cpp-java/plugin.c
 [type: gettext/glade]plugins/language-support-js/anjuta-language-javascript.ui
 plugins/language-support-js/js-parser-y-tab.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]