[anjuta/sdb-core-trans] language-support-cpp-java: upgraded preferences page with PkgConfigChooser.
- From: Massimo Cora' <mcora src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [anjuta/sdb-core-trans] language-support-cpp-java: upgraded preferences page with PkgConfigChooser.
- Date: Sun, 8 Aug 2010 21:20:05 +0000 (UTC)
commit febf87635d7a5e1905b51f237d5b2d47a3a048f5
Author: Massimo Corà <mcora src gnome org>
Date: Sun Aug 8 23:18:30 2010 +0200
language-support-cpp-java: upgraded preferences page with PkgConfigChooser.
.../anjuta-language-cpp-java.ui | 54 +++++++++++++++++++-
plugins/language-support-cpp-java/plugin.c | 27 ++++++++++
plugins/symbol-db/plugin.c | 2 -
3 files changed, 80 insertions(+), 3 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 8d647c1..d4bc142 100644
--- a/plugins/language-support-cpp-java/anjuta-language-cpp-java.ui
+++ b/plugins/language-support-cpp-java/anjuta-language-cpp-java.ui
@@ -1,6 +1,7 @@
<?xml version="1.0"?>
<interface>
<requires lib="gtk+" version="2.16"/>
+ <!-- interface-requires anjuta 0.0 -->
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">100</property>
@@ -19,6 +20,7 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
+ <object class="GtkListStore" id="liststore1"/>
<object class="GtkWindow" id="preferences_dialog">
<property name="title" translatable="yes">window1</property>
<child>
@@ -451,13 +453,63 @@
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkFrame" id="frame5">
+ <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>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment6">
+ <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="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="AnjutaPkgConfigChooser" id="pkg_config_chooser1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
+ <property name="search_column">0</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <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>
+ <property name="xpad">6</property>
+ <property name="label" translatable="yes">Available API tags</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child type="tab">
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label4">
<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>
<property name="label" translatable="yes">Auto-complete</property>
diff --git a/plugins/language-support-cpp-java/plugin.c b/plugins/language-support-cpp-java/plugin.c
index fd6ca66..9bd6d37 100644
--- a/plugins/language-support-cpp-java/plugin.c
+++ b/plugins/language-support-cpp-java/plugin.c
@@ -23,6 +23,7 @@
#include <stdlib.h>
#include <libanjuta/anjuta-shell.h>
#include <libanjuta/anjuta-debug.h>
+#include <libanjuta/anjuta-pkg-config-chooser.h>
#include <libanjuta/interfaces/ianjuta-iterable.h>
#include <libanjuta/interfaces/ianjuta-document.h>
#include <libanjuta/interfaces/ianjuta-document-manager.h>
@@ -2009,6 +2010,8 @@ cpp_java_plugin_class_init (GObjectClass *klass)
#define PREF_WIDGET_SPACE "preferences_toggle:bool:1:1:language.cpp.code.completion.space.after.func"
#define PREF_WIDGET_BRACE "preferences_toggle:bool:1:1:language.cpp.code.completion.brace.after.func"
#define PREF_WIDGET_AUTO "preferences_toggle:bool:1:1:language.cpp.code.completion.enable"
+#define PREF_WIDGET_PKG_CONFIG "pkg_config_chooser1"
+
static void
on_autocompletion_toggled (GtkToggleButton* button,
@@ -2024,6 +2027,18 @@ on_autocompletion_toggled (GtkToggleButton* button,
}
static void
+on_package_activated (AnjutaPkgConfigChooser *self, const gchar* package)
+{
+ g_message ("activated %s", package);
+}
+
+static void
+on_package_deactivated (AnjutaPkgConfigChooser *self, const gchar* package)
+{
+ g_message ("deactivated %s", package);
+}
+
+static void
ipreferences_merge (IAnjutaPreferences* ipref, AnjutaPreferences* prefs,
GError** e)
{
@@ -2031,6 +2046,7 @@ ipreferences_merge (IAnjutaPreferences* ipref, AnjutaPreferences* prefs,
CppJavaPlugin* plugin = ANJUTA_PLUGIN_CPP_JAVA (ipref);
plugin->bxml = gtk_builder_new ();
GtkWidget* toggle;
+ GtkWidget* pkg_config;
/* Add preferences */
if (!gtk_builder_add_from_file (plugin->bxml, PREFS_BUILDER, &error))
@@ -2045,6 +2061,17 @@ ipreferences_merge (IAnjutaPreferences* ipref, AnjutaPreferences* prefs,
g_signal_connect (toggle, "toggled", G_CALLBACK (on_autocompletion_toggled),
plugin->bxml);
on_autocompletion_toggled (GTK_TOGGLE_BUTTON (toggle), plugin->bxml);
+
+ pkg_config = gtk_builder_get_object (plugin->bxml, PREF_WIDGET_PKG_CONFIG);
+ anjuta_pkg_config_chooser_show_active_column (ANJUTA_PKG_CONFIG_CHOOSER (pkg_config),
+ TRUE);
+ g_signal_connect (G_OBJECT (pkg_config), "package-activated",
+ G_CALLBACK (on_package_activated), NULL);
+
+ g_signal_connect (G_OBJECT (pkg_config), "package-deactivated",
+ G_CALLBACK (on_package_deactivated), NULL);
+
+ gtk_widget_show_all (pkg_config);
}
static void
diff --git a/plugins/symbol-db/plugin.c b/plugins/symbol-db/plugin.c
index 46a94ec..0e01419 100644
--- a/plugins/symbol-db/plugin.c
+++ b/plugins/symbol-db/plugin.c
@@ -2528,8 +2528,6 @@ isymbol_manager_activate_package (IAnjutaSymbolManager *isymbol_manager,
const gchar *pkg_version,
GError *err)
{
-g_list_prepend (sdb_plugin->session_packages,
- g_strdup (package));
return TRUE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]