[anjuta-extras] bgo#530740 – Use GtkBuilder instead of libglade
- From: Johannes Schmid <jhs src gnome org>
- To: svn-commits-list gnome org
- Subject: [anjuta-extras] bgo#530740 – Use GtkBuilder instead of libglade
- Date: Sun, 24 May 2009 06:43:30 -0400 (EDT)
commit 5ea041ff3707df7496df84e10afc8010e65cd038
Author: Maxim Ermilov <zaspire rumbler ru>
Date: Sun May 24 12:41:20 2009 +0200
bgo#530740 â?? Use GtkBuilder instead of libglade
---
plugins/indent/Makefile.am | 6 +-
plugins/indent/anjuta-indent.ui | 11 -
plugins/indent/indent-dialog.c | 50 +-
plugins/indent/indent-util.c | 7 +-
plugins/indent/indent-util.h | 2 +-
plugins/indent/{indent.glade => indent.ui} | 895 ++++++++++----------
plugins/indent/plugin.c | 26 +-
plugins/profiler/Makefile.am | 12 +-
plugins/profiler/gprof-call-graph-view.c | 75 +-
plugins/profiler/gprof-call-graph-view.h | 1 -
plugins/profiler/gprof-flat-profile-view.c | 23 +-
plugins/profiler/gprof-flat-profile-view.h | 1 -
plugins/profiler/gprof-function-call-tree-view.c | 31 +-
plugins/profiler/gprof-function-call-tree-view.h | 1 -
plugins/profiler/gprof-options.c | 8 +-
plugins/profiler/gprof-options.h | 3 +-
plugins/profiler/main.c | 21 +-
plugins/profiler/plugin.c | 64 +-
plugins/profiler/profiler-call-graph.glade | 175 ----
plugins/profiler/profiler-call-graph.ui | 162 ++++
plugins/profiler/profiler-flat-profile.glade | 45 -
plugins/profiler/profiler-flat-profile.ui | 40 +
plugins/profiler/profiler-function-call-tree.glade | 45 -
plugins/profiler/profiler-function-call-tree.ui | 40 +
plugins/profiler/profiler.glade | 640 --------------
plugins/profiler/profiler.ui | 629 +++++++++++++-
plugins/scintilla/Makefile.am | 6 +-
...-scintilla.glade => anjuta-editor-scintilla.ui} | 845 ++++++++++---------
plugins/scintilla/plugin.c | 19 +-
plugins/scintilla/style-editor.c | 47 +-
plugins/scratchbox/Makefile.am | 3 +-
...njuta-scratchbox.glade => anjuta-scratchbox.ui} | 120 ++-
plugins/scratchbox/plugin.c | 38 +-
plugins/valgrind/Makefile.am | 4 +-
plugins/valgrind/anjuta-valgrind.glade | 269 ------
plugins/valgrind/anjuta-valgrind.ui | 284 ++++++-
plugins/valgrind/plugin.c | 33 +-
po/POTFILES.in | 14 +-
38 files changed, 2361 insertions(+), 2334 deletions(-)
diff --git a/plugins/indent/Makefile.am b/plugins/indent/Makefile.am
index f47c072..bd84e67 100644
--- a/plugins/indent/Makefile.am
+++ b/plugins/indent/Makefile.am
@@ -2,11 +2,11 @@
# Plugin glade file
indent_gladedir = $(anjuta_glade_dir)
-indent_glade_DATA = indent.glade
+indent_glade_DATA = indent.ui
# Plugin UI file
indent_uidir = $(anjuta_ui_dir)
-indent_ui_DATA = anjuta-indent.ui
+indent_ui_DATA = anjuta-indent.xml
# Plugin Icon file
indent_pixmapsdir = $(anjuta_image_dir)
@@ -58,7 +58,7 @@ libanjuta_indent_la_LIBADD = \
$(GTK_LIBS) \
$(LIBANJUTA_LIBS)
-prefs_glade_files = indent.glade
+prefs_ui_files = indent.ui
include $(top_srcdir)/scripts/build-schemas.mk
EXTRA_DIST = \
diff --git a/plugins/indent/anjuta-indent.ui b/plugins/indent/anjuta-indent.ui
deleted file mode 100644
index ea99ebb..0000000
--- a/plugins/indent/anjuta-indent.ui
+++ /dev/null
@@ -1,11 +0,0 @@
-<!--*- xml -*-->
-<ui>
- <menubar name="MenuMain">
- <placeholder name="PlaceHolderToolMenus">
- <menu name="MenuTools" action="ActionMenuTools">
- <menuitem name="Autoformat" action="ActionFormatAutoformat" />
- <separator name="separator1" />
- </menu>
- </placeholder>
- </menubar>
-</ui>
diff --git a/plugins/indent/indent-dialog.c b/plugins/indent/indent-dialog.c
index fd0d309..247964e 100644
--- a/plugins/indent/indent-dialog.c
+++ b/plugins/indent/indent-dialog.c
@@ -19,7 +19,7 @@
#endif
#include <gnome.h>
-#include <glade/glade.h>
+#include <glib.h>
#include "indent-util.h"
#include "indent-dialog.h"
@@ -101,7 +101,7 @@ indent_widget_signal_connect(gchar *name_widget, gchar *signal, gpointer func,
{
GtkWidget *widget;
- widget = glade_xml_get_widget(idt->xml, name_widget);
+ widget = GTK_WIDGET(gtk_builder_get_object(idt->bxml, name_widget));
g_signal_connect(widget, signal, G_CALLBACK (func), idt);
}
@@ -110,7 +110,7 @@ indent_toggle_button_set_active(gchar *name_widget, gboolean active, IndentData
{
GtkWidget *widget;
- widget = glade_xml_get_widget(idt->xml, name_widget);
+ widget = GTK_WIDGET(gtk_builder_get_object(idt->bxml, name_widget));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (widget), active);
}
@@ -119,7 +119,7 @@ indent_widget_set_sensitive(gchar *name_widget, gboolean sensitive, IndentData *
{
GtkWidget *widget;
- widget = glade_xml_get_widget(idt->xml, name_widget);
+ widget = GTK_WIDGET(gtk_builder_get_object(idt->bxml, name_widget));
gtk_widget_set_sensitive(widget, sensitive);
}
@@ -128,7 +128,7 @@ indent_spinbutton_set_value(gchar *name_widget, gchar *num, IndentData *idt)
{
GtkWidget *widget;
- widget = glade_xml_get_widget(idt->xml, name_widget);
+ widget = GTK_WIDGET(gtk_builder_get_object(idt->bxml, name_widget));
gtk_spin_button_set_value(GTK_SPIN_BUTTON (widget), g_strtod(num, NULL));
}
@@ -138,7 +138,7 @@ indent_spinbutton_get_value(gchar *name_widget, IndentData *idt)
GtkWidget *widget;
gint value;
- widget = glade_xml_get_widget(idt->xml, name_widget);
+ widget = GTK_WIDGET(gtk_builder_get_object(idt->bxml, name_widget));
value = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON (widget));
return g_strdup_printf("%d", value);
}
@@ -208,7 +208,7 @@ indent_entry_get_chars(IndentData *idt)
{
GtkWidget *widget;
- widget = glade_xml_get_widget(idt->xml, PARAMETERS_ENTRY);
+ widget = GTK_WIDGET(gtk_builder_get_object(idt->bxml, PARAMETERS_ENTRY));
return gtk_editable_get_chars(GTK_EDITABLE(widget), 0, -1);
}
@@ -217,7 +217,7 @@ indent_entry_set_chars(gchar *text, IndentData *idt)
{
GtkWidget *widget;
- widget = glade_xml_get_widget(idt->xml, PARAMETERS_ENTRY);
+ widget = GTK_WIDGET(gtk_builder_get_object(idt->bxml, PARAMETERS_ENTRY));
gtk_entry_set_text(GTK_ENTRY(widget), text);
}
@@ -226,7 +226,7 @@ indent_block_widget(gchar *name_widget, gpointer func, gboolean block, IndentDat
{
GtkWidget *widget;
- widget = glade_xml_get_widget(idt->xml, name_widget);
+ widget = GTK_WIDGET(gtk_builder_get_object(idt->bxml, name_widget));
if (block)
g_signal_handlers_block_by_func (GTK_OBJECT (widget), func, NULL);
else
@@ -330,7 +330,7 @@ indent_display_buffer(gchar *buffer, IndentData *idt)
GtkTextTag *tag;
GtkTextIter start, end ;
- widget = glade_xml_get_widget(idt->xml, PREVIEW_TEXTVIEW);
+ widget = GTK_WIDGET(gtk_builder_get_object(idt->bxml, PREVIEW_TEXTVIEW));
text_buffer = gtk_text_buffer_new(NULL);
tag = gtk_text_buffer_create_tag(text_buffer, "police",
@@ -344,30 +344,30 @@ indent_display_buffer(gchar *buffer, IndentData *idt)
}
-#define PREFS_GLADE PACKAGE_DATA_DIR"/glade/indent.glade"
+#define PREFS_GLADE PACKAGE_DATA_DIR"/glade/indent.ui"
GtkWidget *create_dialog(IndentData *idt)
{
- idt->xml = glade_xml_new (PREFS_GLADE, DIALOG, NULL);
+ idt->bxml = gtk_builder_new ();
- if (idt->xml == NULL)
+ if (!gtk_builder_add_from_file (idt->bxml, PREFS_GLADE, NULL))
{
g_warning("Unable to build user interface for Indent\n");
return NULL;
}
- glade_xml_signal_autoconnect (idt->xml);
- idt->dialog = glade_xml_get_widget (idt->xml, DIALOG);
+ gtk_builder_connect_signals (idt->bxml, NULL);
+ idt->dialog = GTK_WIDGET(gtk_builder_get_object(idt->bxml, DIALOG));
indent_init_dialog(idt);
indent_init_connect(idt);
indent_set_style_combo(idt->style_active, idt);
g_signal_connect(GTK_OBJECT(idt->dialog), "delete_event",
- (GCallBack)indent_exit,
+ G_CALLBACK (indent_exit),
NULL);
g_signal_connect(GTK_OBJECT(idt->dialog), "destroy",
- (GCallBack)indent_exit,
+ G_CALLBACK (indent_exit),
NULL);
return idt->dialog;
}
@@ -380,7 +380,7 @@ indent_set_style_combo(gint index, IndentData *idt)
GList *list;
IndentStyle *ist;
- widget = glade_xml_get_widget(idt->xml, STYLE_COMBOBOX);
+ widget = GTK_WIDGET(gtk_builder_get_object(idt->bxml, STYLE_COMBOBOX));
list = idt->style_list;
while (list)
@@ -456,12 +456,12 @@ on_indent_new_button_clicked(GtkButton *button, IndentData *idt)
GtkWidget *message;
gint index;
- widget = glade_xml_get_widget(idt->xml, STYLE_ENTRY);
+ widget = GTK_WIDGET(gtk_builder_get_object(idt->bxml, STYLE_ENTRY));
style_name = gtk_editable_get_chars(GTK_EDITABLE(widget), 0, -1);
style_name = g_strstrip(style_name);
if (strlen(style_name) < 1)
return;
- widget = glade_xml_get_widget(idt->xml, STYLE_COMBOBOX);
+ widget = GTK_WIDGET(gtk_builder_get_object(idt->bxml, STYLE_COMBOBOX));
if (indent_add_style(style_name, idt))
{
gtk_combo_box_append_text(GTK_COMBO_BOX(widget), style_name);
@@ -471,7 +471,7 @@ on_indent_new_button_clicked(GtkButton *button, IndentData *idt)
gtk_combo_box_set_active(GTK_COMBO_BOX(widget), index);
gtk_combo_box_set_active(GTK_COMBO_BOX(idt->pref_indent_combo), index);
- widget = glade_xml_get_widget(idt->xml, STYLE_ENTRY);
+ widget = GTK_WIDGET(gtk_builder_get_object(idt->bxml, STYLE_ENTRY));
gtk_editable_delete_text(GTK_EDITABLE(widget), 0, -1);
indent_save_all_style(idt);
}
@@ -494,9 +494,9 @@ on_indent_update_button_clicked(GtkButton *button, IndentData *idt)
GtkWidget *widget;
GtkWidget *message;
- widget = glade_xml_get_widget(idt->xml, STYLE_COMBOBOX);
+ widget = GTK_WIDGET(gtk_builder_get_object(idt->bxml, STYLE_COMBOBOX));
style_name = gtk_combo_box_get_active_text(GTK_COMBO_BOX(widget));
- widget = glade_xml_get_widget(idt->xml, PARAMETERS_ENTRY);
+ widget = GTK_WIDGET(gtk_builder_get_object(idt->bxml, PARAMETERS_ENTRY));
options = gtk_editable_get_chars(GTK_EDITABLE(widget), 0, -1);
if (indent_update_style(style_name, options, idt))
@@ -523,7 +523,7 @@ on_indent_delete_button_clicked(GtkButton *button, IndentData *idt)
gint index;
gchar *style_name;
- widget = glade_xml_get_widget(idt->xml, STYLE_COMBOBOX);
+ widget = GTK_WIDGET(gtk_builder_get_object(idt->bxml, STYLE_COMBOBOX));
style_name = gtk_combo_box_get_active_text(GTK_COMBO_BOX(widget));
if (indent_remove_style(style_name, idt))
{
@@ -555,7 +555,7 @@ on_indent_quit_button_clicked(GtkButton *button, IndentData *idt)
gchar *style_name, *options;
gint index;
- widget = glade_xml_get_widget(idt->xml, STYLE_COMBOBOX);
+ widget = GTK_WIDGET(gtk_builder_get_object(idt->bxml, STYLE_COMBOBOX));
style_name = gtk_combo_box_get_active_text(GTK_COMBO_BOX(widget));
options = indent_find_style(style_name, idt);
indent_save_active_style(style_name, options, idt);
diff --git a/plugins/indent/indent-util.c b/plugins/indent/indent-util.c
index cdac2c8..230388b 100644
--- a/plugins/indent/indent-util.c
+++ b/plugins/indent/indent-util.c
@@ -17,10 +17,9 @@
#include <gnome.h>
-#include <glade/glade.h>
#include <sys/wait.h>
-
+#include <glib.h>
#include <gconf/gconf-client.h>
#include <libanjuta/anjuta-utils.h>
@@ -34,7 +33,7 @@
#define INDENT_FILE_INPUT PACKAGE_DATA_DIR"/indent_test.c"
-#define INDENT_FILE_OUTPUT TMPDIR"/indent_test.c"
+#define INDENT_FILE_OUTPUT "/indent_test.c"
#define AUTOFORMAT_DISABLE "autoformat.disable"
#define AUTOFORMAT_STYLE "autoformat.style"
@@ -478,7 +477,7 @@ indent_execute(gchar *line_option, IndentData *idt)
int status;
options = g_strconcat(line_option, " ",INDENT_FILE_INPUT, NULL);
- cmd = g_strconcat ("indent ", options, " -o ", INDENT_FILE_OUTPUT, NULL);
+ cmd = g_strconcat ("indent ", options, " -o ", g_get_tmp_dir (), INDENT_FILE_OUTPUT, NULL);
g_free(options);
pid = anjuta_util_execute_shell (PACKAGE_DATA_DIR, cmd);
diff --git a/plugins/indent/indent-util.h b/plugins/indent/indent-util.h
index ec0eb48..126a91c 100644
--- a/plugins/indent/indent-util.h
+++ b/plugins/indent/indent-util.h
@@ -23,7 +23,7 @@
typedef struct _IndentData
{
- GladeXML *xml;
+ GtkBuilder *bxml;
GtkWidget *dialog;
GHashTable *option_hash;
GHashTable *check_hash;
diff --git a/plugins/indent/indent.glade b/plugins/indent/indent.ui
similarity index 73%
rename from plugins/indent/indent.glade
rename to plugins/indent/indent.ui
index 38bd80b..4a04c63 100644
--- a/plugins/indent/indent.glade
+++ b/plugins/indent/indent.ui
@@ -1,81 +1,174 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<?xml version="1.0"?>
<!--*- mode: xml -*-->
-<glade-interface>
- <widget class="GtkWindow" id="indent_dialog">
+<interface>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">99</property>
+ <property name="lower">0</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">10</property>
+ <property name="value">12</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment10">
+ <property name="upper">99</property>
+ <property name="lower">0</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">10</property>
+ <property name="value">12</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment11">
+ <property name="upper">99</property>
+ <property name="lower">0</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">10</property>
+ <property name="value">12</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment12">
+ <property name="upper">99</property>
+ <property name="lower">0</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">10</property>
+ <property name="value">14</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment2">
+ <property name="upper">99</property>
+ <property name="lower">0</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">10</property>
+ <property name="value">12</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment3">
+ <property name="upper">99</property>
+ <property name="lower">0</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">10</property>
+ <property name="value">12</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment4">
+ <property name="upper">99</property>
+ <property name="lower">0</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">10</property>
+ <property name="value">11</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment5">
+ <property name="upper">99</property>
+ <property name="lower">0</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">10</property>
+ <property name="value">12</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment6">
+ <property name="upper">99</property>
+ <property name="lower">0</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">10</property>
+ <property name="value">12</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment7">
+ <property name="upper">99</property>
+ <property name="lower">0</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">10</property>
+ <property name="value">12</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment8">
+ <property name="upper">99</property>
+ <property name="lower">0</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">10</property>
+ <property name="value">12</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment9">
+ <property name="upper">99</property>
+ <property name="lower">0</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">10</property>
+ <property name="value">12</property>
+ </object>
+ <object class="GtkWindow" id="indent_dialog">
<property name="visible">True</property>
<property name="title" translatable="yes">Indent Preferences</property>
<property name="window_position">GTK_WIN_POS_CENTER</property>
<child>
- <widget class="GtkVBox" id="vbox1">
+ <object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<child>
- <widget class="GtkHBox" id="hbox2">
+ <object class="GtkHBox" id="hbox2">
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="homogeneous">True</property>
<child>
- <widget class="GtkVBox" id="vbox2">
+ <object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
<property name="border_width">5</property>
<child>
- <widget class="GtkVBox" id="vbox3">
+ <object class="GtkVBox" id="vbox3">
<property name="visible">True</property>
<child>
- <widget class="GtkExpander" id="expander1">
+ <object class="GtkExpander" id="expander1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <widget class="GtkHBox" id="hbox39">
+ <object class="GtkHBox" id="hbox39">
<property name="visible">True</property>
<property name="homogeneous">True</property>
<child>
- <widget class="GtkVBox" id="vbox49">
+ <object class="GtkVBox" id="vbox49">
<property name="visible">True</property>
<property name="homogeneous">True</property>
<child>
- <widget class="GtkHBox" id="hbox40">
+ <object class="GtkHBox" id="hbox40">
<property name="visible">True</property>
<child>
- <widget class="GtkCheckButton" id="c_checkbutton">
+ <object class="GtkCheckButton" id="c_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Specify the column for comments following code.</property>
+ <property name="tooltip-text" translatable="yes">Specify the column for comments following code.</property>
<property name="label" translatable="yes">Indent</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="c_spinbutton">
+ <object class="GtkSpinButton" id="c_spinbutton">
<property name="width_request">40</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">12 0 99 1 10 10</property>
+ <property name="adjustment">adjustment1</property>
<property name="climb_rate">1</property>
- </widget>
+ </object>
<packing>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkCheckButton" id="cdb_checkbutton">
+ <object class="GtkCheckButton" id="cdb_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Place the comment delimiters on blank lines.</property>
+ <property name="tooltip-text" translatable="yes">Place the comment delimiters on blank lines.</property>
<property name="label" translatable="yes">Delimiters on BL</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -83,73 +176,70 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="fc1_checkbutton">
+ <object class="GtkCheckButton" id="fc1_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Format comments which begin in column one.</property>
+ <property name="tooltip-text" translatable="yes">Format comments which begin in column one.</property>
<property name="label" translatable="yes">First Column</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="padding">5</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox50">
+ <object class="GtkVBox" id="vbox50">
<property name="visible">True</property>
<property name="homogeneous">True</property>
<child>
- <widget class="GtkHBox" id="hbox41">
+ <object class="GtkHBox" id="hbox41">
<property name="visible">True</property>
<child>
- <widget class="GtkCheckButton" id="cd_checkbutton">
+ <object class="GtkCheckButton" id="cd_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Specify the column for comments following declarations.</property>
+ <property name="tooltip-text" translatable="yes">Specify the column for comments following declarations.</property>
<property name="label" translatable="yes">Declaration </property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="cd_spinbutton">
+ <object class="GtkSpinButton" id="cd_spinbutton">
<property name="width_request">40</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">12 0 99 1 10 10</property>
+ <property name="adjustment">adjustment2</property>
<property name="climb_rate">1</property>
- </widget>
+ </object>
<packing>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkCheckButton" id="bbb_checkbutton">
+ <object class="GtkCheckButton" id="bbb_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Insert a line before a Box comment.</property>
+ <property name="tooltip-text" translatable="yes">Insert a line before a Box comment.</property>
<property name="label" translatable="yes">Line before Box </property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -157,96 +247,93 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="fca_checkbutton">
+ <object class="GtkCheckButton" id="fca_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Format comments which begin after the first column.</property>
+ <property name="tooltip-text" translatable="yes">Format comments which begin after the first column.</property>
<property name="label" translatable="yes">All Comments</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="padding">5</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox51">
+ <object class="GtkVBox" id="vbox51">
<property name="visible">True</property>
<property name="homogeneous">True</property>
<child>
- <widget class="GtkHBox" id="hbox42">
+ <object class="GtkHBox" id="hbox42">
<property name="visible">True</property>
<child>
- <widget class="GtkCheckButton" id="cp_checkbutton">
+ <object class="GtkCheckButton" id="cp_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Specify the column for comments following preprocessor directives.</property>
+ <property name="tooltip-text" translatable="yes">Specify the column for comments following preprocessor directives.</property>
<property name="label" translatable="yes">#Else #Endif </property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="cp_spinbutton">
+ <object class="GtkSpinButton" id="cp_spinbutton">
<property name="width_request">40</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">12 0 99 1 10 10</property>
+ <property name="adjustment">adjustment3</property>
<property name="climb_rate">1</property>
- </widget>
+ </object>
<packing>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkHBox" id="hbox43">
+ <object class="GtkHBox" id="hbox43">
<property name="visible">True</property>
<child>
- <widget class="GtkCheckButton" id="d_checkbutton">
+ <object class="GtkCheckButton" id="d_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Specify an amount by which comments are moved to the left.</property>
+ <property name="tooltip-text" translatable="yes">Specify an amount by which comments are moved to the left.</property>
<property name="label" translatable="yes">Line Indent </property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="d_spinbutton">
+ <object class="GtkSpinButton" id="d_spinbutton">
<property name="width_request">40</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">11 0 99 1 10 10</property>
+ <property name="adjustment">adjustment4</property>
<property name="climb_rate">1</property>
- </widget>
+ </object>
<packing>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -254,468 +341,444 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="sc_checkbutton">
+ <object class="GtkCheckButton" id="sc_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Place stars at the beginning of multi-line comments.</property>
+ <property name="tooltip-text" translatable="yes">Place stars at the beginning of multi-line comments.</property>
<property name="label" translatable="yes">Star Left Side</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="padding">5</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label1">
+ <child type="label">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Comments</b></property>
<property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkExpander" id="expander2">
+ <object class="GtkExpander" id="expander2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <widget class="GtkHBox" id="hbox17">
+ <object class="GtkHBox" id="hbox17">
<property name="visible">True</property>
<property name="homogeneous">True</property>
<child>
- <widget class="GtkVBox" id="vbox32">
+ <object class="GtkVBox" id="vbox32">
<property name="visible">True</property>
<property name="homogeneous">True</property>
<child>
- <widget class="GtkCheckButton" id="bc_checkbutton">
+ <object class="GtkCheckButton" id="bc_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Force a newline after each comma in a declaration.</property>
+ <property name="tooltip-text" translatable="yes">Force a newline after each comma in a declaration.</property>
<property name="label" translatable="yes">Line after Commas</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox25">
+ <object class="GtkHBox" id="hbox25">
<property name="visible">True</property>
<child>
- <widget class="GtkCheckButton" id="di_checkbutton">
+ <object class="GtkCheckButton" id="di_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Specify the column of identifiers.</property>
+ <property name="tooltip-text" translatable="yes">Specify the column of identifiers.</property>
<property name="label" translatable="yes">Declarations </property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="di_spinbutton">
+ <object class="GtkSpinButton" id="di_spinbutton">
<property name="width_request">40</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">12 0 99 1 10 10</property>
+ <property name="adjustment">adjustment5</property>
<property name="climb_rate">1</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="padding">5</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox33">
+ <object class="GtkVBox" id="vbox33">
<property name="visible">True</property>
<property name="homogeneous">True</property>
<child>
- <widget class="GtkCheckButton" id="bls_checkbutton">
+ <object class="GtkCheckButton" id="bls_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Place the '{' following a 'struct' declaration on the next line.</property>
+ <property name="tooltip-text" translatable="yes">Place the '{' following a 'struct' declaration on the next line.</property>
<property name="label" translatable="yes">Braces after Struct</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="psl_checkbutton">
+ <object class="GtkCheckButton" id="psl_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Place the type of a procedure beeing defined on the previous line.</property>
+ <property name="tooltip-text" translatable="yes">Place the type of a procedure beeing defined on the previous line.</property>
<property name="label" translatable="yes">Procnames start lines</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="padding">5</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox34">
+ <object class="GtkVBox" id="vbox34">
<property name="visible">True</property>
<property name="homogeneous">True</property>
<child>
- <widget class="GtkCheckButton" id="brs_checkbutton">
+ <object class="GtkCheckButton" id="brs_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="tooltip" translatable="yes">Place the '{' following a 'struct' declaration on the same line.</property>
+ <property name="tooltip-text" translatable="yes">Place the '{' following a 'struct' declaration on the same line.</property>
<property name="label" translatable="yes">Braces on Struct</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="checkbutton3">
+ <object class="GtkCheckButton" id="checkbutton3">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
<property name="inconsistent">True</property>
<property name="draw_indicator">True</property>
<child>
<placeholder/>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="padding">5</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label2">
+ <child type="label">
+ <object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Declarations</b></property>
<property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkExpander" id="expander3">
+ <object class="GtkExpander" id="expander3">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <widget class="GtkHBox" id="hbox31">
+ <object class="GtkHBox" id="hbox31">
<property name="visible">True</property>
<property name="homogeneous">True</property>
<child>
- <widget class="GtkVBox" id="vbox43">
+ <object class="GtkVBox" id="vbox43">
<property name="visible">True</property>
<property name="homogeneous">True</property>
<child>
- <widget class="GtkHBox" id="hbox32">
+ <object class="GtkHBox" id="hbox32">
<property name="visible">True</property>
<child>
- <widget class="GtkCheckButton" id="i_checkbutton">
+ <object class="GtkCheckButton" id="i_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Specify the value of indentation for each level.</property>
+ <property name="tooltip-text" translatable="yes">Specify the value of indentation for each level.</property>
<property name="label" translatable="yes">Level </property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="i_spinbutton">
+ <object class="GtkSpinButton" id="i_spinbutton">
<property name="width_request">40</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">12 0 99 1 10 10</property>
+ <property name="adjustment">adjustment6</property>
<property name="climb_rate">1</property>
- </widget>
+ </object>
<packing>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkCheckButton" id="lp_checkbutton">
+ <object class="GtkCheckButton" id="lp_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Line up continuation line to start at the character position just after the left parenthesis if a line has a left parenthesis which is not closed on that line.</property>
+ <property name="tooltip-text" translatable="yes">Line up continuation line to start at the character position just after the left parenthesis if a line has a left parenthesis which is not closed on that line.</property>
<property name="label" translatable="yes">Continue at Parenth.</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="padding">5</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox44">
+ <object class="GtkVBox" id="vbox44">
<property name="visible">True</property>
<property name="homogeneous">True</property>
<child>
- <widget class="GtkHBox" id="hbox33">
+ <object class="GtkHBox" id="hbox33">
<property name="visible">True</property>
<child>
- <widget class="GtkCheckButton" id="ip_checkbutton">
+ <object class="GtkCheckButton" id="ip_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Specify how many spaces to indent type declarations.</property>
+ <property name="tooltip-text" translatable="yes">Specify how many spaces to indent type declarations.</property>
<property name="label" translatable="yes">Parameter </property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="ip_spinbutton">
+ <object class="GtkSpinButton" id="ip_spinbutton">
<property name="width_request">40</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">12 0 99 1 10 10</property>
+ <property name="adjustment">adjustment7</property>
<property name="climb_rate">1</property>
- </widget>
+ </object>
<packing>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkCheckButton" id="checkbutton4">
+ <object class="GtkCheckButton" id="checkbutton4">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
<property name="inconsistent">True</property>
<property name="draw_indicator">True</property>
<child>
<placeholder/>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="padding">5</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox48">
+ <object class="GtkVBox" id="vbox48">
<property name="visible">True</property>
<property name="homogeneous">True</property>
<child>
- <widget class="GtkHBox" id="hbox37">
+ <object class="GtkHBox" id="hbox37">
<property name="visible">True</property>
<child>
- <widget class="GtkCheckButton" id="ts_checkbutton">
+ <object class="GtkCheckButton" id="ts_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Specify the number o spaces for a TAB (default 8).</property>
+ <property name="tooltip-text" translatable="yes">Specify the number o spaces for a TAB (default 8).</property>
<property name="label" translatable="yes">Tab Size </property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="ts_spinbutton">
+ <object class="GtkSpinButton" id="ts_spinbutton">
<property name="width_request">40</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">12 0 99 1 10 10</property>
+ <property name="adjustment">adjustment8</property>
<property name="climb_rate">1</property>
- </widget>
+ </object>
<packing>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkCheckButton" id="checkbutton9">
+ <object class="GtkCheckButton" id="checkbutton9">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
<property name="inconsistent">True</property>
<property name="draw_indicator">True</property>
<child>
<placeholder/>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="padding">5</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label3">
+ <child type="label">
+ <object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Indentation</b></property>
<property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
<child>
- <widget class="GtkExpander" id="expander4">
+ <object class="GtkExpander" id="expander4">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <widget class="GtkHBox" id="hbox44">
+ <object class="GtkHBox" id="hbox44">
<property name="visible">True</property>
<property name="homogeneous">True</property>
<child>
- <widget class="GtkVBox" id="vbox52">
+ <object class="GtkVBox" id="vbox52">
<property name="visible">True</property>
<property name="homogeneous">True</property>
<child>
- <widget class="GtkHBox" id="hbox45">
+ <object class="GtkHBox" id="hbox45">
<property name="visible">True</property>
<child>
- <widget class="GtkCheckButton" id="bli_checkbutton">
+ <object class="GtkCheckButton" id="bli_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Specify the number of spaces by which braces are indented.</property>
+ <property name="tooltip-text" translatable="yes">Specify the number of spaces by which braces are indented.</property>
<property name="label" translatable="yes">Brace</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="bli_spinbutton">
+ <object class="GtkSpinButton" id="bli_spinbutton">
<property name="width_request">40</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">12 0 99 1 10 10</property>
+ <property name="adjustment">adjustment9</property>
<property name="climb_rate">1</property>
- </widget>
+ </object>
<packing>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkCheckButton" id="br_checkbutton">
+ <object class="GtkCheckButton" id="br_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Place the brace on the line of the if test.</property>
+ <property name="tooltip-text" translatable="yes">Place the brace on the line of the if test.</property>
<property name="label" translatable="yes">Braces on IF line</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -723,15 +786,14 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="bl_checkbutton">
+ <object class="GtkCheckButton" id="bl_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Place the brace on the line following the if test.</property>
+ <property name="tooltip-text" translatable="yes">Place the brace on the line following the if test.</property>
<property name="label" translatable="yes">Braces after IF Line</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -739,88 +801,84 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="checkbutton22">
+ <object class="GtkCheckButton" id="checkbutton22">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
<property name="inconsistent">True</property>
<property name="draw_indicator">True</property>
<child>
<placeholder/>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">3</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="padding">5</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox53">
+ <object class="GtkVBox" id="vbox53">
<property name="visible">True</property>
<property name="homogeneous">True</property>
<child>
- <widget class="GtkHBox" id="hbox46">
+ <object class="GtkHBox" id="hbox46">
<property name="visible">True</property>
<child>
- <widget class="GtkCheckButton" id="ci_checkbutton">
+ <object class="GtkCheckButton" id="ci_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Specify the indentation level when a statement is broken across two lines (default 0).</property>
+ <property name="tooltip-text" translatable="yes">Specify the indentation level when a statement is broken across two lines (default 0).</property>
<property name="label" translatable="yes">Continuation</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="ci_spinbutton">
+ <object class="GtkSpinButton" id="ci_spinbutton">
<property name="width_request">40</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">12 0 99 1 10 10</property>
+ <property name="adjustment">adjustment10</property>
<property name="climb_rate">1</property>
- </widget>
+ </object>
<packing>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkCheckButton" id="cs_checkbutton">
+ <object class="GtkCheckButton" id="cs_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Place a space after a cast operator.</property>
+ <property name="tooltip-text" translatable="yes">Place a space after a cast operator.</property>
<property name="label" translatable="yes">Space after Cast</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="sai_checkbutton">
+ <object class="GtkCheckButton" id="sai_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Force a space between an 'if' and the following parenthesis (default).</property>
+ <property name="tooltip-text" translatable="yes">Force a space between an 'if' and the following parenthesis (default).</property>
<property name="label" translatable="yes">Space after IF</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -828,74 +886,71 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="ce_checkbutton">
+ <object class="GtkCheckButton" id="ce_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Cuddle up to the immediately preceding '}' in an if-then-else construct.</property>
+ <property name="tooltip-text" translatable="yes">Cuddle up to the immediately preceding '}' in an if-then-else construct.</property>
<property name="label" translatable="yes">Cuddle Else</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">3</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="padding">5</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox54">
+ <object class="GtkVBox" id="vbox54">
<property name="visible">True</property>
<property name="homogeneous">True</property>
<child>
- <widget class="GtkHBox" id="hbox47">
+ <object class="GtkHBox" id="hbox47">
<property name="visible">True</property>
<child>
- <widget class="GtkCheckButton" id="cli_checkbutton">
+ <object class="GtkCheckButton" id="cli_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Specify the number of spaces that 'case' labels should be indented to the right of the containing 'switch' statement.</property>
+ <property name="tooltip-text" translatable="yes">Specify the number of spaces that 'case' labels should be indented to the right of the containing 'switch' statement.</property>
<property name="label" translatable="yes">Case</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="cli_spinbutton">
+ <object class="GtkSpinButton" id="cli_spinbutton">
<property name="width_request">40</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">12 0 99 1 10 10</property>
+ <property name="adjustment">adjustment11</property>
<property name="climb_rate">1</property>
- </widget>
+ </object>
<packing>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkCheckButton" id="pcs_checkbutton">
+ <object class="GtkCheckButton" id="pcs_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Place a space between the name of the procedure being called and the '('.</property>
+ <property name="tooltip-text" translatable="yes">Place a space between the name of the procedure being called and the '('.</property>
<property name="label" translatable="yes">Space after Proc Call</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -903,15 +958,14 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="saw_checkbutton">
+ <object class="GtkCheckButton" id="saw_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Force a space between a 'while' and the following parenthesis (default).</property>
+ <property name="tooltip-text" translatable="yes">Force a space between a 'while' and the following parenthesis (default).</property>
<property name="label" translatable="yes">Space after WHILE</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -919,297 +973,280 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="saf_checkbutton">
+ <object class="GtkCheckButton" id="saf_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Force a space between a 'for' and the following parenthesis (default).</property>
+ <property name="tooltip-text" translatable="yes">Force a space between a 'for' and the following parenthesis (default).</property>
<property name="label" translatable="yes">Space after FOR</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">3</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="padding">5</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label5">
+ <child type="label">
+ <object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Statements</b></property>
<property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">3</property>
</packing>
</child>
<child>
- <widget class="GtkExpander" id="expander5">
+ <object class="GtkExpander" id="expander5">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <widget class="GtkHBox" id="hbox15">
+ <object class="GtkHBox" id="hbox15">
<property name="visible">True</property>
<property name="homogeneous">True</property>
<child>
- <widget class="GtkVBox" id="vbox25">
+ <object class="GtkVBox" id="vbox25">
<property name="visible">True</property>
<property name="homogeneous">True</property>
<child>
- <widget class="GtkCheckButton" id="bbo_checkbutton">
+ <object class="GtkCheckButton" id="bbo_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Prefer to break long lines before the boolean operators '&&' and '||'.</property>
+ <property name="tooltip-text" translatable="yes">Prefer to break long lines before the boolean operators '&&' and '||'.</property>
<property name="label" translatable="yes">Break before Boolean</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="padding">5</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox26">
+ <object class="GtkVBox" id="vbox26">
<property name="visible">True</property>
<property name="homogeneous">True</property>
<child>
- <widget class="GtkCheckButton" id="hnl_checkbutton">
+ <object class="GtkCheckButton" id="hnl_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Honour newlines by giving them the highest possible priority.</property>
+ <property name="tooltip-text" translatable="yes">Honour newlines by giving them the highest possible priority.</property>
<property name="label" translatable="yes">Honour Newlines</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="padding">5</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox24">
+ <object class="GtkVBox" id="vbox24">
<property name="visible">True</property>
<property name="homogeneous">True</property>
<child>
- <widget class="GtkHBox" id="hbox21">
+ <object class="GtkHBox" id="hbox21">
<property name="visible">True</property>
<child>
- <widget class="GtkCheckButton" id="l_checkbutton">
+ <object class="GtkCheckButton" id="l_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Specify the maximum length of a line of C code, not including possible comments that follow it.</property>
+ <property name="tooltip-text" translatable="yes">Specify the maximum length of a line of C code, not including possible comments that follow it.</property>
<property name="label" translatable="yes">Length </property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="l_spinbutton">
+ <object class="GtkSpinButton" id="l_spinbutton">
<property name="width_request">40</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">14 0 99 1 10 10</property>
+ <property name="adjustment">adjustment12</property>
<property name="climb_rate">1</property>
- </widget>
+ </object>
<packing>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="padding">5</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label6">
+ <child type="label">
+ <object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Breaking long lines</b></property>
<property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">4</property>
</packing>
</child>
<child>
- <widget class="GtkExpander" id="expander6">
+ <object class="GtkExpander" id="expander6">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <widget class="GtkHBox" id="hbox16">
+ <object class="GtkHBox" id="hbox16">
<property name="visible">True</property>
<property name="homogeneous">True</property>
<child>
- <widget class="GtkVBox" id="vbox27">
+ <object class="GtkVBox" id="vbox27">
<property name="visible">True</property>
<property name="homogeneous">True</property>
<child>
- <widget class="GtkCheckButton" id="bad_checkbutton">
+ <object class="GtkCheckButton" id="bad_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Force a blank line after every block of declarations.</property>
+ <property name="tooltip-text" translatable="yes">Force a blank line after every block of declarations.</property>
<property name="label" translatable="yes">After Declarations</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="padding">5</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox28">
+ <object class="GtkVBox" id="vbox28">
<property name="visible">True</property>
<property name="homogeneous">True</property>
<child>
- <widget class="GtkCheckButton" id="bap_checkbutton">
+ <object class="GtkCheckButton" id="bap_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Force a blank line after every procedure body.</property>
+ <property name="tooltip-text" translatable="yes">Force a blank line after every procedure body.</property>
<property name="label" translatable="yes">After Procedures</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="padding">5</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox29">
+ <object class="GtkVBox" id="vbox29">
<property name="visible">True</property>
<property name="homogeneous">True</property>
<child>
- <widget class="GtkCheckButton" id="sob_checkbutton">
+ <object class="GtkCheckButton" id="sob_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Swallow optional blank lines.</property>
+ <property name="tooltip-text" translatable="yes">Swallow optional blank lines.</property>
<property name="label" translatable="yes">Swallow Optional</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="padding">5</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label7">
+ <child type="label">
+ <object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Blank lines</b></property>
<property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">5</property>
</packing>
</child>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkFrame" id="frame8">
+ <object class="GtkFrame" id="frame8">
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="label_xalign">0</property>
<property name="shadow_type">GTK_SHADOW_OUT</property>
<child>
- <widget class="GtkAlignment" id="alignment8">
+ <object class="GtkAlignment" id="alignment8">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="left_padding">10</property>
<property name="right_padding">10</property>
<child>
- <widget class="GtkVBox" id="vbox15">
+ <object class="GtkVBox" id="vbox15">
<property name="visible">True</property>
<child>
- <widget class="GtkHBox" id="hbox48">
+ <object class="GtkHBox" id="hbox48">
<property name="visible">True</property>
<property name="spacing">10</property>
<child>
- <widget class="GtkComboBox" id="indent_style_combobox">
+ <object class="GtkComboBox" id="indent_style_combobox">
<property name="visible">True</property>
- <property name="items" translatable="yes"></property>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkLabel" id="label17">
+ <object class="GtkLabel" id="label17">
<property name="visible">True</property>
<property name="label" translatable="yes">New
Style</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1217,28 +1254,28 @@ Style</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="indent_style_entry">
+ <object class="GtkEntry" id="indent_dialog_style_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">*</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="padding">2</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="indent_parameters_entry">
+ <object class="GtkEntry" id="indent_parameters_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">*</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1247,26 +1284,26 @@ Style</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox11">
+ <object class="GtkHBox" id="hbox11">
<property name="visible">True</property>
<property name="border_width">5</property>
<child>
- <widget class="GtkImage" id="image1">
+ <object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="stock">gtk-dialog-info</property>
<property name="icon_size">6</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label4">
+ <object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="label" translatable="yes">You can modify the parameters either by
using the above buttons or by editing them
directly (See indent manual).</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1275,53 +1312,52 @@ directly (See indent manual).</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="indent_preview_button">
+ <object class="GtkButton" id="indent_preview_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Display the indent output according the selected parameters.</property>
- <property name="response_id">0</property>
+ <property name="tooltip-text" translatable="yes">Display the indent output according the selected parameters.</property>
<child>
- <widget class="GtkAlignment" id="alignment9">
+ <object class="GtkAlignment" id="alignment9">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox38">
+ <object class="GtkHBox" id="hbox38">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image2">
+ <object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="stock">gtk-print-preview</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label15">
+ <object class="GtkLabel" id="label15">
<property name="visible">True</property>
<property name="label" translatable="yes">Preview</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="padding">5</property>
@@ -1329,137 +1365,128 @@ directly (See indent manual).</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame11">
+ <object class="GtkFrame" id="frame11">
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="label_xalign">0</property>
<property name="shadow_type">GTK_SHADOW_IN</property>
<child>
- <widget class="GtkAlignment" id="alignment10">
+ <object class="GtkAlignment" id="alignment10">
<property name="visible">True</property>
<property name="yscale">0.97000002861022949</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox2">
+ <object class="GtkHButtonBox" id="hbuttonbox2">
<property name="visible">True</property>
<property name="border_width">3</property>
<property name="layout_style">GTK_BUTTONBOX_SPREAD</property>
<child>
- <widget class="GtkButton" id="indent_new_button">
+ <object class="GtkButton" id="indent_new_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="tooltip" translatable="yes">Create a new style with name defined in "New Style" entry ("-gnu" parameters by default).</property>
+ <property name="tooltip-text" translatable="yes">Create a new style with name defined in "New Style" entry ("-gnu" parameters by default).</property>
<property name="label">gtk-new</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkButton" id="indent_delete_button">
+ <object class="GtkButton" id="indent_delete_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="tooltip" translatable="yes">Delete the style selected in the combo style selector.</property>
+ <property name="tooltip-text" translatable="yes">Delete the style selected in the combo style selector.</property>
<property name="label">gtk-delete</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="indent_update_button">
+ <object class="GtkButton" id="indent_update_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="tooltip" translatable="yes">Save the selected Style with the modified parameters.</property>
+ <property name="tooltip-text" translatable="yes">Save the selected Style with the modified parameters.</property>
<property name="label" translatable="yes">Update Style</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label16">
+ <child type="label">
+ <object class="GtkLabel" id="label16">
<property name="visible">True</property>
<property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">3</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label12">
+ <child type="label">
+ <object class="GtkLabel" id="label12">
<property name="visible">True</property>
<property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow1">
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<child>
- <widget class="GtkTextView" id="indent_preview_textview">
+ <object class="GtkTextView" id="indent_preview_textview">
<property name="width_request">400</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">False</property>
<property name="cursor_visible">False</property>
<property name="accepts_tab">False</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkHSeparator" id="hseparator1">
+ <object class="GtkHSeparator" id="hseparator1">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox1">
+ <object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="homogeneous">True</property>
@@ -1467,13 +1494,12 @@ directly (See indent manual).</property>
<placeholder/>
</child>
<child>
- <widget class="GtkButton" id="Indent_Help_button">
+ <object class="GtkButton" id="Indent_Help_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-help</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1481,48 +1507,47 @@ directly (See indent manual).</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="indent_quit_button">
+ <object class="GtkButton" id="indent_quit_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-quit</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkWindow" id="indent_prefs_window">
+ </object>
+ <object class="GtkWindow" id="indent_prefs_window">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child>
- <widget class="GtkFrame" id="indent_prefs">
+ <object class="GtkFrame" id="indent_prefs">
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="label_xalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
- <widget class="GtkVBox" id="vbox6">
+ <object class="GtkVBox" id="vbox6">
<property name="visible">True</property>
<child>
- <widget class="GtkFrame" id="frame3">
+ <object class="GtkFrame" id="frame3">
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="label_xalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
- <widget class="GtkVBox" id="vbox7">
+ <object class="GtkVBox" id="vbox7">
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="spacing">5</property>
@@ -1530,111 +1555,103 @@ directly (See indent manual).</property>
<placeholder/>
</child>
<child>
- <widget class="GtkHBox" id="hbox5">
+ <object class="GtkHBox" id="hbox5">
<property name="visible">True</property>
<child>
- <widget class="GtkComboBox" id="pref_indent_style_combobox">
+ <object class="GtkComboBox" id="pref_indent_style_combobox">
<property name="visible">True</property>
- <property name="items" translatable="yes"></property>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkButton" id="set_indent_button">
+ <object class="GtkButton" id="set_indent_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Indent Setting</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="padding">20</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label9">
+ <child type="label">
+ <object class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Autoformat style</b></property>
<property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame4">
+ <object class="GtkFrame" id="frame4">
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="label_xalign">0.5</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
- <widget class="GtkVBox" id="vbox8">
+ <object class="GtkVBox" id="vbox8">
<property name="visible">True</property>
<property name="border_width">10</property>
<property name="spacing">5</property>
<child>
- <widget class="GtkLabel" id="label10">
+ <object class="GtkLabel" id="label10">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>'indent' arguments</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="indent_style_entry">
+ <object class="GtkEntry" id="indent_prefs_style_entry">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="editable">False</property>
<property name="invisible_char">*</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label18">
+ <child type="label">
+ <object class="GtkLabel" id="label18">
<property name="visible">True</property>
<property name="label" translatable="yes">Arguments associated with the selected autoformat style.
Select the 'Indent Setting' button to manage the autoformat styles.
Read the info page for 'indent' for more details</property>
<property name="wrap">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </widget>
-</glade-interface>
+ </object>
+</interface>
diff --git a/plugins/indent/plugin.c b/plugins/indent/plugin.c
index 233e2b4..dacb846 100644
--- a/plugins/indent/plugin.c
+++ b/plugins/indent/plugin.c
@@ -32,8 +32,8 @@
#include "plugin.h"
-#define UI_FILE PACKAGE_DATA_DIR"/ui/anjuta-indent.ui"
-#define PREFS_GLADE PACKAGE_DATA_DIR"/glade/indent.glade"
+#define UI_FILE PACKAGE_DATA_DIR"/ui/anjuta-indent.xml"
+#define PREFS_GLADE PACKAGE_DATA_DIR"/glade/indent.ui"
#define ICON_FILE "anjuta-indent-plugin.png"
static gpointer parent_class;
@@ -318,32 +318,38 @@ ipreferences_merge(IAnjutaPreferences* ipref, AnjutaPreferences* prefs, GError**
GtkWidget *indent_button;
GtkWidget *indent_combo;
GtkWidget *indent_entry;
- GladeXML* gxml;
+ GError* error = NULL;
+ GtkBuilder* bxml = gtk_builder_new ();
AnjutaPlugin* plugin = ANJUTA_PLUGIN (ipref);
IndentPlugin* iplugin = ANJUTA_PLUGIN_INDENT (plugin);
/* Add preferences */
- gxml = glade_xml_new (PREFS_GLADE, "indent_prefs_window", NULL);
- indent_button = glade_xml_get_widget (gxml, "set_indent_button");
+ if (!gtk_builder_add_from_file (bxml, PREFS_GLADE, &error))
+ {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ g_error_free (error);
+ }
+
+ indent_button = GTK_WIDGET (gtk_builder_get_object (bxml, "set_indent_button"));
g_signal_connect (G_OBJECT (indent_button), "clicked",
G_CALLBACK (on_edit_editor_indent), plugin);
- anjuta_preferences_add_page (prefs,
- gxml, "indent_prefs", _("Indent Utility"), ICON_FILE);
+ anjuta_preferences_add_from_builder (prefs,
+ bxml, "indent_prefs", _("Indent Utility"), ICON_FILE);
- indent_combo = glade_xml_get_widget (gxml, "pref_indent_style_combobox");
+ indent_combo = GTK_WIDGET (gtk_builder_get_object (bxml, "pref_indent_style_combobox"));
iplugin->idt->pref_indent_combo = indent_combo;
g_signal_connect (G_OBJECT (indent_combo), "changed",
G_CALLBACK (on_style_combo_changed), plugin);
- indent_entry = glade_xml_get_widget (gxml, "indent_style_entry");
+ indent_entry = GTK_WIDGET (gtk_builder_get_object (bxml, "indent_style_entry"));
iplugin->idt->pref_indent_options = indent_entry;
iplugin->idt->prefs = prefs;
indent_init_load_style (iplugin->idt);
pref_set_style_combo (iplugin->idt);
- g_object_unref (G_OBJECT (gxml));
+ g_object_unref (G_OBJECT (bxml));
}
static void
diff --git a/plugins/profiler/Makefile.am b/plugins/profiler/Makefile.am
index 5be828b..a86f135 100644
--- a/plugins/profiler/Makefile.am
+++ b/plugins/profiler/Makefile.am
@@ -1,14 +1,14 @@
# Plugin UI file
profiler_uidir = $(anjuta_ui_dir)
-profiler_ui_DATA = profiler.ui
+profiler_ui_DATA = profiler.xml
# Plugin glade file
profiler_gladedir = $(anjuta_glade_dir)
-profiler_glade_DATA = profiler.glade \
- profiler-flat-profile.glade \
- profiler-call-graph.glade \
- profiler-function-call-tree.glade
+profiler_glade_DATA = profiler.ui \
+ profiler-flat-profile.ui \
+ profiler-call-graph.ui \
+ profiler-function-call-tree.ui
# Plugin Icon file
profiler_pixmapsdir = $(anjuta_image_dir)
@@ -86,7 +86,7 @@ endif
libanjuta_profiler_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
# Plugin dependencies
-libanjuta_profiler_la_LIBADD = $(LIBANJUTA_LIBS) $(GLADE_LIBS) $(GNOME_CANVAS_LIBS) $(GIO_LIBS) $(LIBXML_LIBS)
+libanjuta_profiler_la_LIBADD = $(LIBANJUTA_LIBS) $(GNOME_CANVAS_LIBS) $(GIO_LIBS) $(LIBXML_LIBS)
if HAVE_GRAPHVIZ
libanjuta_profiler_la_LIBADD += $(GRAPHVIZ_LIBS)
diff --git a/plugins/profiler/gprof-call-graph-view.c b/plugins/profiler/gprof-call-graph-view.c
index 5d45f03..f5ec970 100644
--- a/plugins/profiler/gprof-call-graph-view.c
+++ b/plugins/profiler/gprof-call-graph-view.c
@@ -26,7 +26,7 @@
struct _GProfCallGraphViewPriv
{
- GladeXML *gxml;
+ GtkBuilder *bxml;
GtkListStore *functions_list_store;
GtkListStore *called_list_store;
GtkListStore *called_by_list_store;
@@ -113,10 +113,10 @@ on_function_selected (GtkTreeSelection *selection, GtkTreeModel *model,
self = GPROF_CALL_GRAPH_VIEW (user_data);
data = gprof_view_get_data (GPROF_VIEW (self));
call_graph = gprof_profile_data_get_call_graph (data);
- called_list_view = glade_xml_get_widget (self->priv->gxml,
- "called_list_view");
- called_by_list_view = glade_xml_get_widget (self->priv->gxml,
- "called_by_list_view");
+ called_list_view = GTK_WIDGET (gtk_builder_get_object (self->priv->bxml,
+ "called_list_view"));
+ called_by_list_view = GTK_WIDGET (gtk_builder_get_object (self->priv->bxml,
+ "called_by_list_view"));
gtk_tree_model_get_iter (model, &list_iter, path);
gtk_tree_model_get (model, &list_iter, FUNCTIONS_COL_NAME,
@@ -188,8 +188,8 @@ gprof_call_graph_view_select_function (GProfCallGraphView *self, gchar *name)
GtkTreeIter *functions_list_iter;
GtkTreePath *functions_list_path;
- functions_list_view = glade_xml_get_widget (self->priv->gxml,
- "functions_list_view");
+ functions_list_view = GTK_WIDGET (gtk_builder_get_object (self->priv->bxml,
+ "functions_list_view"));
functions_list_selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (functions_list_view));
functions_list_iter = g_hash_table_lookup (self->priv->functions_iter_table,
@@ -271,12 +271,12 @@ gprof_call_graph_view_create_columns (GProfCallGraphView *self)
GtkWidget *called_list_view;
GtkWidget *called_by_list_view;
- functions_list_view = glade_xml_get_widget (self->priv->gxml,
- "functions_list_view");
- called_list_view = glade_xml_get_widget (self->priv->gxml,
- "called_list_view");
- called_by_list_view = glade_xml_get_widget (self->priv->gxml,
- "called_by_list_view");
+ functions_list_view = GTK_WIDGET (gtk_builder_get_object (self->priv->bxml,
+ "functions_list_view"));
+ called_list_view = GTK_WIDGET (gtk_builder_get_object (self->priv->bxml,
+ "called_list_view"));
+ called_by_list_view = GTK_WIDGET (gtk_builder_get_object (self->priv->bxml,
+ "called_by_list_view"));
/* The Functions list will have all fields; all others have everything
* except a time field. */
@@ -490,12 +490,17 @@ gprof_call_graph_view_init (GProfCallGraphView *self)
GtkWidget *called_jump_to_button;
GtkWidget *called_by_jump_to_button;
GtkTreeSelection *functions_list_selection;
+ GError* error = NULL;
self->priv = g_new0 (GProfCallGraphViewPriv, 1);
-
- self->priv->gxml = glade_xml_new (PACKAGE_DATA_DIR
- "/glade/profiler-call-graph.glade",
- NULL, NULL);
+
+ self->priv->bxml = gtk_builder_new ();
+ if (!gtk_builder_add_from_file (self->priv->bxml, PACKAGE_DATA_DIR"/glade/profiler-call-graph.ui", &error))
+ {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ g_error_free (error);
+ }
+
self->priv->functions_list_store = gtk_list_store_new (FUNCTIONS_NUM_COLS,
G_TYPE_STRING,
G_TYPE_STRING,
@@ -520,12 +525,12 @@ gprof_call_graph_view_init (GProfCallGraphView *self)
gprof_call_graph_view_create_columns (self);
- functions_list_view = glade_xml_get_widget (self->priv->gxml,
- "functions_list_view");
- called_list_view = glade_xml_get_widget (self->priv->gxml,
- "called_list_view");
- called_by_list_view = glade_xml_get_widget (self->priv->gxml,
- "called_by_list_view");
+ functions_list_view = GTK_WIDGET (gtk_builder_get_object (self->priv->bxml,
+ "functions_list_view"));
+ called_list_view = GTK_WIDGET (gtk_builder_get_object (self->priv->bxml,
+ "called_list_view"));
+ called_by_list_view = GTK_WIDGET (gtk_builder_get_object (self->priv->bxml,
+ "called_by_list_view"));
/* Function selection */
functions_list_selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (functions_list_view));
@@ -534,10 +539,10 @@ gprof_call_graph_view_init (GProfCallGraphView *self)
(gpointer) self, NULL);
/* Jump to button callbacks */
- called_jump_to_button = glade_xml_get_widget (self->priv->gxml,
- "called_jump_to_button");
- called_by_jump_to_button = glade_xml_get_widget (self->priv->gxml,
- "called_by_jump_to_button");
+ called_jump_to_button = GTK_WIDGET (gtk_builder_get_object (self->priv->bxml,
+ "called_jump_to_button"));
+ called_by_jump_to_button = GTK_WIDGET (gtk_builder_get_object (self->priv->bxml,
+ "called_by_jump_to_button"));
g_signal_connect (functions_list_view, "row-activated",
G_CALLBACK (on_functions_list_view_row_activated),
@@ -557,7 +562,7 @@ gprof_call_graph_view_finalize (GObject *obj)
self = (GProfCallGraphView *) obj;
- g_object_unref (self->priv->gxml);
+ g_object_unref (self->priv->bxml);
if (self->priv->functions_iter_table)
g_hash_table_destroy (self->priv->functions_iter_table);
@@ -638,12 +643,12 @@ gprof_call_graph_view_refresh (GProfView *view)
data = gprof_view_get_data (view);
call_graph = gprof_profile_data_get_call_graph (data);
- functions_list_view = glade_xml_get_widget (self->priv->gxml,
- "functions_list_view");
- called_list_view = glade_xml_get_widget (self->priv->gxml,
- "called_list_view");
- called_by_list_view = glade_xml_get_widget (self->priv->gxml,
- "called_by_list_view");
+ functions_list_view = GTK_WIDGET (gtk_builder_get_object (self->priv->bxml,
+ "functions_list_view"));
+ called_list_view = GTK_WIDGET (gtk_builder_get_object (self->priv->bxml,
+ "called_list_view"));
+ called_by_list_view = GTK_WIDGET (gtk_builder_get_object (self->priv->bxml,
+ "called_by_list_view"));
/* Clear all lists and repopulate the functions list. The two others won't
* be repopulated until a user selects a function from the Functions list */
@@ -731,5 +736,5 @@ gprof_call_graph_view_get_widget (GProfView *view)
self = GPROF_CALL_GRAPH_VIEW (view);
- return glade_xml_get_widget (self->priv->gxml, "call_graph_vbox");
+ return GTK_WIDGET (gtk_builder_get_object (self->priv->bxml, "call_graph_vbox"));
}
diff --git a/plugins/profiler/gprof-call-graph-view.h b/plugins/profiler/gprof-call-graph-view.h
index 005e52b..1c5914f 100644
--- a/plugins/profiler/gprof-call-graph-view.h
+++ b/plugins/profiler/gprof-call-graph-view.h
@@ -28,7 +28,6 @@
#include <glib.h>
#include <glib-object.h>
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include "gprof-view.h"
G_BEGIN_DECLS
diff --git a/plugins/profiler/gprof-flat-profile-view.c b/plugins/profiler/gprof-flat-profile-view.c
index 1890b36..ae5f375 100644
--- a/plugins/profiler/gprof-flat-profile-view.c
+++ b/plugins/profiler/gprof-flat-profile-view.c
@@ -26,7 +26,7 @@
struct _GProfFlatProfileViewPriv
{
- GladeXML *gxml;
+ GtkBuilder *bxml;
GtkListStore *list_store;
};
@@ -49,7 +49,7 @@ gprof_flat_profile_view_create_columns (GProfFlatProfileView *self)
GtkCellRenderer *renderer;
GtkWidget *list_view;
- list_view = glade_xml_get_widget (self->priv->gxml, "flat_profile_view");
+ list_view = GTK_WIDGET (gtk_builder_get_object (self->priv->bxml, "flat_profile_view"));
/* Function name */
col = gtk_tree_view_column_new ();
@@ -188,13 +188,18 @@ on_list_view_row_activated (GtkTreeView *list_view,
static void
gprof_flat_profile_view_init (GProfFlatProfileView *self)
{
+ GError* error = NULL;
GtkWidget *list_view;
self->priv = g_new0 (GProfFlatProfileViewPriv, 1);
- self->priv->gxml = glade_xml_new (PACKAGE_DATA_DIR
- "/glade/profiler-flat-profile.glade",
- NULL, NULL);
+ self->priv->bxml = gtk_builder_new ();
+ if (!gtk_builder_add_from_file (self->priv->bxml, PACKAGE_DATA_DIR"/glade/profiler-flat-profile.ui", &error))
+ {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ g_error_free (error);
+ }
+
self->priv->list_store = gtk_list_store_new (NUM_COLS, G_TYPE_STRING,
G_TYPE_FLOAT, G_TYPE_FLOAT,
G_TYPE_FLOAT, G_TYPE_UINT,
@@ -202,7 +207,7 @@ gprof_flat_profile_view_init (GProfFlatProfileView *self)
gprof_flat_profile_view_create_columns (self);
- list_view = glade_xml_get_widget (self->priv->gxml, "flat_profile_view");
+ list_view = GTK_WIDGET (gtk_builder_get_object (self->priv->bxml, "flat_profile_view"));
g_signal_connect (list_view, "row-activated",
G_CALLBACK (on_list_view_row_activated),
@@ -217,7 +222,7 @@ gprof_flat_profile_view_finalize (GObject *obj)
self = (GProfFlatProfileView *) obj;
- g_object_unref (self->priv->gxml);
+ g_object_unref (self->priv->bxml);
g_free (self->priv);
}
@@ -288,7 +293,7 @@ gprof_flat_profile_view_refresh (GProfView *view)
GtkTreeIter view_iter;
self = GPROF_FLAT_PROFILE_VIEW (view);
- list_view = glade_xml_get_widget (self->priv->gxml, "flat_profile_view");
+ list_view = GTK_WIDGET (gtk_builder_get_object (self->priv->bxml, "flat_profile_view"));
g_object_ref (self->priv->list_store);
gtk_tree_view_set_model (GTK_TREE_VIEW (list_view), NULL);
@@ -336,5 +341,5 @@ gprof_flat_profile_view_get_widget (GProfView *view)
self = GPROF_FLAT_PROFILE_VIEW (view);
- return glade_xml_get_widget (self->priv->gxml, "flat_profile_scrolled");
+ return GTK_WIDGET (gtk_builder_get_object (self->priv->bxml, "flat_profile_scrolled"));
}
diff --git a/plugins/profiler/gprof-flat-profile-view.h b/plugins/profiler/gprof-flat-profile-view.h
index c009fe1..31a0b92 100644
--- a/plugins/profiler/gprof-flat-profile-view.h
+++ b/plugins/profiler/gprof-flat-profile-view.h
@@ -28,7 +28,6 @@
#include <glib.h>
#include <glib-object.h>
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include "gprof-view.h"
G_BEGIN_DECLS
diff --git a/plugins/profiler/gprof-function-call-tree-view.c b/plugins/profiler/gprof-function-call-tree-view.c
index 4cf3006..8c35a7e 100644
--- a/plugins/profiler/gprof-function-call-tree-view.c
+++ b/plugins/profiler/gprof-function-call-tree-view.c
@@ -26,7 +26,7 @@
struct _GProfFunctionCallTreeViewPriv
{
- GladeXML *gxml;
+ GtkBuilder *bxml;
GtkTreeStore *tree_store;
};
@@ -44,8 +44,8 @@ gprof_function_call_tree_view_create_columns (GProfFunctionCallTreeView *self)
GtkCellRenderer *renderer;
GtkWidget *tree_view;
- tree_view = glade_xml_get_widget (self->priv->gxml,
- "function_call_tree_view");
+ tree_view = GTK_WIDGET (gtk_builder_get_object (self->priv->bxml,
+ "function_call_tree_view"));
/* Recursive icon */
col = gtk_tree_view_column_new ();
@@ -154,18 +154,23 @@ static void
gprof_function_call_tree_view_init (GProfFunctionCallTreeView *self)
{
GtkWidget *list_view;
+ GError* error = NULL;
self->priv = g_new0 (GProfFunctionCallTreeViewPriv, 1);
-
- self->priv->gxml = glade_xml_new (PACKAGE_DATA_DIR
- "/glade/profiler-function-call-tree.glade",
- NULL, NULL);
+
+ self->priv->bxml = gtk_builder_new ();
+ if (!gtk_builder_add_from_file (self->priv->bxml, PACKAGE_DATA_DIR"/glade/profiler-function-call-tree.ui", &error))
+ {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ g_error_free (error);
+ }
+
self->priv->tree_store = gtk_tree_store_new (NUM_COLS, G_TYPE_STRING,
G_TYPE_STRING);
gprof_function_call_tree_view_create_columns (self);
- list_view = glade_xml_get_widget (self->priv->gxml, "function_call_tree_view");
+ list_view = GTK_WIDGET (gtk_builder_get_object (self->priv->bxml, "function_call_tree_view"));
g_signal_connect (list_view, "row-activated",
G_CALLBACK (on_list_view_row_activated),
@@ -179,7 +184,7 @@ gprof_function_call_tree_view_finalize (GObject *obj)
self = (GProfFunctionCallTreeView *) obj;
- g_object_unref (self->priv->gxml);
+ g_object_unref (self->priv->bxml);
g_free (self->priv);
}
@@ -250,8 +255,8 @@ gprof_function_call_tree_view_refresh (GProfView *view)
GtkWidget *tree_view;
self = GPROF_FUNCTION_CALL_TREE_VIEW (view);
- tree_view = glade_xml_get_widget (self->priv->gxml,
- "function_call_tree_view");
+ tree_view = GTK_WIDGET (gtk_builder_get_object (self->priv->bxml,
+ "function_call_tree_view"));
g_object_ref (self->priv->tree_store);
@@ -283,6 +288,6 @@ gprof_function_call_tree_view_get_widget (GProfView *view)
self = GPROF_FUNCTION_CALL_TREE_VIEW (view);
- return glade_xml_get_widget (self->priv->gxml,
- "function_call_tree_scrolled");
+ return GTK_WIDGET (gtk_builder_get_object (self->priv->bxml,
+ "function_call_tree_scrolled"));
}
diff --git a/plugins/profiler/gprof-function-call-tree-view.h b/plugins/profiler/gprof-function-call-tree-view.h
index 255a019..08b9346 100644
--- a/plugins/profiler/gprof-function-call-tree-view.h
+++ b/plugins/profiler/gprof-function-call-tree-view.h
@@ -28,7 +28,6 @@
#include <glib.h>
#include <glib-object.h>
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include "gprof-view.h"
G_BEGIN_DECLS
diff --git a/plugins/profiler/gprof-options.c b/plugins/profiler/gprof-options.c
index d792dff..a67ff93 100644
--- a/plugins/profiler/gprof-options.c
+++ b/plugins/profiler/gprof-options.c
@@ -205,13 +205,13 @@ on_option_changed (GtkEditable *editable, Key *key)
}
static void
-setup_widgets (gchar *key_name, Key *key, GladeXML *gxml)
+setup_widgets (gchar *key_name, Key *key, GtkBuilder *bxml)
{
GtkWidget *widget;
GtkTextBuffer *buffer;
gchar *string;
- widget = glade_xml_get_widget (gxml, key->widget_name);
+ widget = GTK_WIDGET (gtk_builder_get_object (bxml, key->widget_name));
if (widget)
{
@@ -407,10 +407,10 @@ gprof_options_register_key (GProfOptions *self, gchar *key_name,
}
void
-gprof_options_create_window (GProfOptions *self, GladeXML *gxml)
+gprof_options_create_window (GProfOptions *self, GtkBuilder *bxml)
{
g_hash_table_foreach (self->priv->key_data_table, (GHFunc) setup_widgets,
- gxml);
+ bxml);
}
void
diff --git a/plugins/profiler/gprof-options.h b/plugins/profiler/gprof-options.h
index dc9acfc..0e0b436 100644
--- a/plugins/profiler/gprof-options.h
+++ b/plugins/profiler/gprof-options.h
@@ -28,7 +28,6 @@
#include <glib.h>
#include <glib-object.h>
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include <libxml/parser.h>
#include <libxml/tree.h>
@@ -85,7 +84,7 @@ void gprof_options_register_key (GProfOptions *self, gchar *key_name,
OptionWidgetType widget_type);
-void gprof_options_create_window (GProfOptions *self, GladeXML *gxml);
+void gprof_options_create_window (GProfOptions *self, GtkBuilder *bxml);
void gprof_options_load (GProfOptions *self, const gchar *path);
void gprof_options_save (GProfOptions *self, const gchar *path);
diff --git a/plugins/profiler/main.c b/plugins/profiler/main.c
index 3f1843d..8ad0727 100644
--- a/plugins/profiler/main.c
+++ b/plugins/profiler/main.c
@@ -8,7 +8,6 @@
#endif
#include <gnome.h>
-#include <glade/glade-xml.h>
#include <stdlib.h>
#include "gprof-profile-data.h"
@@ -29,11 +28,11 @@ on_main_window_delete_event (GtkWidget *widget, GdkEvent * event,
}
static GtkWidget *
-create_main_window (GladeXML *glade)
+create_main_window (GtkBuilder *bxml)
{
GtkWidget *window;
- window = glade_xml_get_widget (glade, "main_window");
+ window = GTK_WIDGET (gtk_builder_get_object (bxml, "main_window"));
g_signal_connect (window, "delete-event",
G_CALLBACK(on_main_window_delete_event), NULL);
@@ -44,20 +43,24 @@ create_main_window (GladeXML *glade)
int
main (int argc, char *argv[])
{
- GladeXML *main_ui;
+ GtkBuilder *bxml= gtk_builder_new ();
GtkWidget *main_window;
GProfViewManager *manager;
GProfProfileData *data;
+ GError* error = NULL;
gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE,
argc, argv,
GNOME_PARAM_APP_DATADIR, PACKAGE_DATA_DIR,
NULL);
-
- main_ui = glade_xml_new (PACKAGE_DATA_DIR
- "/profileparser-gui/profileparser-gui.glade",
- NULL, NULL);
- main_window = create_main_window (main_ui);
+
+ if (!gtk_builder_add_from_file (bxml, PACKAGE_DATA_DIR"/profileparser-gui/profileparser-gui.ui", &error))
+ {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ g_error_free (error);
+ }
+
+ main_window = create_main_window (bxml);
manager = gprof_view_manager_new ();
gtk_widget_show (main_window);
diff --git a/plugins/profiler/plugin.c b/plugins/profiler/plugin.c
index 7623597..56b0ec1 100644
--- a/plugins/profiler/plugin.c
+++ b/plugins/profiler/plugin.c
@@ -25,8 +25,8 @@
#include "plugin.h"
-#define UI_FILE PACKAGE_DATA_DIR"/ui/profiler.ui"
-#define GLADE_FILE PACKAGE_DATA_DIR"/glade/profiler.glade"
+#define UI_FILE PACKAGE_DATA_DIR"/ui/profiler.xml"
+#define GLADE_FILE PACKAGE_DATA_DIR"/glade/profiler.ui"
#define ICON_FILE PACKAGE_PIXMAPS_DIR"/anjuta-profiler-plugin-48.png"
static gpointer parent_class;
@@ -365,16 +365,16 @@ register_options ()
}
static void
-on_profile_data_browse_button_clicked (GtkButton *button, GladeXML *gxml)
+on_profile_data_browse_button_clicked (GtkButton *button, GtkBuilder *bxml)
{
GtkWidget *select_file_dialog;
GtkWidget *profile_data_file_entry;
GtkWidget *profiling_options_dialog;
gchar *selected_file;
- profile_data_file_entry = glade_xml_get_widget (gxml, "profile_data_file_entry");
- profiling_options_dialog = glade_xml_get_widget (gxml,
- "profiling_options_dialog");
+ profile_data_file_entry = GTK_WIDGET (gtk_builder_get_object (bxml, "profile_data_file_entry"));
+ profiling_options_dialog = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "profiling_options_dialog"));
select_file_dialog = gtk_file_chooser_dialog_new ("Select Data File",
GTK_WINDOW (profiling_options_dialog),
GTK_FILE_CHOOSER_ACTION_OPEN,
@@ -398,32 +398,36 @@ static void
on_profiling_options_button_clicked (GtkButton *button, gpointer *user_data)
{
Profiler *profiler;
- GladeXML *gxml;
+ GtkBuilder *bxml= gtk_builder_new ();
GtkWidget *profiling_options_dialog;
GtkWidget *profile_data_browse_button;
+ GError* error = NULL;
profiler = PROFILER (user_data);
- gxml = glade_xml_new (GLADE_FILE, "profiling_options_dialog",
- NULL);
- profiling_options_dialog = glade_xml_get_widget (gxml, "profiling_options_dialog");
- profile_data_browse_button = glade_xml_get_widget (gxml,
- "profile_data_browse_button");
+ if (!gtk_builder_add_from_file (bxml, GLADE_FILE, &error))
+ {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ g_error_free (error);
+ }
+ profiling_options_dialog = GTK_WIDGET (gtk_builder_get_object (bxml, "profiling_options_dialog"));
+ profile_data_browse_button = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "profile_data_browse_button"));
g_signal_connect (profile_data_browse_button, "clicked",
G_CALLBACK (on_profile_data_browse_button_clicked),
- gxml);
+ bxml);
g_signal_connect (profiling_options_dialog, "response", G_CALLBACK (gtk_widget_hide),
profiling_options_dialog);
- gprof_options_create_window (profiler->options, gxml);
+ gprof_options_create_window (profiler->options, bxml);
gtk_window_set_transient_for (GTK_WINDOW (profiling_options_dialog),
GTK_WINDOW (ANJUTA_PLUGIN(profiler)->shell));
gtk_dialog_run (GTK_DIALOG (profiling_options_dialog));
- g_object_unref (gxml);
+ g_object_unref (bxml);
}
static void
@@ -499,7 +503,7 @@ on_target_selected (GtkTreeSelection *selection, GtkTreeModel *model,
static void
on_profiler_select_target (GtkAction *action, Profiler *profiler)
{
- GladeXML *gxml;
+ GtkBuilder *bxml= gtk_builder_new ();
GtkWidget *select_target_dialog;
GtkWidget *profiling_options_button;
GtkWidget *select_other_target_button;
@@ -517,16 +521,22 @@ on_profiler_select_target (GtkAction *action, Profiler *profiler)
gchar *target = NULL;
gchar *relative_path;
guint project_root_uri_length;
-
- gxml = glade_xml_new (GLADE_FILE, "select_target_dialog", NULL);
- select_target_dialog = glade_xml_get_widget (gxml,
- "select_target_dialog");
- targets_list_view = glade_xml_get_widget (gxml,
- "targets_list_view");
- profiling_options_button = glade_xml_get_widget (gxml,
- "profiling_options_button");
- select_other_target_button = glade_xml_get_widget (gxml,
- "select_other_target_button");
+ GError* error = NULL;
+
+ if (!gtk_builder_add_from_file (bxml, GLADE_FILE, &error))
+ {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ g_error_free (error);
+ }
+
+ select_target_dialog = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "select_target_dialog"));
+ targets_list_view = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "targets_list_view"));
+ profiling_options_button = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "profiling_options_button"));
+ select_other_target_button = GTK_WIDGET (gtk_builder_get_object (bxml,
+ "select_other_target_button"));
g_signal_connect (profiling_options_button, "clicked",
G_CALLBACK (on_profiling_options_button_clicked),
@@ -617,7 +627,7 @@ on_profiler_select_target (GtkAction *action, Profiler *profiler)
}
gtk_widget_hide (select_target_dialog);
- g_object_unref (gxml);
+ g_object_unref (bxml);
}
static void
diff --git a/plugins/profiler/profiler-call-graph.glade b/plugins/profiler/profiler-call-graph.glade
deleted file mode 100644
index fd3a3a7..0000000
--- a/plugins/profiler/profiler-call-graph.glade
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
-
-<glade-interface>
-
-<widget class="GtkWindow" id="call_graph">
- <property name="title" translatable="yes"></property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="default_width">500</property>
- <property name="default_height">400</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <signal name="delete_event" handler="on_main window_delete_event" last_modification_time="Wed, 15 Nov 2006 07:29:39 GMT"/>
-
- <child>
- <widget class="GtkVBox" id="call_graph_vbox">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Functions</b></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.019999999553</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">5</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow5">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTreeView" id="functions_list_view">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">True</property>
- <property name="rules_hint">True</property>
- <property name="reorderable">False</property>
- <property name="enable_search">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Called</b></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.019999999553</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">6</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow8">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTreeView" id="called_list_view">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">True</property>
- <property name="rules_hint">True</property>
- <property name="reorderable">False</property>
- <property name="enable_search">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Called By</b></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.019999999553</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">5</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow9">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTreeView" id="called_by_list_view">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">True</property>
- <property name="rules_hint">True</property>
- <property name="reorderable">False</property>
- <property name="enable_search">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
-</glade-interface>
diff --git a/plugins/profiler/profiler-call-graph.ui b/plugins/profiler/profiler-call-graph.ui
new file mode 100644
index 0000000..0a68918
--- /dev/null
+++ b/plugins/profiler/profiler-call-graph.ui
@@ -0,0 +1,162 @@
+<?xml version="1.0"?>
+<!--*- mode: xml -*-->
+<interface>
+ <object class="GtkWindow" id="call_graph">
+ <property name="title" translatable="yes"/>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+ <property name="default_width">500</property>
+ <property name="default_height">400</property>
+ <property name="resizable">True</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <signal handler="on_main window_delete_event" last_modification_time="Wed, 15 Nov 2006 07:29:39 GMT" name="delete_event"/>
+ <child>
+ <object class="GtkVBox" id="call_graph_vbox">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Functions</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.019999999553</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </object>
+ <packing>
+ <property name="padding">5</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow5">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+ <child>
+ <object class="GtkTreeView" id="functions_list_view">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">True</property>
+ <property name="rules_hint">True</property>
+ <property name="reorderable">False</property>
+ <property name="enable_search">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Called</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.019999999553</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </object>
+ <packing>
+ <property name="padding">6</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow8">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+ <child>
+ <object class="GtkTreeView" id="called_list_view">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">True</property>
+ <property name="rules_hint">True</property>
+ <property name="reorderable">False</property>
+ <property name="enable_search">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Called By</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.019999999553</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </object>
+ <packing>
+ <property name="padding">5</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow9">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+ <child>
+ <object class="GtkTreeView" id="called_by_list_view">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">True</property>
+ <property name="rules_hint">True</property>
+ <property name="reorderable">False</property>
+ <property name="enable_search">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+</interface>
diff --git a/plugins/profiler/profiler-flat-profile.glade b/plugins/profiler/profiler-flat-profile.glade
deleted file mode 100644
index ca193ec..0000000
--- a/plugins/profiler/profiler-flat-profile.glade
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
-
-<glade-interface>
-
-<widget class="GtkWindow" id="flat_profile">
- <property name="title" translatable="yes"></property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="default_width">500</property>
- <property name="default_height">400</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <signal name="delete_event" handler="on_main window_delete_event" last_modification_time="Wed, 15 Nov 2006 07:29:39 GMT"/>
-
- <child>
- <widget class="GtkScrolledWindow" id="flat_profile_scrolled">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTreeView" id="flat_profile_view">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">True</property>
- <property name="rules_hint">True</property>
- <property name="reorderable">False</property>
- <property name="enable_search">True</property>
- </widget>
- </child>
- </widget>
- </child>
-</widget>
-
-</glade-interface>
diff --git a/plugins/profiler/profiler-flat-profile.ui b/plugins/profiler/profiler-flat-profile.ui
new file mode 100644
index 0000000..d7ab528
--- /dev/null
+++ b/plugins/profiler/profiler-flat-profile.ui
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!--*- mode: xml -*-->
+<interface>
+ <object class="GtkWindow" id="flat_profile">
+ <property name="title" translatable="yes"/>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+ <property name="default_width">500</property>
+ <property name="default_height">400</property>
+ <property name="resizable">True</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <signal handler="on_main window_delete_event" last_modification_time="Wed, 15 Nov 2006 07:29:39 GMT" name="delete_event"/>
+ <child>
+ <object class="GtkScrolledWindow" id="flat_profile_scrolled">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+ <child>
+ <object class="GtkTreeView" id="flat_profile_view">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">True</property>
+ <property name="rules_hint">True</property>
+ <property name="reorderable">False</property>
+ <property name="enable_search">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+</interface>
diff --git a/plugins/profiler/profiler-function-call-tree.glade b/plugins/profiler/profiler-function-call-tree.glade
deleted file mode 100644
index ce0cde3..0000000
--- a/plugins/profiler/profiler-function-call-tree.glade
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
-
-<glade-interface>
-
-<widget class="GtkWindow" id="function_call_tree">
- <property name="title" translatable="yes"></property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="default_width">500</property>
- <property name="default_height">400</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <signal name="delete_event" handler="on_main window_delete_event" last_modification_time="Wed, 15 Nov 2006 07:29:39 GMT"/>
-
- <child>
- <widget class="GtkScrolledWindow" id="function_call_tree_scrolled">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTreeView" id="function_call_tree_view">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">True</property>
- <property name="rules_hint">True</property>
- <property name="reorderable">False</property>
- <property name="enable_search">True</property>
- </widget>
- </child>
- </widget>
- </child>
-</widget>
-
-</glade-interface>
diff --git a/plugins/profiler/profiler-function-call-tree.ui b/plugins/profiler/profiler-function-call-tree.ui
new file mode 100644
index 0000000..695115e
--- /dev/null
+++ b/plugins/profiler/profiler-function-call-tree.ui
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!--*- mode: xml -*-->
+<interface>
+ <object class="GtkWindow" id="function_call_tree">
+ <property name="title" translatable="yes"/>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+ <property name="default_width">500</property>
+ <property name="default_height">400</property>
+ <property name="resizable">True</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <signal handler="on_main window_delete_event" last_modification_time="Wed, 15 Nov 2006 07:29:39 GMT" name="delete_event"/>
+ <child>
+ <object class="GtkScrolledWindow" id="function_call_tree_scrolled">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+ <child>
+ <object class="GtkTreeView" id="function_call_tree_view">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">True</property>
+ <property name="rules_hint">True</property>
+ <property name="reorderable">False</property>
+ <property name="enable_search">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+</interface>
diff --git a/plugins/profiler/profiler.glade b/plugins/profiler/profiler.glade
deleted file mode 100644
index 7c2961d..0000000
--- a/plugins/profiler/profiler.glade
+++ /dev/null
@@ -1,640 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
-<glade-interface>
- <widget class="GtkDialog" id="select_target_dialog">
- <property name="width_request">400</property>
- <property name="height_request">350</property>
- <property name="visible">True</property>
- <property name="title" translatable="yes">Select Profiling Target</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox1">
- <property name="visible">True</property>
- <child>
- <widget class="GtkFrame" id="frame1">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <child>
- <widget class="GtkAlignment" id="alignment1">
- <property name="visible">True</property>
- <property name="left_padding">12</property>
- <child>
- <widget class="GtkVBox" id="vbox5">
- <property name="visible">True</property>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <child>
- <widget class="GtkTreeView" id="targets_list_view">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">False</property>
- <property name="enable_search">False</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkTable" id="table2">
- <property name="visible">True</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">2</property>
- <child>
- <widget class="GtkButton" id="select_other_target_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">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="response_id">0</property>
- <child>
- <widget class="GtkHBox" id="hbox2">
- <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="spacing">2</property>
- <child>
- <widget class="GtkImage" id="image1">
- <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="stock">gtk-open</property>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label2">
- <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">Select Other Target...</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="profiling_options_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="response_id">0</property>
- <child>
- <widget class="GtkAlignment" id="alignment5">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <widget class="GtkHBox" id="hbox1">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkImage" id="image3">
- <property name="visible">True</property>
- <property name="stock">gtk-preferences</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label8">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Options...</property>
- <property name="use_underline">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="padding">5</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Select Target to Profile</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
- <child>
- <widget class="GtkButton" id="cancelbutton1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="label">gtk-cancel</property>
- <property name="use_stock">True</property>
- <property name="response_id">-6</property>
- </widget>
- </child>
- <child>
- <widget class="GtkButton" id="okbutton1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="label">gtk-ok</property>
- <property name="use_stock">True</property>
- <property name="response_id">-5</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <widget class="GtkDialog" id="profiling_options_dialog">
- <property name="height_request">500</property>
- <property name="title" translatable="yes">Profiling Options</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox2">
- <property name="visible">True</property>
- <child>
- <widget class="GtkNotebook" id="notebook1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <child>
- <widget class="GtkVBox" id="vbox1">
- <property name="visible">True</property>
- <child>
- <widget class="GtkCheckButton" id="automatic_refresh_check">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Automatically refresh profile data display</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="no_show_static_check">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Do not show static functions</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="show_possible_called_check">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Show functions that could have been called but never were</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="show_uncalled_check">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Show uncalled functions</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkFrame" id="frame4">
- <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">GTK_SHADOW_NONE</property>
- <child>
- <widget class="GtkAlignment" id="alignment2">
- <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="left_padding">12</property>
- <child>
- <widget class="GtkVBox" id="vbox6">
- <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>
- <widget class="GtkLabel" id="label10">
- <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="xalign">0</property>
- <property name="label" translatable="yes">Use this profiling data file:</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox3">
- <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>
- <widget class="GtkEntry" id="profile_data_file_entry">
- <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>
- </widget>
- </child>
- <child>
- <widget class="GtkButton" id="profile_data_browse_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">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">Browse...</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label9">
- <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"><b>Profiling Data</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">4</property>
- </packing>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="label" translatable="yes">General</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox2">
- <property name="visible">True</property>
- <child>
- <widget class="GtkFrame" id="frame2">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <child>
- <widget class="GtkAlignment" id="alignment3">
- <property name="visible">True</property>
- <property name="left_padding">12</property>
- <child>
- <widget class="GtkVBox" id="vbox3">
- <property name="visible">True</property>
- <child>
- <widget class="GtkRadioButton" id="show_all_symbols_radio">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Show all symbols</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton" id="include_symbols_radio">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Show only these symbols:</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">show_all_symbols_radio</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton" id="exclude_symbols_radio">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Do not show these symbols:</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">show_all_symbols_radio</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <child>
- <widget class="GtkTextView" id="symbols_text_view">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Symbols</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkFrame" id="frame3">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <child>
- <widget class="GtkAlignment" id="alignment4">
- <property name="visible">True</property>
- <property name="left_padding">12</property>
- <child>
- <widget class="GtkVBox" id="vbox4">
- <property name="visible">True</property>
- <child>
- <widget class="GtkRadioButton" id="propagate_all_symbols_radio">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Propagate time for all symbols</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton" id="propagate_include_symbols_radio">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Propagate time for only these symbols:</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">propagate_all_symbols_radio</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton" id="propagate_exclude_symbols_radio">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Do not propagate time for these symbols:</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">propagate_all_symbols_radio</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow3">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <child>
- <widget class="GtkTextView" id="propagation_text_view">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label6">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Time Propagation</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHSeparator" id="hseparator1">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="padding">2</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkTable" id="table1">
- <property name="visible">True</property>
- <property name="n_columns">2</property>
- <child>
- <widget class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Enter one symbol specification per line.
-
-For information on symbol specifications, see section
-4.5 of the gprof info page.</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkImage" id="image2">
- <property name="visible">True</property>
- <property name="stock">gtk-dialog-info</property>
- <property name="icon_size">6</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="padding">2</property>
- <property name="position">3</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="label" translatable="yes" comment="this is a graph of function calls">Call Graph</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area2">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
- <child>
- <widget class="GtkButton" id="closebutton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="label">gtk-close</property>
- <property name="use_stock">True</property>
- <property name="response_id">-7</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
-</glade-interface>
diff --git a/plugins/profiler/profiler.ui b/plugins/profiler/profiler.ui
index f6a3dff..acf53a7 100644
--- a/plugins/profiler/profiler.ui
+++ b/plugins/profiler/profiler.ui
@@ -1,17 +1,612 @@
-<!--*- xml -*-->
-<ui>
- <menubar name="MenuMain">
- <placeholder name="PlaceHolderDebugMenus">
- <menu name="MenuDebug" action="ActionMenuDebug">
- <placeholder name="PlaceholderProfilerMenus">
- <separator name="separator1"/>
- <menu name="Profiler" action="ActionMenuProfiler">
- <menuitem name="Select Target" action="ActionProfilerSelectTarget" />
- <menuitem name="Refresh" action="ActionProfilerRefresh" />
- <menuitem name="Delete Data" action="ActionProfilerDeleteData" />
- </menu>
- </placeholder>
- </menu>
- </placeholder>
- </menubar>
-</ui>
+<?xml version="1.0"?>
+<!--*- mode: xml -*-->
+<interface>
+ <object class="GtkDialog" id="select_target_dialog">
+ <property name="width_request">400</property>
+ <property name="height_request">350</property>
+ <property name="title" translatable="yes">Select Profiling Target</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox1">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox5">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <child>
+ <object class="GtkTreeView" id="targets_list_view">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
+ <property name="enable_search">False</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkTable" id="table2">
+ <property name="visible">True</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">2</property>
+ <child>
+ <object class="GtkButton" id="select_other_target_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">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="GtkHBox" id="hbox2">
+ <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="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image1">
+ <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="stock">gtk-open</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <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">Select Other Target...</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="profiling_options_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+ <object class="GtkAlignment" id="alignment5">
+ <property name="visible">True</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image3">
+ <property name="visible">True</property>
+ <property name="stock">gtk-preferences</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Options...</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="padding">5</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Select Target to Profile</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <child>
+ <object class="GtkButton" id="cancelbutton1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="label">gtk-cancel</property>
+ <property name="use_stock">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkButton" id="okbutton1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="label">gtk-ok</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">cancelbutton1</action-widget>
+ <action-widget response="-5">okbutton1</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="profiling_options_dialog">
+ <property name="height_request">500</property>
+ <property name="title" translatable="yes">Profiling Options</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox2">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkNotebook" id="notebook1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkCheckButton" id="automatic_refresh_check">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Automatically refresh profile data display</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="no_show_static_check">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Do not show static functions</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="show_possible_called_check">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Show functions that could have been called but never were</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="show_uncalled_check">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Show uncalled functions</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame4">
+ <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">GTK_SHADOW_NONE</property>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <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="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox6">
+ <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="GtkLabel" id="label10">
+ <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="xalign">0</property>
+ <property name="label" translatable="yes">Use this profiling data file:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox3">
+ <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="GtkEntry" id="profile_data_file_entry">
+ <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>
+ </object>
+ </child>
+ <child>
+ <object class="GtkButton" id="profile_data_browse_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">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">Browse...</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label9">
+ <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"><b>Profiling Data</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">General</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox2">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox3">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkRadioButton" id="show_all_symbols_radio">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Show all symbols</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="include_symbols_radio">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Show only these symbols:</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">show_all_symbols_radio</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="exclude_symbols_radio">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Do not show these symbols:</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">show_all_symbols_radio</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <child>
+ <object class="GtkTextView" id="symbols_text_view">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Symbols</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame3">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <child>
+ <object class="GtkAlignment" id="alignment4">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox4">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkRadioButton" id="propagate_all_symbols_radio">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Propagate time for all symbols</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="propagate_include_symbols_radio">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Propagate time for only these symbols:</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">propagate_all_symbols_radio</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="propagate_exclude_symbols_radio">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Do not propagate time for these symbols:</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">propagate_all_symbols_radio</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow3">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <child>
+ <object class="GtkTextView" id="propagation_text_view">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Time Propagation</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHSeparator" id="hseparator1">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="padding">2</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="table1">
+ <property name="visible">True</property>
+ <property name="n_columns">2</property>
+ <child>
+ <object class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Enter one symbol specification per line.
+
+For information on symbol specifications, see section
+4.5 of the gprof info page.</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="stock">gtk-dialog-info</property>
+ <property name="icon_size">6</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="padding">2</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Call Graph</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area2">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <child>
+ <object class="GtkButton" id="closebutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="label">gtk-close</property>
+ <property name="use_stock">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-7">closebutton</action-widget>
+ </action-widgets>
+ </object>
+</interface>
diff --git a/plugins/scintilla/Makefile.am b/plugins/scintilla/Makefile.am
index 8b94322..e549db4 100644
--- a/plugins/scintilla/Makefile.am
+++ b/plugins/scintilla/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = scintilla properties
# Plugin glade file
editor_gladedir = $(anjuta_glade_dir)
-editor_glade_DATA = anjuta-editor-scintilla.glade
+editor_glade_DATA = anjuta-editor-scintilla.ui
# Plugin Icon file
editor_pixmapsdir = $(anjuta_image_dir)
@@ -26,7 +26,6 @@ AM_CPPFLAGS = \
$(LIBANJUTA_CFLAGS) \
$(GTK_CFLAGS) \
$(GLIB_CFLAGS) \
- $(GLADE_CFLAGS) \
$(EXTRA_CFLAGS) \
-I$(srcdir)/scintilla/include \
-DG_LOG_DOMAIN=\"libanjuta-scintilla\"
@@ -38,7 +37,6 @@ libanjuta_editor_la_LIBADD = \
$(LIBANJUTA_LIBS) \
$(GTK_LIBS) \
$(GLIB_LIBS) \
- $(GLADE_LIBS) \
scintilla/libanjuta-scintilla.la
libanjuta_editor_la_SOURCES= \
@@ -72,7 +70,7 @@ libanjuta_editor_la_SOURCES= \
anjuta-pcmark-16.xpm \
anjuta-linemark-16.xpm
-prefs_glade_files = anjuta-editor-scintilla.glade
+prefs_ui_files = anjuta-editor-scintilla.ui
include $(top_srcdir)/scripts/build-schemas.mk
endif
diff --git a/plugins/scintilla/anjuta-editor-scintilla.glade b/plugins/scintilla/anjuta-editor-scintilla.ui
similarity index 76%
rename from plugins/scintilla/anjuta-editor-scintilla.glade
rename to plugins/scintilla/anjuta-editor-scintilla.ui
index db74ae6..2dec211 100644
--- a/plugins/scintilla/anjuta-editor-scintilla.glade
+++ b/plugins/scintilla/anjuta-editor-scintilla.ui
@@ -1,58 +1,143 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<?xml version="1.0"?>
<!--*- mode: xml -*-->
-<glade-interface>
- <widget class="GtkWindow" id="preferences_dialog">
+<interface>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">50</property>
+ <property name="lower">0</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">0</property>
+ <property name="value">3</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment2">
+ <property name="upper">500</property>
+ <property name="lower">0</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">0</property>
+ <property name="value">80</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment3">
+ <property name="upper">10000</property>
+ <property name="lower">100</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">10</property>
+ <property name="page_size">0</property>
+ <property name="value">212</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment4">
+ <property name="upper">3</property>
+ <property name="lower">1</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">0</property>
+ <property name="value">1</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment5">
+ <property name="upper">200</property>
+ <property name="lower">10</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">0</property>
+ <property name="value">40</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment6">
+ <property name="upper">100</property>
+ <property name="lower">1</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">0</property>
+ <property name="value">4</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment7">
+ <property name="upper">100</property>
+ <property name="lower">1</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">0</property>
+ <property name="value">4</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment8">
+ <property name="upper">1000</property>
+ <property name="lower">0</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">0</property>
+ <property name="value">1</property>
+ </object>
+ <object class="GtkListStore" id="model1">
+ <columns>
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Plus/Minus</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Arrows</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Circular</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Squares</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="model2">
+ <columns>
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkWindow" id="preferences_dialog">
<property name="title" translatable="yes">window1</property>
<child>
- <widget class="GtkNotebook" id="Editor">
+ <object class="GtkNotebook" id="prefs_editor">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <widget class="GtkHBox" id="page1">
+ <object class="GtkHBox" id="page1">
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="spacing">5</property>
<child>
- <widget class="GtkVBox" id="vbox31">
+ <object class="GtkVBox" id="vbox31">
<property name="visible">True</property>
<property name="spacing">5</property>
<child>
<placeholder/>
</child>
<child>
- <widget class="GtkFrame" id="frame45">
+ <object class="GtkFrame" id="frame45">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
- <widget class="GtkVBox" id="vbox1118">
+ <object class="GtkVBox" id="vbox1118">
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="spacing">5</property>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:0:0:autocomplete.choose.single">
+ <object class="GtkCheckButton" id="preferences_toggle:bool:0:0:autocomplete.choose.single">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Choose autocomplete for single match</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:1:0:xml.auto.close.tags">
+ <object class="GtkCheckButton" id="preferences_toggle:bool:1:0:xml.auto.close.tags">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Autocomplete XML/HTML closing tags</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -60,89 +145,84 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox1122">
+ <object class="GtkHBox" id="hbox1122">
<property name="visible">True</property>
<property name="spacing">5</property>
<child>
- <widget class="GtkSpinButton" id="preferences_spin:int:3:0:autocompleteword.automatic">
+ <object class="GtkSpinButton" id="preferences_spin:int:3:0:autocompleteword.automatic">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">3 0 50 1 10 0</property>
+ <property name="adjustment">adjustment1</property>
<property name="climb_rate">1</property>
<property name="numeric">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label1295">
+ <object class="GtkLabel" id="label1295">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Autocompletion pop up choices</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label12334">
+ <child type="label">
+ <object class="GtkLabel" id="label12334">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Autocompletion</b></property>
<property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame44">
+ <object class="GtkFrame" id="frame44">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
- <widget class="GtkVBox" id="vbox40">
+ <object class="GtkVBox" id="vbox40">
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="spacing">5</property>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:1:0:fold">
+ <object class="GtkCheckButton" id="preferences_toggle:bool:1:0:fold">
<property name="can_focus">True</property>
<property name="label" translatable="yes">Enable code folding</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:1:0:fold.comment">
+ <object class="GtkCheckButton" id="preferences_toggle:bool:1:0:fold.comment">
<property name="can_focus">True</property>
<property name="label" translatable="yes">Enable comments folding</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -150,13 +230,12 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:1:0:fold.comment.python">
+ <object class="GtkCheckButton" id="preferences_toggle:bool:1:0:fold.comment.python">
<property name="can_focus">True</property>
<property name="label" translatable="yes">Enable python comments folding</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -164,13 +243,12 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:1:0:fold.quotes.python">
+ <object class="GtkCheckButton" id="preferences_toggle:bool:1:0:fold.quotes.python">
<property name="can_focus">True</property>
<property name="label" translatable="yes">Enable python quoted strings folding</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -178,13 +256,12 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:1:0:fold.html">
+ <object class="GtkCheckButton" id="preferences_toggle:bool:1:0:fold.html">
<property name="can_focus">True</property>
<property name="label" translatable="yes">Enable HTML tags folding</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -192,13 +269,12 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:1:0:fold.compact">
+ <object class="GtkCheckButton" id="preferences_toggle:bool:1:0:fold.compact">
<property name="can_focus">True</property>
<property name="label" translatable="yes">Compact folding</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -206,14 +282,13 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:1:0:fold.underline">
+ <object class="GtkCheckButton" id="preferences_toggle:bool:1:0:fold.underline">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Draw line below folded lines</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -221,14 +296,13 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:0:0:fold.on.open">
+ <object class="GtkCheckButton" id="preferences_toggle:bool:0:0:fold.on.open">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Collapse all code folds on file open</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -236,98 +310,96 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox1112">
+ <object class="GtkHBox" id="hbox1112">
<property name="visible">True</property>
<child>
- <widget class="GtkLabel" id="label12325">
+ <object class="GtkLabel" id="label12325">
<property name="visible">True</property>
<property name="label" translatable="yes">Fold style:</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="preferences_combo:text:Plus/Minus,Arrows,Circular,Squares:0:fold.symbols">
+ <object class="GtkComboBox" id="preferences_combo:text:Plus/Minus,Arrows,Circular,Squares:0:fold.symbols">
<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="items" translatable="yes">Plus/Minus
-Arrows
-Circular
-Squares</property>
- </widget>
+ <property name="model">model1</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">8</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label1297">
+ <child type="label">
+ <object class="GtkLabel" id="label1297">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Code folding</b></property>
<property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox32">
+ <object class="GtkVBox" id="vbox32">
<property name="visible">True</property>
<property name="spacing">5</property>
<child>
- <widget class="GtkFrame" id="frame47">
+ <object class="GtkFrame" id="frame47">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
- <widget class="GtkVBox" id="vbox1120">
+ <object class="GtkVBox" id="vbox1120">
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="spacing">5</property>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:0:0:disable.syntax.hilighting">
+ <object class="GtkCheckButton" id="preferences_toggle:bool:0:0:disable.syntax.hilighting">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Disable syntax highlighting</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:1:0:braces.check">
+ <object class="GtkCheckButton" id="preferences_toggle:bool:1:0:braces.check">
<property name="can_focus">True</property>
<property name="label" translatable="yes">Enable braces check</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -335,13 +407,12 @@ Squares</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:0:0:strip.trailing.spaces">
+ <object class="GtkCheckButton" id="preferences_toggle:bool:0:0:strip.trailing.spaces">
<property name="can_focus">True</property>
<property name="label" translatable="yes">Strip trailling spaces on file save</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -349,13 +420,12 @@ Squares</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:0:0:editor.doseol">
+ <object class="GtkCheckButton" id="preferences_toggle:bool:0:0:editor.doseol">
<property name="can_focus">True</property>
<property name="label" translatable="yes">Filter extraneous characters in DOS mode</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -363,13 +433,12 @@ Squares</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:1:0:editor.wrapbookmarks">
+ <object class="GtkCheckButton" id="preferences_toggle:bool:1:0:editor.wrapbookmarks">
<property name="can_focus">True</property>
- <property name="label" translatable="yes" comments="Next bookmark at the end of the file will jump to the first bookmark from the beginning">Wrap bookmarks search around</property>
+ <property comments="Next bookmark at the end of the file will jump to the first bookmark from the beginning" name="label" translatable="yes">Wrap bookmarks search around</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -377,185 +446,180 @@ Squares</property>
</packing>
</child>
<child>
- <widget class="GtkTable" id="table14">
+ <object class="GtkTable" id="table14">
<property name="visible">True</property>
<property name="n_rows">4</property>
<property name="n_columns">2</property>
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
<child>
- <widget class="GtkSpinButton" id="preferences_spin:int:80:0:edge.column">
+ <object class="GtkSpinButton" id="preferences_spin:int:80:0:edge.column">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">80 0 500 1 10 0</property>
+ <property name="adjustment">adjustment2</property>
<property name="climb_rate">1</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="preferences_spin:int:350:0:caret.period">
+ <object class="GtkSpinButton" id="preferences_spin:int:350:0:caret.period">
<property name="can_focus">True</property>
- <property name="adjustment">212 100 10000 10 10 0</property>
+ <property name="adjustment">adjustment3</property>
<property name="climb_rate">10</property>
<property name="numeric">True</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="preferences_spin:int:2:0:caret.width">
+ <object class="GtkSpinButton" id="preferences_spin:int:2:0:caret.width">
<property name="can_focus">True</property>
- <property name="adjustment">1 1 3 1 10 0</property>
+ <property name="adjustment">adjustment4</property>
<property name="climb_rate">1</property>
<property name="numeric">True</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label1301">
+ <object class="GtkLabel" id="label1301">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes" comments="Column where a vertical line will be drawn to indicate that lines should not be longer">Edge column</property>
- </widget>
+ <property comments="Column where a vertical line will be drawn to indicate that lines should not be longer" name="label" translatable="yes">Edge column</property>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label1300">
+ <object class="GtkLabel" id="label1300">
<property name="xalign">0</property>
<property name="label" translatable="yes">Caret blink period in ms</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label1294">
+ <object class="GtkLabel" id="label1294">
<property name="xalign">0</property>
<property name="label" translatable="yes">Editor caret (cursor) width in pixels</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="preferences_spin:int:40:0:margin.linenumber.width">
+ <object class="GtkSpinButton" id="preferences_spin:int:40:0:margin.linenumber.width">
<property name="can_focus">True</property>
- <property name="adjustment">40 10 200 1 10 0</property>
+ <property name="adjustment">adjustment5</property>
<property name="climb_rate">1</property>
<property name="numeric">True</property>
- </widget>
+ </object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label114">
+ <object class="GtkLabel" id="label114">
<property name="xalign">0</property>
<property name="label" translatable="yes">Line numbers margin width in pixels</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">5</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label12337">
+ <child type="label">
+ <object class="GtkLabel" id="label12337">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Misc options</b></property>
<property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="style_button">
+ <object class="GtkButton" id="style_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Colors & Fonts</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label12350">
+ <child type="tab">
+ <object class="GtkLabel" id="label12350">
<property name="visible">True</property>
<property name="label" translatable="yes">Editor</property>
- </widget>
+ </object>
<packing>
- <property name="type">tab</property>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="page2">
+ <object class="GtkFrame" id="page2">
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="label_xalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
- <widget class="GtkVBox" id="vbox1111">
+ <object class="GtkVBox" id="vbox1111">
<property name="visible">True</property>
<child>
- <widget class="GtkTable" id="table15">
+ <object class="GtkTable" id="table15">
<property name="visible">True</property>
<property name="border_width">10</property>
<property name="n_rows">5</property>
@@ -569,74 +633,70 @@ Squares</property>
<placeholder/>
</child>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:1:1:indent.automatic">
+ <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:indent.automatic">
<property name="can_focus">True</property>
<property name="label" translatable="yes">Enable automatic indentation</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:0:1:indent.maintain">
+ <object class="GtkCheckButton" id="preferences_toggle:bool:0:1:indent.maintain">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes" comments="If the user presses enter, the indentation of the current line will automatically be added to the next line">Maintain past Indentation</property>
+ <property comments="If the user presses enter, the indentation of the current line will automatically be added to the next line" name="label" translatable="yes">Maintain past Indentation</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:0:0:tab.indents">
+ <object class="GtkCheckButton" id="preferences_toggle:bool:0:0:tab.indents">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Pressing tab inserts indentation</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">4</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:0:0:backspace.unindents">
+ <object class="GtkCheckButton" id="preferences_toggle:bool:0:0:backspace.unindents">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Pressing backspace un-indents</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">4</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkVSeparator" id="vseparator1">
+ <object class="GtkVSeparator" id="vseparator1">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -646,112 +706,109 @@ Squares</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:0:1:indent.closing">
+ <object class="GtkCheckButton" id="preferences_toggle:bool:0:1:indent.closing">
<property name="can_focus">True</property>
<property name="label" translatable="yes">Indent closing braces</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:0:1:indent.opening">
+ <object class="GtkCheckButton" id="preferences_toggle:bool:0:1:indent.opening">
<property name="can_focus">True</property>
<property name="label" translatable="yes">Indent opening braces</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:1:1:use.tabs">
+ <object class="GtkCheckButton" id="preferences_toggle:bool:1:1:use.tabs">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Use tabs for indentation</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="preferences_spin:int:4:1:indent.size">
+ <object class="GtkSpinButton" id="preferences_spin:int:4:1:indent.size">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">4 1 100 1 10 0</property>
+ <property name="adjustment">adjustment6</property>
<property name="climb_rate">1</property>
<property name="numeric">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="preferences_spin:int:4:1:tabsize">
+ <object class="GtkSpinButton" id="preferences_spin:int:4:1:tabsize">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">4 1 100 1 10 0</property>
+ <property name="adjustment">adjustment7</property>
<property name="climb_rate">1</property>
<property name="numeric">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label123">
+ <object class="GtkLabel" id="label123">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Indentation size in spaces:</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label122">
+ <object class="GtkLabel" id="label122">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Tab size in spaces:</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -766,42 +823,35 @@ Squares</property>
<child>
<placeholder/>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label12321">
+ <child type="label">
+ <object class="GtkLabel" id="label12321">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Basic Indentation</b></property>
<property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label12351">
+ <child type="tab">
+ <object class="GtkLabel" id="label12351">
<property name="visible">True</property>
<property name="label" translatable="yes">Basic Indentation</property>
- </widget>
+ </object>
<packing>
- <property name="type">tab</property>
<property name="position">1</property>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="page3">
+ <object class="GtkFrame" id="page3">
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="label_xalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
- <widget class="GtkTable" id="table17">
+ <object class="GtkTable" id="table17">
<property name="visible">True</property>
<property name="border_width">10</property>
<property name="n_rows">5</property>
@@ -815,30 +865,28 @@ Squares</property>
<placeholder/>
</child>
<child>
- <widget class="GtkVBox" id="vbox1127">
+ <object class="GtkVBox" id="vbox1127">
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:0:0:view.eol">
+ <object class="GtkCheckButton" id="preferences_toggle:bool:0:0:view.eol">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">View EOL chars</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:0:0:view.indentation.guides">
+ <object class="GtkCheckButton" id="preferences_toggle:bool:0:0:view.indentation.guides">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">View Indentation Guides</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -846,14 +894,13 @@ Squares</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:0:0:whitespace">
+ <object class="GtkCheckButton" id="preferences_toggle:bool:0:0:whitespace">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">View Whitespaces</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -861,14 +908,13 @@ Squares</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:0:0:view.indentation.whitespace">
+ <object class="GtkCheckButton" id="preferences_toggle:bool:0:0:view.indentation.whitespace">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">View indentation whitespaces</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -876,14 +922,13 @@ Squares</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:0:0:view.line.wrap">
+ <object class="GtkCheckButton" id="preferences_toggle:bool:0:0:view.line.wrap">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">View Line Wrap</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -891,14 +936,13 @@ Squares</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:1:0:margin.linenumber.visible">
+ <object class="GtkCheckButton" id="preferences_toggle:bool:1:0:margin.linenumber.visible">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Margin Linenum visible</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -906,14 +950,13 @@ Squares</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:1:0:margin.marker.visible">
+ <object class="GtkCheckButton" id="preferences_toggle:bool:1:0:margin.marker.visible">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Margin Marker visible</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -921,21 +964,20 @@ Squares</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:1:0:margin.fold.visible">
+ <object class="GtkCheckButton" id="preferences_toggle:bool:1:0:margin.fold.visible">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Margin Fold visible</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">7</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
@@ -943,178 +985,167 @@ Squares</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label133">
+ <object class="GtkLabel" id="label133">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Lines</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="preferences_spin:int:1:0:print.linenumber.count">
+ <object class="GtkSpinButton" id="preferences_spin:int:1:0:print.linenumber.count">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">1 0 1000 1 10 0</property>
+ <property name="adjustment">adjustment8</property>
<property name="climb_rate">1</property>
<property name="numeric">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label132">
+ <object class="GtkLabel" id="label132">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Add line number every:</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:1:0:print.linewrap">
+ <object class="GtkCheckButton" id="preferences_toggle:bool:1:0:print.linewrap">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Enable line wrap</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="right_attach">3</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="preferences_toggle:bool:1:0:print.header">
+ <object class="GtkCheckButton" id="preferences_toggle:bool:1:0:print.header">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Add page header</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="right_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radiobutton4">
+ <object class="GtkRadioButton" id="radiobutton4">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Monochrome</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
<property name="group">preferences_toggle:bool:1:0:print.color</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="preferences_toggle:bool:1:0:print.color">
+ <object class="GtkRadioButton" id="preferences_toggle:bool:1:0:print.color">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Colour</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label131">
+ <object class="GtkLabel" id="label131">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Mode:</property>
- </widget>
+ </object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label129">
+ <child type="label">
+ <object class="GtkLabel" id="label129">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Print options</b></property>
<property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label12352">
+ <child type="tab">
+ <object class="GtkLabel" id="label12352">
<property name="visible">True</property>
<property name="label" translatable="yes">Printing</property>
- </widget>
+ </object>
<packing>
- <property name="type">tab</property>
<property name="position">2</property>
<property name="tab_fill">False</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="style_editor_dialog">
+ </object>
+ <object class="GtkDialog" id="style_editor_dialog">
<property name="title" translatable="yes">Fonts and colors for editor</property>
<property name="destroy_with_parent">True</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="vbox1">
+ <object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<child>
- <widget class="GtkVBox" id="Editor">
+ <object class="GtkVBox" id="style_editor">
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="spacing">5</property>
<child>
- <widget class="GtkFrame" id="frame1">
+ <object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
- <widget class="GtkTable" id="table2">
+ <object class="GtkTable" id="table2">
<property name="visible">True</property>
<property name="border_width">10</property>
<property name="n_rows">6</property>
@@ -1122,53 +1153,50 @@ Squares</property>
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
<child>
- <widget class="GtkFontButton" id="font">
+ <object class="GtkFontButton" id="font">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkColorButton" id="back_color">
+ <object class="GtkColorButton" id="back_color">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkColorButton" id="fore_color">
+ <object class="GtkColorButton" id="fore_color">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkHSeparator" id="hseparator1">
+ <object class="GtkHSeparator" id="hseparator1">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="right_attach">3</property>
<property name="top_attach">1</property>
@@ -1178,60 +1206,64 @@ Squares</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox7">
+ <object class="GtkHBox" id="hbox7">
<property name="visible">True</property>
<property name="spacing">5</property>
<child>
- <widget class="GtkLabel" id="label11">
+ <object class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="label" translatable="yes">Select highlight style to edit:</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="comboBox">
+ <object class="GtkComboBox" id="comboBox">
<property name="visible">True</property>
- <property name="items" translatable="no"></property>
- </widget>
+ <property name="model">model2</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox6">
+ <object class="GtkHBox" id="hbox6">
<property name="visible">True</property>
<child>
- <widget class="GtkCheckButton" id="bold">
+ <object class="GtkCheckButton" id="bold">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Bold</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="italic">
+ <object class="GtkCheckButton" id="italic">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Italic</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1239,21 +1271,20 @@ Squares</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="underlined">
+ <object class="GtkCheckButton" id="underlined">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Underlined</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
@@ -1264,153 +1295,146 @@ Squares</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="back_default">
+ <object class="GtkCheckButton" id="back_default">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Use default</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="fore_default">
+ <object class="GtkCheckButton" id="fore_default">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Use default</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="attributes_default">
+ <object class="GtkCheckButton" id="attributes_default">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Use default</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="font_default">
+ <object class="GtkCheckButton" id="font_default">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Use default</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label10">
+ <object class="GtkLabel" id="label10">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Background color:</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label9">
+ <object class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Foreground color:</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label8">
+ <object class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Attributes:</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label7">
+ <object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Font:</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label12">
+ <child type="label">
+ <object class="GtkLabel" id="label12">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Highlight style</b></property>
<property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame2">
+ <object class="GtkFrame" id="frame2">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
- <widget class="GtkTable" id="table3">
+ <object class="GtkTable" id="table3">
<property name="visible">True</property>
<property name="border_width">10</property>
<property name="n_rows">2</property>
@@ -1418,184 +1442,193 @@ Squares</property>
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
<child>
- <widget class="GtkColorButton" id="caret">
+ <object class="GtkColorButton" id="caret">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkColorButton" id="calltip">
+ <object class="GtkColorButton" id="calltip">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkColorButton" id="selection_back">
+ <object class="GtkColorButton" id="selection_back">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkColorButton" id="selection_fore">
+ <object class="GtkColorButton" id="selection_fore">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label16">
+ <object class="GtkLabel" id="label16">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Caret (cursor) color:</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label15">
+ <object class="GtkLabel" id="label15">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Calltip background:</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label14">
+ <object class="GtkLabel" id="label14">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Selection background:</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label13">
+ <object class="GtkLabel" id="label13">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Selection foreground:</property>
- </widget>
+ </object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label17">
+ <child type="label">
+ <object class="GtkLabel" id="label17">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Other colors</b></property>
<property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">2</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="hbuttonbox1">
+ <object class="GtkHButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="button1">
+ <object class="GtkButton" id="button1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
- <property name="response_id">-6</property>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkButton" id="button2">
+ <object class="GtkButton" id="button2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="label">gtk-apply</property>
<property name="use_stock">True</property>
- <property name="response_id">-10</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button3">
+ <object class="GtkButton" id="button3">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="label">gtk-ok</property>
<property name="use_stock">True</property>
- <property name="response_id">-5</property>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="pack_type">GTK_PACK_END</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
-</glade-interface>
+ <action-widgets>
+ <action-widget response="0">font</action-widget>
+ <action-widget response="0">back_color</action-widget>
+ <action-widget response="0">fore_color</action-widget>
+ <action-widget response="0">bold</action-widget>
+ <action-widget response="0">italic</action-widget>
+ <action-widget response="0">underlined</action-widget>
+ <action-widget response="0">back_default</action-widget>
+ <action-widget response="0">fore_default</action-widget>
+ <action-widget response="0">attributes_default</action-widget>
+ <action-widget response="0">font_default</action-widget>
+ <action-widget response="0">caret</action-widget>
+ <action-widget response="0">calltip</action-widget>
+ <action-widget response="0">selection_back</action-widget>
+ <action-widget response="0">selection_fore</action-widget>
+ <action-widget response="-6">button1</action-widget>
+ <action-widget response="-10">button2</action-widget>
+ <action-widget response="-5">button3</action-widget>
+ </action-widgets>
+ </object>
+</interface>
diff --git a/plugins/scintilla/plugin.c b/plugins/scintilla/plugin.c
index 149bbbc..350eb5a 100644
--- a/plugins/scintilla/plugin.c
+++ b/plugins/scintilla/plugin.c
@@ -35,7 +35,7 @@
#include "style-editor.h"
#include "text_editor.h"
-#define PREFS_GLADE PACKAGE_DATA_DIR"/glade/anjuta-editor-scintilla.glade"
+#define PREFS_GLADE PACKAGE_DATA_DIR"/glade/anjuta-editor-scintilla.ui"
#define ICON_FILE "anjuta-editor-scintilla-plugin-48.png"
gpointer parent_class;
@@ -120,15 +120,20 @@ itext_editor_factory_iface_init (IAnjutaEditorFactoryIface *iface)
static void
ipreferences_merge(IAnjutaPreferences* ipref, AnjutaPreferences* prefs, GError** e)
{
- GladeXML* gxml;
+ GtkBuilder* bxml = gtk_builder_new ();
EditorPlugin* plugin = ANJUTA_PLUGIN_EDITOR (ipref);
- gxml = glade_xml_new (PREFS_GLADE, "preferences_dialog", NULL);
- plugin->style_button = glade_xml_get_widget(gxml, "style_button");
+ GError* error = NULL;
+ if (!gtk_builder_add_from_file (bxml, PREFS_GLADE, &error))
+ {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ g_error_free (error);
+ }
+ plugin->style_button = GTK_WIDGET (gtk_builder_get_object (bxml, "style_button"));
g_signal_connect(G_OBJECT(plugin->style_button), "clicked",
G_CALLBACK(on_style_button_clicked), prefs);
- anjuta_preferences_add_page (prefs,
- gxml, "Editor", _("Scintilla Editor"), ICON_FILE);
- g_object_unref(gxml);
+ anjuta_preferences_add_from_builder (prefs,
+ bxml, "prefs_editor", _("Scintilla Editor"), ICON_FILE);
+ g_object_unref(bxml);
}
static void
diff --git a/plugins/scintilla/style-editor.c b/plugins/scintilla/style-editor.c
index 0cfb432..8b516fe 100644
--- a/plugins/scintilla/style-editor.c
+++ b/plugins/scintilla/style-editor.c
@@ -25,7 +25,6 @@
#include <gtk/gtk.h>
#include <gdk/gdk.h>
#include <gdk/gdkkeysyms.h>
-#include <glade/glade.h>
#include <libanjuta/anjuta-utils.h>
#include <libanjuta/anjuta-debug.h>
@@ -34,7 +33,7 @@
#include "style-editor.h"
#define string_assign(dest, src) g_free ((*dest)); (*dest) = g_strdup ((src));
-#define GLADE_FILE PACKAGE_DATA_DIR"/glade/anjuta-editor-scintilla.glade"
+#define GLADE_FILE PACKAGE_DATA_DIR"/glade/anjuta-editor-scintilla.ui"
gchar *hilite_style[] = {
"Normal <Default>", "style.anjuta.normal",
@@ -882,31 +881,37 @@ on_delete_event (GtkWidget *dialog, GdkEvent *event, StyleEditor *se)
static void
create_style_editor_gui (StyleEditor * se)
{
- GladeXML *gxml;
+ GtkBuilder *bxml = gtk_builder_new ();
GtkWidget *pref_dialog;
gint i;
+ GError* error = NULL;
g_return_if_fail (se);
g_return_if_fail (se->priv->dialog == NULL);
- gxml = glade_xml_new (GLADE_FILE, "style_editor_dialog", NULL);
- se->priv->dialog = glade_xml_get_widget (gxml, "style_editor_dialog");
+ if (!gtk_builder_add_from_file (bxml, GLADE_FILE, &error))
+ {
+ g_warning ("Couldn't load builder file: %s", error->message);
+ g_error_free (error);
+ }
+
+ se->priv->dialog = GTK_WIDGET (gtk_builder_get_object (bxml, "style_editor_dialog"));
gtk_widget_show (se->priv->dialog);
- se->priv->font_picker = glade_xml_get_widget (gxml, "font");
- se->priv->hilite_item_combobox = glade_xml_get_widget (gxml, "comboBox");
- se->priv->font_bold_check = glade_xml_get_widget (gxml, "bold");
- se->priv->font_italics_check = glade_xml_get_widget (gxml, "italic");
- se->priv->font_underlined_check = glade_xml_get_widget (gxml, "underlined");
- se->priv->fore_colorpicker = glade_xml_get_widget (gxml, "fore_color");
- se->priv->back_colorpicker = glade_xml_get_widget (gxml, "back_color");
- se->priv->font_use_default_check = glade_xml_get_widget (gxml, "font_default");
- se->priv->font_attrib_use_default_check = glade_xml_get_widget (gxml, "attributes_default");
- se->priv->fore_color_use_default_check = glade_xml_get_widget (gxml, "fore_default");
- se->priv->back_color_use_default_check = glade_xml_get_widget (gxml, "back_default");
- se->priv->caret_fore_color = glade_xml_get_widget (gxml, "caret");
- se->priv->calltip_back_color = glade_xml_get_widget (gxml, "calltip");
- se->priv->selection_fore_color = glade_xml_get_widget (gxml, "selection_fore");
- se->priv->selection_back_color = glade_xml_get_widget (gxml, "selection_back");
+ se->priv->font_picker = GTK_WIDGET (gtk_builder_get_object (bxml, "font"));
+ se->priv->hilite_item_combobox = GTK_WIDGET (gtk_builder_get_object (bxml, "comboBox"));
+ se->priv->font_bold_check = GTK_WIDGET (gtk_builder_get_object (bxml, "bold"));
+ se->priv->font_italics_check = GTK_WIDGET (gtk_builder_get_object (bxml, "italic"));
+ se->priv->font_underlined_check = GTK_WIDGET (gtk_builder_get_object (bxml, "underlined"));
+ se->priv->fore_colorpicker = GTK_WIDGET (gtk_builder_get_object (bxml, "fore_color"));
+ se->priv->back_colorpicker = GTK_WIDGET (gtk_builder_get_object (bxml, "back_color"));
+ se->priv->font_use_default_check = GTK_WIDGET (gtk_builder_get_object (bxml, "font_default"));
+ se->priv->font_attrib_use_default_check = GTK_WIDGET (gtk_builder_get_object (bxml, "attributes_default"));
+ se->priv->fore_color_use_default_check = GTK_WIDGET (gtk_builder_get_object (bxml, "fore_default"));
+ se->priv->back_color_use_default_check = GTK_WIDGET (gtk_builder_get_object (bxml, "back_default"));
+ se->priv->caret_fore_color = GTK_WIDGET (gtk_builder_get_object (bxml, "caret"));
+ se->priv->calltip_back_color = GTK_WIDGET (gtk_builder_get_object (bxml, "calltip"));
+ se->priv->selection_fore_color = GTK_WIDGET (gtk_builder_get_object (bxml, "selection_fore"));
+ se->priv->selection_back_color = GTK_WIDGET (gtk_builder_get_object (bxml, "selection_back"));
for (i = 0;; i += 2)
{
@@ -940,7 +945,7 @@ create_style_editor_gui (StyleEditor * se)
g_signal_connect (G_OBJECT (se->priv->dialog),
"response", G_CALLBACK (on_response),
se);
- g_object_unref (gxml);
+ g_object_unref (bxml);
}
StyleEditor *
diff --git a/plugins/scratchbox/Makefile.am b/plugins/scratchbox/Makefile.am
index 60c3658..f7fe0b1 100644
--- a/plugins/scratchbox/Makefile.am
+++ b/plugins/scratchbox/Makefile.am
@@ -1,6 +1,6 @@
# Plugin glade file
anjuta_gladedir = $(anjuta_glade_dir)
-anjuta_glade_DATA = anjuta-scratchbox.glade \
+anjuta_glade_DATA = anjuta-scratchbox.ui \
anjuta-scratchbox-panel.png
# Plugin Icon file
@@ -28,7 +28,6 @@ libanjuta_scratchbox_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
# Plugin dependencies
libanjuta_scratchbox_la_LIBADD = \
- $(GLADE_LIBS) \
$(GNOME_LIBS) \
$(LIBANJUTA_LIBS)
diff --git a/plugins/scratchbox/anjuta-scratchbox.glade b/plugins/scratchbox/anjuta-scratchbox.ui
similarity index 73%
rename from plugins/scratchbox/anjuta-scratchbox.glade
rename to plugins/scratchbox/anjuta-scratchbox.ui
index fe772d7..1d5c72b 100644
--- a/plugins/scratchbox/anjuta-scratchbox.glade
+++ b/plugins/scratchbox/anjuta-scratchbox.ui
@@ -1,32 +1,54 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<?xml version="1.0"?>
<!--*- mode: xml -*-->
-<glade-interface>
- <widget class="GtkWindow" id="preferences_dialog_scratchbox">
+<interface>
+ <object class="GtkListStore" id="model1">
+ <columns>
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Sbox1</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Sbox2</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="model2">
+ <columns>
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">host</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkWindow" id="preferences_dialog_scratchbox">
<property name="title" translatable="yes">window1</property>
<child>
- <widget class="GtkFrame" id="Scratchbox">
+ <object class="GtkFrame" id="Scratchbox">
<property name="visible">True</property>
<property name="border_width">10</property>
<property name="label_xalign">0</property>
<property name="label_yalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
- <widget class="GtkAlignment" id="alignment1">
+ <object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkTable" id="table1">
+ <object class="GtkTable" id="table1">
<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="column_spacing">5</property>
<property name="row_spacing">5</property>
<child>
- <widget class="GtkHSeparator" id="hseparator2">
+ <object class="GtkHSeparator" id="hseparator2">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
@@ -34,9 +56,9 @@
</packing>
</child>
<child>
- <widget class="GtkHSeparator" id="hseparator1">
+ <object class="GtkHSeparator" id="hseparator1">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="right_attach">2</property>
<property name="top_attach">4</property>
@@ -46,12 +68,12 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="xpad">5</property>
<property name="label" translatable="yes">Scratchbox directory:</property>
<property name="justify">GTK_JUSTIFY_RIGHT</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
@@ -60,12 +82,12 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label2">
+ <object class="GtkLabel" id="label2">
<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">Scratchbox version:</property>
<property name="justify">GTK_JUSTIFY_RIGHT</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
@@ -74,12 +96,17 @@
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="preferences_combo:text:Sbox1,Sbox2:0:scratchbox.version">
+ <object class="GtkComboBox" id="preferences_combo:text:Sbox1,Sbox2:0:scratchbox.version">
<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="items">Sbox1
-Sbox2</property>
- </widget>
+ <property name="model">model1</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -90,29 +117,29 @@ Sbox2</property>
</packing>
</child>
<child>
- <widget class="GtkFileChooserButton" id="preferences_folder:text:/scratchbox:0:build.scratchbox.path">
+ <object class="GtkFileChooserButton" id="preferences_folder:text:/scratchbox:0:build.scratchbox.path">
<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="preview_widget_active">False</property>
<property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
<property name="title" translatable="yes">Select Scratchbox Folder</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label3">
+ <object class="GtkLabel" id="label3">
<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">Scratchbox target:</property>
<property name="justify">GTK_JUSTIFY_RIGHT</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
@@ -121,29 +148,35 @@ Sbox2</property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="combo_target">
+ <object class="GtkComboBox" id="combo_target">
<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="items">host</property>
- </widget>
+ <property name="model">model2</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer2"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkTable" id="table2">
+ <child type="label">
+ <object class="GtkTable" id="table2">
<property name="visible">True</property>
<property name="homogeneous">True</property>
<child>
- <widget class="GtkLabel" id="label106">
+ <object class="GtkLabel" id="label106">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="yalign">0</property>
@@ -152,28 +185,25 @@ Sbox2</property>
</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_FILL</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
</packing>
</child>
<child>
- <widget class="GtkImage" id="anjuta-scratchbox-panel">
+ <object class="GtkImage" id="anjuta-scratchbox-panel">
<property name="visible">True</property>
<property name="pixbuf">anjuta-scratchbox-panel.png</property>
- </widget>
+ </object>
<packing>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </widget>
-</glade-interface>
+ </object>
+</interface>
diff --git a/plugins/scratchbox/plugin.c b/plugins/scratchbox/plugin.c
index 26b5423..4fa2bba 100644
--- a/plugins/scratchbox/plugin.c
+++ b/plugins/scratchbox/plugin.c
@@ -36,7 +36,7 @@
*---------------------------------------------------------------------------*/
#define ICON_FILE "anjuta-scratchbox-48.png"
-#define GLADE_FILE PACKAGE_DATA_DIR"/glade/anjuta-scratchbox.glade"
+#define GLADE_FILE PACKAGE_DATA_DIR"/glade/anjuta-scratchbox.ui"
#define SB_ENTRY "preferences_folder:text:/scratchbox:0:build.scratchbox.path"
#define SB_TARGET_ENTRY "combo_target"
@@ -68,7 +68,7 @@ struct _ScratchboxPlugin
GString *buffer;
};
-GladeXML *gxml;
+GtkBuilder *bxml;
#define EXECUTE_CMD 0
#define TARGET_LIST 1
@@ -121,8 +121,8 @@ static void on_list_terminated (AnjutaLauncher *launcher, gint child_pid,
str_splitted_length = g_strv_length (plugin->target_list) - 1;
GtkWidget* combo_target_entry;
- combo_target_entry = glade_xml_get_widget(gxml,
- SB_TARGET_ENTRY);
+ combo_target_entry = GTK_WIDGET(gtk_builder_get_object(bxml,
+ SB_TARGET_ENTRY));
for (i = 1; i < plugin->combo_element; i++)
gtk_combo_box_remove_text(GTK_COMBO_BOX(combo_target_entry), 1);
@@ -227,8 +227,8 @@ on_update_target(GtkComboBox *combo, ScratchboxPlugin *plugin)
plugin->buffer = g_string_new(NULL);
- combo_target_entry = glade_xml_get_widget(gxml,
- SB_TARGET_ENTRY);
+ combo_target_entry = GTK_WIDGET(gtk_builder_get_object(bxml,
+ SB_TARGET_ENTRY));
/* disable target combo box */
gtk_widget_set_sensitive(combo_target_entry, FALSE);
@@ -248,8 +248,8 @@ on_change_directory(GtkFileChooserButton *FileChooser, gpointer user_data)
GtkWidget* combo_sbox_entry;
gchar *old_dir;
- combo_sbox_entry = glade_xml_get_widget(gxml,
- SB_SBOX_ENTRY);
+ combo_sbox_entry = GTK_WIDGET(gtk_builder_get_object(bxml,
+ SB_SBOX_ENTRY));
old_dir = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER(FileChooser));
if (!plugin->user_dir || strcmp(old_dir, plugin->user_dir) != 0) {
@@ -445,17 +445,23 @@ ipreferences_merge(IAnjutaPreferences* ipref, AnjutaPreferences* prefs, GError**
GtkWidget* combo_target_entry;
GtkWidget *combo_sbox_entry;
GtkWidget *chooser_dir_entry;
+ GError* error = NULL;
/* Create the preferences page */
- gxml = glade_xml_new (GLADE_FILE,
- "preferences_dialog_scratchbox", NULL);
- combo_target_entry = glade_xml_get_widget(gxml, SB_TARGET_ENTRY);
- combo_sbox_entry = glade_xml_get_widget(gxml, SB_SBOX_ENTRY);
- chooser_dir_entry = glade_xml_get_widget(gxml, SB_ENTRY);
+ bxml = gtk_builder_new();
+ if (!gtk_builder_add_from_file(bxml, GLADE_FILE, &error))
+ {
+ g_warning("Couldn't load builder file: %s", error->message);
+ g_error_free(error);
+ }
+
+ combo_target_entry = GTK_WIDGET(gtk_builder_get_object(bxml, SB_TARGET_ENTRY));
+ combo_sbox_entry = GTK_WIDGET(gtk_builder_get_object(bxml, SB_SBOX_ENTRY));
+ chooser_dir_entry = GTK_WIDGET(gtk_builder_get_object(bxml, SB_ENTRY));
plugin->id = anjuta_preferences_get_int(prefs, SB_TARGET_ENTRY);
- anjuta_preferences_add_page (prefs, gxml, "Scratchbox", _("Scratchbox"), ICON_FILE);
+ anjuta_preferences_add_from_builder (prefs, bxml, "Scratchbox", _("Scratchbox"), ICON_FILE);
g_signal_connect(chooser_dir_entry, "current-folder-changed",
G_CALLBACK(on_change_directory),
plugin);
@@ -475,11 +481,11 @@ ipreferences_unmerge(IAnjutaPreferences* ipref, AnjutaPreferences* prefs, GError
{
GtkWidget *sb_entry;
- sb_entry = glade_xml_get_widget(gxml, SB_ENTRY);
+ sb_entry = GTK_WIDGET(gtk_builder_get_object(bxml, SB_ENTRY));
anjuta_preferences_remove_page(prefs, _("Scratchbox"));
- g_object_unref (gxml);
+ g_object_unref (bxml);
}
static void
diff --git a/plugins/valgrind/Makefile.am b/plugins/valgrind/Makefile.am
index 5c641a3..bd528ec 100644
--- a/plugins/valgrind/Makefile.am
+++ b/plugins/valgrind/Makefile.am
@@ -2,12 +2,12 @@ if HAVE_PLUGIN_VALGRIND
# Plugin UI file
valgrind_uidir = $(anjuta_ui_dir)
-valgrind_ui_DATA = anjuta-valgrind.ui
+valgrind_ui_DATA = anjuta-valgrind.xml
# Plugin glade file
valgrind_gladedir = $(anjuta_glade_dir)
-valgrind_glade_DATA = anjuta-valgrind.glade
+valgrind_glade_DATA = anjuta-valgrind.ui
# Plugin Icon file
valgrind_pixmapsdir = $(anjuta_image_dir)
diff --git a/plugins/valgrind/anjuta-valgrind.glade b/plugins/valgrind/anjuta-valgrind.glade
deleted file mode 100644
index 9ea798e..0000000
--- a/plugins/valgrind/anjuta-valgrind.glade
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
-
-<glade-interface>
-<requires lib="gnome"/>
-
-<widget class="GtkDialog" id="select_and_run_dialog">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Select Valgrind Target</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
- <property name="modal">False</property>
- <property name="default_width">400</property>
- <property name="default_height">300</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <property name="has_separator">True</property>
-
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox25">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area25">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
-
- <child>
- <widget class="GtkButton" id="cancelbutton5">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-cancel</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">-6</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="okbutton4">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-ok</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">-5</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkFrame" id="frame8">
- <property name="border_width">5</property>
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
-
- <child>
- <widget class="GtkAlignment" id="alignment11">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">1</property>
- <property name="yscale">1</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">12</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow30">
- <property name="border_width">5</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTreeView" id="programs_treeview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">True</property>
- <property name="rules_hint">False</property>
- <property name="reorderable">False</property>
- <property name="enable_search">True</property>
- <property name="fixed_height_mode">False</property>
- <property name="hover_selection">False</property>
- <property name="hover_expand">False</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label12350">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Program to test:</b></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkFrame" id="frame9">
- <property name="border_width">5</property>
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
-
- <child>
- <widget class="GtkAlignment" id="alignment12">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">1</property>
- <property name="yscale">1</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">12</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox1">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="select_tool">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Select Tool:</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkComboBox" id="val_tool">
- <property name="visible">True</property>
- <property name="items" translatable="yes">Memcheck
-Addrcheck
-Helgrind</property>
- <property name="add_tearoffs">False</property>
- <property name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="options_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Options...</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label12351">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Valgrind</b></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
-</glade-interface>
diff --git a/plugins/valgrind/anjuta-valgrind.ui b/plugins/valgrind/anjuta-valgrind.ui
index 56e5c3a..ca2a0a6 100644
--- a/plugins/valgrind/anjuta-valgrind.ui
+++ b/plugins/valgrind/anjuta-valgrind.ui
@@ -1,19 +1,265 @@
-<!--*- xml -*-->
-<ui>
- <menubar name="MenuMain">
- <placeholder name="PlaceHolderDebugMenus">
- <menu name="MenuDebug" action="ActionMenuDebug">
- <placeholder name="PlaceholderValgrindMenus">
- <separator name="separator1"/>
- <menu name="Valgrind" action="ActionMenuValgrind">
- <menuitem name="Run" action="ActionValgrindRun" />
- <menuitem name="Kill" action="ActionValgrindKill" />
- <menuitem name="Load" action="ActionValgrindLoad" />
- <menuitem name="Save" action="ActionValgrindSave" />
- <menuitem name="Edit Rules" action="ActionValgrindEditRules" />
- </menu>
- </placeholder>
- </menu>
- </placeholder>
- </menubar>
-</ui>
+<?xml version="1.0"?>
+<!--*- mode: xml -*-->
+<interface>
+ <object class="GtkListStore" id="model1">
+ <columns>
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Memcheck</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Addrcheck</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Helgrind</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkDialog" id="select_and_run_dialog">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Select Valgrind Target</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+ <property name="modal">False</property>
+ <property name="default_width">400</property>
+ <property name="default_height">300</property>
+ <property name="resizable">True</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
+ <property name="has_separator">True</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox25">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area25">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <child>
+ <object class="GtkButton" id="cancelbutton5">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-cancel</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkButton" id="okbutton4">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-ok</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame8">
+ <property name="border_width">5</property>
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.5</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <child>
+ <object class="GtkAlignment" id="alignment11">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">12</property>
+ <property name="right_padding">0</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow30">
+ <property name="border_width">5</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+ <child>
+ <object class="GtkTreeView" id="programs_treeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">True</property>
+ <property name="rules_hint">False</property>
+ <property name="reorderable">False</property>
+ <property name="enable_search">True</property>
+ <property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label12350">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Program to test:</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame9">
+ <property name="border_width">5</property>
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.5</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <child>
+ <object class="GtkAlignment" id="alignment12">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">12</property>
+ <property name="right_padding">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+ <child>
+ <object class="GtkLabel" id="select_tool">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Select Tool:</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="val_tool">
+ <property name="visible">True</property>
+ <property name="add_tearoffs">False</property>
+ <property name="focus_on_click">True</property>
+ <property name="model">model1</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="options_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Options...</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label12351">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Valgrind</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">cancelbutton5</action-widget>
+ <action-widget response="-5">okbutton4</action-widget>
+ </action-widgets>
+ </object>
+</interface>
diff --git a/plugins/valgrind/plugin.c b/plugins/valgrind/plugin.c
index 883e368..f9a9aa8 100644
--- a/plugins/valgrind/plugin.c
+++ b/plugins/valgrind/plugin.c
@@ -36,8 +36,8 @@
#include "symtab.h"
-#define UI_FILE PACKAGE_DATA_DIR"/ui/anjuta-valgrind.ui"
-#define GLADE_FILE PACKAGE_DATA_DIR"/glade/anjuta-valgrind.glade"
+#define UI_FILE PACKAGE_DATA_DIR"/ui/anjuta-valgrind.xml"
+#define GLADE_FILE PACKAGE_DATA_DIR"/glade/anjuta-valgrind.ui"
#define ICON_FILE "anjuta-valgrind-plugin-48.png"
@@ -121,14 +121,14 @@ load_symtab (const char *progname)
* tool.
*/
static void
-on_options_button_clicked (GtkButton *button, GladeXML *gxml)
+on_options_button_clicked (GtkButton *button, GtkBuilder *bxml)
{
GtkWidget *tool_combobox, *vgtool;
GtkDialog *dlg;
gint active_option;
vgtool = NULL;
- tool_combobox = glade_xml_get_widget (gxml, "val_tool");
+ tool_combobox = GTK_WIDGET (gtk_builder_get_object (bxml, "val_tool"));
active_option = gtk_combo_box_get_active (GTK_COMBO_BOX (tool_combobox));
@@ -188,7 +188,7 @@ on_menu_run_activate (GtkAction *action, AnjutaValgrindPlugin *plugin)
NULL);
if (exec_targets) {
- GladeXML *gxml;
+ GtkBuilder *bxml;
GtkWidget *dlg, *treeview, *tool_combobox;
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
@@ -200,21 +200,28 @@ on_menu_run_activate (GtkAction *action, AnjutaValgrindPlugin *plugin)
gchar *project_root_uri;
size_t project_root_uri_len;
gchar *sel_target = NULL;
+ GError* error = NULL;
tool_selected = 0;
- gxml = glade_xml_new (GLADE_FILE, "select_and_run_dialog",
- NULL);
- dlg = glade_xml_get_widget (gxml, "select_and_run_dialog");
- treeview = glade_xml_get_widget (gxml, "programs_treeview");
+
+ bxml = gtk_builder_new ();
+ if (!gtk_builder_add_from_file (bxml, GLADE_FILE, &error))
+ {
+ g_warning ("Couldn't load builder file: s", error->message);
+ g_error_free (error);
+ }
+
+ dlg = GTK_WIDGET (gtk_builder_get_object (bxml, "select_and_run_dialog"));
+ treeview = GTK_WIDGET (gtk_builder_get_object (bxml, "programs_treeview"));
- tool_combobox = glade_xml_get_widget (gxml, "val_tool");
+ tool_combobox = GTK_WIDGET (gtk_builder_get_object (bxml, "val_tool"));
gtk_combo_box_set_active (GTK_COMBO_BOX (tool_combobox), 0);
- options_button = GTK_BUTTON (glade_xml_get_widget (gxml, "options_button"));
+ options_button = GTK_BUTTON (gtk_builder_get_object (bxml, "options_button"));
/* connect the signal to grab any click on it */
g_signal_connect (G_OBJECT (options_button), "clicked",
- G_CALLBACK (on_options_button_clicked), gxml);
+ G_CALLBACK (on_options_button_clicked), bxml);
gtk_window_set_transient_for (GTK_WINDOW (dlg),
GTK_WINDOW (ANJUTA_PLUGIN(plugin)->shell));
@@ -335,7 +342,7 @@ on_menu_run_activate (GtkAction *action, AnjutaValgrindPlugin *plugin)
}
}
- g_object_unref (gxml);
+ g_object_unref (bxml);
}
else {
anjuta_util_dialog_error (GTK_WINDOW (ANJUTA_PLUGIN (plugin)->shell),
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 369cef1..e2a8191 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -16,18 +16,18 @@ plugins/profiler/gprof-profile-data.c
plugins/profiler/gprof-view.c
plugins/profiler/gprof-view-manager.c
plugins/profiler/plugin.c
-plugins/profiler/profiler-call-graph.glade
-plugins/profiler/profiler-flat-profile.glade
-plugins/profiler/profiler-function-call-tree.glade
-plugins/profiler/profiler.glade
+plugins/profiler/profiler-call-graph.ui
+plugins/profiler/profiler-flat-profile.ui
+plugins/profiler/profiler-function-call-tree.ui
+plugins/profiler/profiler.ui
plugins/profiler/string-utils.c
-plugins/scintilla/anjuta-editor-scintilla.glade
+plugins/scintilla/anjuta-editor-scintilla.ui
plugins/scintilla/print.c
plugins/scintilla/plugin.c
plugins/scintilla/text_editor.c
-plugins/scratchbox/anjuta-scratchbox.glade
+plugins/scratchbox/anjuta-scratchbox.ui
plugins/scratchbox/plugin.c
-plugins/valgrind/anjuta-valgrind.glade
+plugins/valgrind/anjuta-valgrind.ui
plugins/valgrind/plugin.c
plugins/valgrind/preferences.c
plugins/valgrind/process.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
