[anjuta/gsettings-migration: 20/31] language-support-cpp-java: Fixed preference names to match with GSettings rules



commit 59432ea2338d7c304c4ed1d125e38e7618da067d
Author: Johannes Schmid <jhs gnome org>
Date:   Thu Sep 30 22:11:35 2010 +0200

    language-support-cpp-java: Fixed preference names to match with GSettings rules

 .../anjuta-language-cpp-java.ui                    |   24 ++++++++++----------
 .../language-support-cpp-java/cpp-java-assist.c    |    8 +++---
 plugins/language-support-cpp-java/plugin.c         |   12 +++++-----
 3 files changed, 22 insertions(+), 22 deletions(-)
---
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 54be1de..515828b 100644
--- a/plugins/language-support-cpp-java/anjuta-language-cpp-java.ui
+++ b/plugins/language-support-cpp-java/anjuta-language-cpp-java.ui
@@ -43,7 +43,7 @@
                     <property name="column_spacing">5</property>
                     <property name="row_spacing">5</property>
                     <child>
-                      <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:language.cpp.indent.automatic">
+                      <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:cpp-indent-automatic">
                         <property name="label" translatable="yes">Enable smart indentation</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -85,7 +85,7 @@
                                 <property name="column_spacing">5</property>
                                 <property name="row_spacing">5</property>
                                 <child>
-                                  <object class="GtkSpinButton" id="preferences_spin:int:0:1:language.cpp.indent.brace.size">
+                                  <object class="GtkSpinButton" id="preferences_spin:int:0:1:cpp-indent-brace-size">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="invisible_char">&#x2022;</property>
@@ -103,7 +103,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkSpinButton" id="preferences_spin:int:4:1:language.cpp.indent.statement.size">
+                                  <object class="GtkSpinButton" id="preferences_spin:int:4:1:cpp-indent-statement-size">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="invisible_char">&#x2022;</property>
@@ -184,14 +184,14 @@
                             <property name="column_spacing">5</property>
                             <property name="row_spacing">5</property>
                             <child>
-                              <object class="GtkRadioButton" id="preferences_toggle:bool:1:0:language.cpp.indent.paranthese.lineup">
+                              <object class="GtkRadioButton" id="preferences_toggle:bool:1:0:cpp-indent-paranthese-lineup">
                                 <property name="label" translatable="yes">Line up parentheses</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
-                                <property name="group">preferences_toggle:bool:0:0:language.cpp.indent.paranthese.indent</property>
+                                <property name="group">preferences_toggle:bool:0:0:cpp-indent-paranthese-indent</property>
                               </object>
                               <packing>
                                 <property name="x_options">GTK_FILL</property>
@@ -199,7 +199,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkRadioButton" id="preferences_toggle:bool:0:0:language.cpp.indent.paranthese.indent">
+                              <object class="GtkRadioButton" id="preferences_toggle:bool:0:0:cpp-indent-paranthese-indent">
                                 <property name="label" translatable="yes">Indent:</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -215,7 +215,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkSpinButton" id="preferences_spin:int:4:1:language.cpp.indent.paranthese.size">
+                              <object class="GtkSpinButton" id="preferences_spin:int:4:1:cpp-indent-paranthese-size">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="invisible_char">&#x2022;</property>
@@ -296,7 +296,7 @@
                     <property name="orientation">vertical</property>
                     <property name="spacing">5</property>
                     <child>
-                      <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:language.cpp.code.completion.enable">
+                      <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:cpp-completion-enable">
                         <property name="label" translatable="yes">Enable code completion</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -325,7 +325,7 @@
                                 <property name="visible">True</property>
                                 <property name="orientation">vertical</property>
                                 <child>
-                                  <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:language.cpp.code.completion.space.after.func">
+                                  <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:cpp-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>
@@ -339,7 +339,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:language.cpp.code.completion.brace.after.func">
+                                  <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:cpp-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>
@@ -365,7 +365,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="preferences_toggle:bool:0:1:language.cpp.brace.autocompletion">
+                      <object class="GtkCheckButton" id="preferences_toggle:bool:0:1:cpp-brace-autocompletion">
                         <property name="label" translatable="yes">Enable smart brace completion</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -415,7 +415,7 @@
                         <property name="visible">True</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:language.cpp.code.calltip.enable">
+                          <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:cpp-calltip-enable">
                             <property name="label" translatable="yes">Show calltips</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
diff --git a/plugins/language-support-cpp-java/cpp-java-assist.c b/plugins/language-support-cpp-java/cpp-java-assist.c
index 68aa43a..cab4e2d 100644
--- a/plugins/language-support-cpp-java/cpp-java-assist.c
+++ b/plugins/language-support-cpp-java/cpp-java-assist.c
@@ -39,10 +39,10 @@
 #include "cpp-java-assist.h"
 #include "cpp-java-utils.h"
 
-#define PREF_AUTOCOMPLETE_ENABLE "language.cpp.code.completion.enable"
-#define PREF_AUTOCOMPLETE_SPACE_AFTER_FUNC "language.cpp.code.completion.space.after.func"
-#define PREF_AUTOCOMPLETE_BRACE_AFTER_FUNC "language.cpp.code.completion.brace.after.func"
-#define PREF_CALLTIP_ENABLE "language.cpp.code.calltip.enable"
+#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_CALLTIP_ENABLE "cpp-calltip-enable"
 #define BRACE_SEARCH_LIMIT 500
 
 static void cpp_java_assist_iface_init(IAnjutaProviderIface* iface);
diff --git a/plugins/language-support-cpp-java/plugin.c b/plugins/language-support-cpp-java/plugin.c
index fd6ca66..caa3982 100644
--- a/plugins/language-support-cpp-java/plugin.c
+++ b/plugins/language-support-cpp-java/plugin.c
@@ -53,12 +53,12 @@
 
 /* Preferences keys */
 
-#define PREF_INDENT_AUTOMATIC "language.cpp.indent.automatic"
-#define PREF_INDENT_STATEMENT_SIZE "language.cpp.indent.statement.size"
-#define PREF_INDENT_BRACE_SIZE "language.cpp.indent.brace.size"
-#define PREF_INDENT_PARANTHESE_LINEUP "language.cpp.indent.paranthese.lineup"
-#define PREF_INDENT_PARANTHESE_SIZE "language.cpp.indent.paranthese.size"
-#define PREF_BRACE_AUTOCOMPLETION "language.cpp.brace.autocompletion"
+#define PREF_INDENT_AUTOMATIC "cpp-indent-automatic"
+#define PREF_INDENT_STATEMENT_SIZE "cpp-indent-statement-size"
+#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 TAB_SIZE (ianjuta_editor_get_tabsize (editor, NULL))
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]