[anjuta] CVS: bgo#530740 – Use GtkBuilder instead of libglade
- From: Johannes Schmid <jhs src gnome org>
- To: svn-commits-list gnome org
- Subject: [anjuta] CVS: bgo#530740 – Use GtkBuilder instead of libglade
- Date: Thu, 21 May 2009 03:48:22 -0400 (EDT)
commit d697b4515f808f13889e10e9c2f9a8a3b96ef6cc
Author: Maxim Ermilov <zaspire rambler ru>
Date: Thu May 21 09:46:50 2009 +0200
CVS: bgo#530740 â?? Use GtkBuilder instead of libglade
---
configure.in | 4 +-
libanjuta/Makefile.am | 4 +-
plugins/cvs-plugin/Makefile.am | 7 +-
...njuta-cvs-plugin.glade => anjuta-cvs-plugin.ui} | 886 ++++++++++----------
plugins/cvs-plugin/cvs-actions.c | 173 +++--
plugins/cvs-plugin/cvs-callbacks.c | 71 +-
plugins/cvs-plugin/cvs-callbacks.h | 4 +-
plugins/cvs-plugin/cvs-execute.c | 17 +-
plugins/cvs-plugin/plugin.c | 13 +-
plugins/cvs-plugin/plugin.h | 2 +-
po/POTFILES.in | 2 +-
11 files changed, 620 insertions(+), 563 deletions(-)
diff --git a/configure.in b/configure.in
index a9aa65f..2ea5b30 100644
--- a/configure.in
+++ b/configure.in
@@ -139,7 +139,7 @@ PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED)
PKG_CHECK_MODULES(ORBIT, ORBit-2.0 >= $ORBIT_REQUIRED)
-PKG_CHECK_MODULES(GLADE, libglade-2.0 >= $LIBGLADE_REQUIRED)
+PKG_CHECK_MODULES(GLADE_DEPRECATED, libglade-2.0 >= $LIBGLADE_REQUIRED)
PKG_CHECK_MODULES(GNOME, libgnome-2.0 >= $GNOME_REQUIRED libgnomeui-2.0 >= $GNOME_REQUIRED)
@@ -267,7 +267,7 @@ PKG_CHECK_MODULES(PLUGIN_SYMBOL_DB,
dnl Setup Anjuta Library flags
dnl --------------------------
-LIBANJUTA_CFLAGS='$(GLIB_CFLAGS) $(GTK_CFLAGS) $(GDL_CFLAGS) $(GNOME_CFLAGS) $(GLADE_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"'
+LIBANJUTA_CFLAGS='$(GLIB_CFLAGS) $(GTK_CFLAGS) $(GDL_CFLAGS) $(GNOME_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"'
LIBANJUTA_LIBS='$(top_builddir)/libanjuta/libanjuta.la'
AC_SUBST(LIBANJUTA_CFLAGS)
AC_SUBST(LIBANJUTA_LIBS)
diff --git a/libanjuta/Makefile.am b/libanjuta/Makefile.am
index bf3f564..97f7da6 100644
--- a/libanjuta/Makefile.am
+++ b/libanjuta/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS = \
$(WARN_CFLAGS) \
$(DEPRECATED_FLAGS) \
$(GNOME_CFLAGS) \
- $(GLADE_CFLAGS) \
+ $(GLADE_DEPRECATED_CFLAGS) \
$(LIBXML_CFLAGS) \
-I$(top_srcdir) \
-DDATADIR="\"$(datadir)\"" \
@@ -20,7 +20,7 @@ libanjuta_la_LDFLAGS = $(ANJUTA_LDFLAGS)
libanjuta_la_LIBADD = \
interfaces/libanjuta-interfaces.la \
$(GNOME_LIBS) \
- $(GLADE_LIBS) \
+ $(GLADE_DEPRECATED_LIBS) \
$(GLIB_LIBS)
libanjuta_la_SOURCES= \
diff --git a/plugins/cvs-plugin/Makefile.am b/plugins/cvs-plugin/Makefile.am
index 8a7d919..c74d436 100644
--- a/plugins/cvs-plugin/Makefile.am
+++ b/plugins/cvs-plugin/Makefile.am
@@ -1,6 +1,6 @@
# Plugin glade file
cvs_plugin_gladedir = $(anjuta_glade_dir)
-cvs_plugin_glade_DATA = anjuta-cvs-plugin.glade
+cvs_plugin_glade_DATA = anjuta-cvs-plugin.ui
cvs_plugin_pixmapsdir = $(anjuta_image_dir)
cvs_plugin_pixmaps_DATA = \
@@ -27,8 +27,7 @@ plugin_LTLIBRARIES = libanjuta-cvs-plugin.la
libanjuta_cvs_plugin_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
libanjuta_cvs_plugin_la_LIBADD = \
- $(GLADE_LIBS) \
- $(GIO_LIBS) \
+ $(GIO_LIBS) \
$(LIBANJUTA_LIBS)
libanjuta_cvs_plugin_la_SOURCES = \
@@ -43,7 +42,7 @@ libanjuta_cvs_plugin_la_SOURCES = \
cvs-interface.c \
cvs-interface.h
-prefs_glade_files = anjuta-cvs-plugin.glade
+prefs_ui_files = anjuta-cvs-plugin.ui
include $(top_srcdir)/scripts/build-schemas.mk
EXTRA_DIST = \
diff --git a/plugins/cvs-plugin/anjuta-cvs-plugin.glade b/plugins/cvs-plugin/anjuta-cvs-plugin.ui
similarity index 77%
rename from plugins/cvs-plugin/anjuta-cvs-plugin.glade
rename to plugins/cvs-plugin/anjuta-cvs-plugin.ui
index 6c64bb1..58a9851 100644
--- a/plugins/cvs-plugin/anjuta-cvs-plugin.glade
+++ b/plugins/cvs-plugin/anjuta-cvs-plugin.ui
@@ -1,18 +1,53 @@
-<?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_cvs">
- <property name="visible">True</property>
+<interface>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">10</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">Standard diff</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Patch-Style diff</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="model2">
+ <columns>
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Local</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Extern (rsh)</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Password server (pserver)</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkWindow" id="preferences_cvs">
<property name="title" translatable="yes">CVS Preferences</property>
<child>
- <widget class="GtkFrame" id="cvs">
+ <object class="GtkFrame" id="cvs">
<property name="visible">True</property>
<property name="border_width">10</property>
<property name="label_xalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
- <widget class="GtkTable" id="table1">
+ <object class="GtkTable" id="table1">
<property name="visible">True</property>
<property name="border_width">10</property>
<property name="n_rows">4</property>
@@ -32,77 +67,76 @@
<placeholder/>
</child>
<child>
- <widget class="GtkLabel" id="label">
+ <object class="GtkLabel" id="label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Path to "cvs" command</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="GtkFileChooserButton" id="preferences_file:text:/usr/bin/cvs:0:cvs.path">
+ <object class="GtkFileChooserButton" id="preferences_file:text:/usr/bin/cvs:0:cvs.path">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkTable" id="table2">
+ <object class="GtkTable" id="table2">
<property name="visible">True</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<property name="column_spacing">10</property>
<property name="row_spacing">10</property>
<child>
- <widget class="GtkLabel" id="label3">
+ <object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Compression Level (0=off, 10=max):</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:1:0:cvs.ignorerc">
+ <object class="GtkCheckButton" id="preferences_toggle:bool:1:0:cvs.ignorerc">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Ignore .cvsrc file (recommended)</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">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:3:0:cvs.compression">
+ <object class="GtkSpinButton" id="preferences_spin:int:3:0:cvs.compression">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">1 0 10 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="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="right_attach">2</property>
<property name="top_attach">1</property>
@@ -110,74 +144,70 @@
<property name="x_options">GTK_FILL</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label6">
+ <child type="label">
+ <object class="GtkLabel" id="label6_0">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>CVS Options</b></property>
<property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="cvs_add">
- <property name="visible">True</property>
+ </object>
+ <object class="GtkDialog" id="cvs_add">
<property name="border_width">10</property>
<property name="title" translatable="yes">CVS: Add file/directory</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox1">
+ <object class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
<property name="spacing">5</property>
<child>
- <widget class="GtkVBox" id="vbox1">
+ <object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="spacing">10</property>
<child>
- <widget class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="label" translatable="yes">Choose file or directory to add:</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="GtkHBox" id="hbox01">
+ <object class="GtkHBox" id="hbox01">
<property name="visible">True</property>
<child>
- <widget class="GtkEntry" id="cvs_filename">
+ <object class="GtkEntry" id="cvs_add_filename">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="width_request">260</property>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="browse_button_add_dialog">
+ <object class="GtkButton" id="browse_button_add_dialog">
<property name="label" translatable="yes">Browse...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- </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="fill">False</property>
@@ -185,114 +215,114 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="cvs_binary">
+ <object class="GtkCheckButton" id="cvs_binary">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">File is binary</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="position">2</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area1">
+ <object 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">
+ <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>
- <property name="response_id">-6</property>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkButton" id="okbutton1">
+ <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>
- <property name="response_id">-5</property>
- </widget>
+ </object>
<packing>
<property name="position">1</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>
- <widget class="GtkDialog" id="cvs_remove">
- <property name="visible">True</property>
+ <action-widgets>
+ <action-widget response="-6">cancelbutton1</action-widget>
+ <action-widget response="-5">okbutton1</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="cvs_remove">
<property name="border_width">10</property>
<property name="title" translatable="yes">CVS: Remove file/directory</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="vbox2">
+ <object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
<property name="spacing">5</property>
<child>
- <widget class="GtkVBox" id="vbox3">
+ <object class="GtkVBox" id="vbox3">
<property name="visible">True</property>
<property name="spacing">10</property>
<child>
- <widget class="GtkLabel" id="label4">
+ <object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="label" translatable="yes">Choose file or directory to remove:</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="GtkHBox" id="hbox02">
+ <object class="GtkHBox" id="hbox02">
<property name="visible">True</property>
<child>
- <widget class="GtkEntry" id="cvs_filename">
+ <object class="GtkEntry" id="cvs_remove_filename">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="width_request">260</property>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="browse_button_remove_dialog">
+ <object class="GtkButton" id="browse_button_remove_dialog">
<property name="label" translatable="yes">Browse...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- </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="fill">False</property>
@@ -300,116 +330,117 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label5">
+ <object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Please note: </b>
Pressing OK will delete the file from disk and from CVS. Of course the file won't be removed from CVS before you use CVS Commit. <b>You have been warned!</b></property>
<property name="use_markup">True</property>
<property name="wrap">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="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="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-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-ok</property>
<property name="use_stock">True</property>
- <property name="response_id">-5</property>
- </widget>
+ </object>
<packing>
<property name="position">1</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>
- <widget class="GtkDialog" id="cvs_commit">
- <property name="visible">True</property>
+ <action-widgets>
+ <action-widget response="-6">button3</action-widget>
+ <action-widget response="-5">button2</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="cvs_commit">
<property name="border_width">10</property>
<property name="title" translatable="yes">CVS: Commit file/directory</property>
<property name="default_width">500</property>
<property name="default_height">300</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="vbox4">
+ <object class="GtkVBox" id="vbox4">
<property name="visible">True</property>
<property name="spacing">5</property>
<child>
- <widget class="GtkVBox" id="vbox5">
+ <object class="GtkVBox" id="vbox5">
<property name="visible">True</property>
<property name="spacing">10</property>
<child>
- <widget class="GtkLabel" id="label6">
+ <object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="label" translatable="yes">Choose file or directory to commit:</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="GtkHBox" id="hbox03">
+ <object class="GtkHBox" id="hbox03">
<property name="visible">True</property>
<child>
- <widget class="GtkEntry" id="cvs_filename">
+ <object class="GtkEntry" id="cvs_commit_filename">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="width_request">260</property>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="browse_button_commit_dialog">
+ <object class="GtkButton" id="browse_button_commit_dialog">
<property name="label" translatable="yes">Browse...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- </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="fill">False</property>
@@ -417,14 +448,13 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="cvs_project">
+ <object class="GtkCheckButton" id="cvs_commit_project">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Whole project</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>
@@ -432,12 +462,12 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
</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="yalign">0</property>
<property name="label" translatable="yes">Log message:</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -445,21 +475,21 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
</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>
<property name="shadow_type">GTK_SHADOW_IN</property>
<child>
- <widget class="GtkTextView" id="cvs_log">
+ <object class="GtkTextView" id="cvs_commit_log">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="pixels_above_lines">6</property>
<property name="wrap_mode">GTK_WRAP_WORD</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -467,175 +497,172 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
</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="label_yalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
- <widget class="GtkAlignment" id="alignment2">
+ <object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox7">
+ <object class="GtkVBox" id="vbox7">
<property name="visible">True</property>
<property name="border_width">10</property>
<property name="spacing">10</property>
<child>
- <widget class="GtkHBox" id="hbox1">
+ <object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label10">
+ <object class="GtkLabel" id="label10">
<property name="visible">True</property>
<property name="label" translatable="yes">Revision:</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="cvs_revision">
+ <object class="GtkEntry" id="cvs_commit_revision">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">*</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkCheckButton" id="cvs_norecurse">
+ <object class="GtkCheckButton" id="cvs_commit_norecurse">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Do not act recursively</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>
</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>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="position">5</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="hbuttonbox2">
+ <object class="GtkHButtonBox" id="hbuttonbox2">
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="button4">
+ <object class="GtkButton" id="button4">
<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="button5">
+ <object class="GtkButton" id="button5">
<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">1</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>
- <widget class="GtkDialog" id="cvs_update">
- <property name="visible">True</property>
+ <action-widgets>
+ <action-widget response="-6">button4</action-widget>
+ <action-widget response="-5">button5</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="cvs_update">
<property name="border_width">10</property>
<property name="title" translatable="yes">CVS: Update file/directory</property>
<property name="default_width">400</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="vbox8">
+ <object class="GtkVBox" id="vbox8">
<property name="visible">True</property>
<property name="spacing">5</property>
<child>
- <widget class="GtkVBox" id="vbox9">
+ <object class="GtkVBox" id="vbox9">
<property name="visible">True</property>
<property name="spacing">10</property>
<child>
- <widget class="GtkLabel" id="label11">
+ <object class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="label" translatable="yes">Choose file or directory to update:</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="GtkHBox" id="hbox04">
+ <object class="GtkHBox" id="hbox04">
<property name="visible">True</property>
<child>
- <widget class="GtkEntry" id="cvs_filename">
+ <object class="GtkEntry" id="cvs_update_filename">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="width_request">260</property>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="browse_button_update_dialog">
+ <object class="GtkButton" id="browse_button_update_dialog">
<property name="label" translatable="yes">Browse...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- </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="fill">False</property>
@@ -643,14 +670,13 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="cvs_project">
+ <object class="GtkCheckButton" id="cvs_update_project">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Whole project</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>
@@ -658,42 +684,40 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame3">
+ <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>
- <widget class="GtkAlignment" id="alignment3">
+ <object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox10">
+ <object class="GtkVBox" id="vbox10">
<property name="visible">True</property>
<child>
- <widget class="GtkCheckButton" id="cvs_removedir">
+ <object class="GtkCheckButton" id="cvs_removedir">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Delete empty directories</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="active">True</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="cvs_createdir">
+ <object class="GtkCheckButton" id="cvs_createdir">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Create new directories</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -701,14 +725,13 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="cvs_removesticky">
+ <object class="GtkCheckButton" id="cvs_removesticky">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Reset sticky 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>
@@ -716,14 +739,13 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="cvs_norecurse">
+ <object class="GtkCheckButton" id="cvs_update_norecurse">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Do not act recursively</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>
@@ -731,170 +753,167 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox3">
+ <object class="GtkHBox" id="hbox3">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label18">
+ <object class="GtkLabel" id="label18">
<property name="visible">True</property>
<property name="label" translatable="yes">Use revision/tag:</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="cvs_revision">
+ <object class="GtkEntry" id="cvs_update_revision">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">*</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">4</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="label" translatable="yes"><b>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="position">3</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="hbuttonbox3">
+ <object class="GtkHButtonBox" id="hbuttonbox3">
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="button6">
+ <object class="GtkButton" id="button6">
<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="button7">
+ <object class="GtkButton" id="button7">
<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">1</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>
- <widget class="GtkWindow" id="cvs_status_output">
- <property name="visible">True</property>
+ <action-widgets>
+ <action-widget response="-6">button6</action-widget>
+ <action-widget response="-5">button7</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkWindow" id="cvs_status_output">
<property name="border_width">9</property>
<property name="title" translatable="yes">CVS: Status</property>
<property name="default_width">600</property>
<property name="default_height">300</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow2">
+ <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>
- <widget class="GtkTextView" id="cvs_status_text">
+ <object class="GtkTextView" id="cvs_status_text">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">False</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="cvs_status">
- <property name="visible">True</property>
+ </object>
+ <object class="GtkDialog" id="cvs_status">
<property name="border_width">10</property>
<property name="title" translatable="yes">CVS: Status from file/directory</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="vbox11">
+ <object class="GtkVBox" id="vbox11">
<property name="visible">True</property>
<property name="spacing">5</property>
<child>
- <widget class="GtkVBox" id="vbox12">
+ <object class="GtkVBox" id="vbox12">
<property name="visible">True</property>
<property name="spacing">10</property>
<child>
- <widget class="GtkLabel" id="label13">
+ <object class="GtkLabel" id="label13">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="label" translatable="yes">Choose file or directory to get the status from:</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="GtkHBox" id="hbox05">
+ <object class="GtkHBox" id="hbox05">
<property name="visible">True</property>
<child>
- <widget class="GtkEntry" id="cvs_filename">
+ <object class="GtkEntry" id="cvs_status_filename">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="width_request">260</property>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="browse_button_status_dialog">
+ <object class="GtkButton" id="browse_button_status_dialog">
<property name="label" translatable="yes">Browse...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- </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="fill">False</property>
@@ -902,14 +921,13 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="cvs_project">
+ <object class="GtkCheckButton" id="cvs_status_project">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Whole project</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>
@@ -917,159 +935,155 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame4">
+ <object class="GtkFrame" id="frame4">
<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">
+ <object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox13">
+ <object class="GtkVBox" id="vbox13">
<property name="visible">True</property>
<child>
- <widget class="GtkCheckButton" id="cvs_verbose">
+ <object class="GtkCheckButton" id="cvs_status_verbose">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Be verbose</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="cvs_norecurse">
+ <object class="GtkCheckButton" id="cvs_status_norecurse">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Do not act recursively</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>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label14">
+ <child type="label">
+ <object class="GtkLabel" id="label14">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>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="position">3</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="hbuttonbox4">
+ <object class="GtkHButtonBox" id="hbuttonbox4">
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="button8">
+ <object class="GtkButton" id="button8">
<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="button9">
+ <object class="GtkButton" id="button9">
<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">1</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>
- <widget class="GtkDialog" id="cvs_diff">
- <property name="visible">True</property>
+ <action-widgets>
+ <action-widget response="-6">button8</action-widget>
+ <action-widget response="-5">button9</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="cvs_diff">
<property name="border_width">10</property>
<property name="title" translatable="yes">CVS: Diff file/directory</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="vbox14">
+ <object class="GtkVBox" id="vbox14">
<property name="visible">True</property>
<property name="spacing">5</property>
<child>
- <widget class="GtkVBox" id="vbox15">
+ <object class="GtkVBox" id="vbox15">
<property name="visible">True</property>
<property name="spacing">10</property>
<child>
- <widget class="GtkLabel" id="label15">
+ <object class="GtkLabel" id="label15">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="label" translatable="yes">Choose file or directory to diff:</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="GtkHBox" id="hbox06">
+ <object class="GtkHBox" id="hbox06">
<property name="visible">True</property>
<child>
- <widget class="GtkEntry" id="cvs_filename">
+ <object class="GtkEntry" id="cvs_diff_filename">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="width_request">260</property>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="browse_button_diff_dialog">
+ <object class="GtkButton" id="browse_button_diff_dialog">
<property name="label" translatable="yes">Browse...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- </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="fill">False</property>
@@ -1077,14 +1091,13 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="cvs_project">
+ <object class="GtkCheckButton" id="cvs_diff_project">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Whole project</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>
@@ -1092,39 +1105,43 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame5">
+ <object class="GtkFrame" id="frame5">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
- <widget class="GtkAlignment" id="alignment5">
+ <object class="GtkAlignment" id="alignment5">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox16">
+ <object class="GtkVBox" id="vbox16">
<property name="visible">True</property>
<child>
- <widget class="GtkComboBox" id="cvs_diff_type">
+ <object class="GtkComboBox" id="cvs_diff_type">
<property name="visible">True</property>
<property name="border_width">3</property>
- <property name="items" translatable="yes">Standard diff
-Patch-Style diff</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="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="cvs_unified">
+ <object class="GtkCheckButton" id="cvs_unified">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Unified format instead of context format</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>
@@ -1132,30 +1149,30 @@ Patch-Style diff</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox2">
- <property name="visible">True</property>
+ <object class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label17">
+ <object class="GtkLabel" id="label17">
<property name="visible">True</property>
<property name="label" translatable="yes">Use revision:</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="cvs_revision">
+ <object class="GtkEntry" id="cvs_diff_revision">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">*</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1163,133 +1180,130 @@ Patch-Style diff</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="cvs_norecurse">
+ <object class="GtkCheckButton" id="cvs_diff_norecurse">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Do not act recursively</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>
</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="label" translatable="yes"><b>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="position">3</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="hbuttonbox5">
+ <object class="GtkHButtonBox" id="hbuttonbox5">
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="button10">
+ <object class="GtkButton" id="button10">
<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="button11">
+ <object class="GtkButton" id="button11">
<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">1</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>
- <widget class="GtkDialog" id="cvs_logdialog">
- <property name="visible">True</property>
+ <action-widgets>
+ <action-widget response="-6">button10</action-widget>
+ <action-widget response="-5">button11</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="cvs_logdialog">
<property name="border_width">10</property>
<property name="title" translatable="yes">CVS: Log file/directory</property>
<property name="default_width">400</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox2">
+ <object class="GtkVBox" id="dialog-vbox2">
<property name="visible">True</property>
<property name="spacing">5</property>
<child>
- <widget class="GtkVBox" id="vbox17">
+ <object class="GtkVBox" id="vbox17">
<property name="visible">True</property>
<property name="spacing">10</property>
<child>
- <widget class="GtkLabel" id="label19">
+ <object class="GtkLabel" id="label19">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Choose file or directory to get log:</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="GtkHBox" id="hbox07">
+ <object class="GtkHBox" id="hbox07">
<property name="visible">True</property>
<child>
- <widget class="GtkEntry" id="cvs_filename">
+ <object class="GtkEntry" id="cvs_logdialog_filename">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="width_request">260</property>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="browse_button_log_dialog">
+ <object class="GtkButton" id="browse_button_log_dialog">
<property name="label" translatable="yes">Browse...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- </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="fill">False</property>
@@ -1297,14 +1311,13 @@ Patch-Style diff</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="cvs_project">
+ <object class="GtkCheckButton" id="cvs_logdialog_project">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Whole project</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>
@@ -1312,127 +1325,123 @@ Patch-Style diff</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame6">
+ <object class="GtkFrame" id="frame6">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
- <widget class="GtkAlignment" id="alignment6">
+ <object class="GtkAlignment" id="alignment6">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox18">
+ <object class="GtkVBox" id="vbox18">
<property name="visible">True</property>
<child>
- <widget class="GtkCheckButton" id="cvs_verbose">
+ <object class="GtkCheckButton" id="cvs_logdialog_verbose">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Be verbose</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="active">True</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="cvs_norecurse">
+ <object class="GtkCheckButton" id="cvs_logdialog_norecurse">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Do not act recursively</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>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label20">
+ <child type="label">
+ <object class="GtkLabel" id="label20">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>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="position">3</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area2">
+ <object class="GtkHButtonBox" id="dialog-action_area2">
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="cancelbutton2">
+ <object class="GtkButton" id="cancelbutton2">
<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="okbutton2">
+ <object class="GtkButton" id="okbutton2">
<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">1</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>
- <widget class="GtkDialog" id="cvs_import">
- <property name="visible">True</property>
+ <action-widgets>
+ <action-widget response="-6">cancelbutton2</action-widget>
+ <action-widget response="-5">okbutton2</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="cvs_import">
<property name="border_width">10</property>
<property name="title" translatable="yes">CVS: Import</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox3">
+ <object class="GtkVBox" id="dialog-vbox3">
<property name="visible">True</property>
<property name="spacing">5</property>
<child>
- <widget class="GtkFrame" id="frame8">
+ <object class="GtkFrame" id="frame8">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
- <widget class="GtkAlignment" id="alignment8">
+ <object class="GtkAlignment" id="alignment8">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkTable" id="table3">
+ <object class="GtkTable" id="table3">
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="n_rows">6</property>
@@ -1440,90 +1449,90 @@ Patch-Style diff</property>
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
<child>
- <widget class="GtkLabel" id="label21">
+ <object class="GtkLabel" id="label21">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Project root directory:</property>
<property name="use_markup">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="label30">
+ <object class="GtkLabel" id="label30_0">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Module name:</property>
<property name="use_markup">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="label22">
+ <object class="GtkLabel" id="label22">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">CVSROOT:</property>
<property name="use_markup">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="GtkLabel" id="label25">
+ <object class="GtkLabel" id="label25">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Vendor tag:</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="label26">
+ <object class="GtkLabel" id="label26">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Release tag:</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="label28">
+ <object class="GtkLabel" id="label28">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="label" translatable="yes">Log message:</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="GtkFileChooserButton" id="cvs_rootdir">
+ <object class="GtkFileChooserButton" id="cvs_rootdir">
<property name="visible">True</property>
<property name="action">select-folder</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -1532,20 +1541,20 @@ Patch-Style diff</property>
</packing>
</child>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow3">
+ <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>
- <widget class="GtkTextView" id="cvs_log">
+ <object class="GtkTextView" id="cvs_import_log">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="wrap_mode">GTK_WRAP_WORD</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -1554,11 +1563,11 @@ Patch-Style diff</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="cvs_module">
+ <object class="GtkEntry" id="cvs_module">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">*</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -1569,11 +1578,11 @@ Patch-Style diff</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="cvs_cvsroot">
+ <object class="GtkEntry" id="cvs_cvsroot">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">*</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -1584,12 +1593,12 @@ Patch-Style diff</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="cvs_vendor">
+ <object class="GtkEntry" id="cvs_vendor">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">*</property>
<property name="text">none</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -1600,12 +1609,12 @@ Patch-Style diff</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="cvs_release">
+ <object class="GtkEntry" id="cvs_release">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">*</property>
<property name="text">start</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -1615,179 +1624,178 @@ Patch-Style diff</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label31">
+ <child type="label">
+ <object class="GtkLabel" id="label31">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Module Details:</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="GtkFrame" id="frame7">
+ <object class="GtkFrame" id="frame7">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
- <widget class="GtkAlignment" id="alignment7">
+ <object class="GtkAlignment" id="alignment7">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkHBox" id="hbox4">
+ <object class="GtkHBox" id="hbox4">
<property name="visible">True</property>
<property name="border_width">10</property>
<property name="spacing">5</property>
<child>
- <widget class="GtkTable" id="table8">
+ <object class="GtkTable" id="table8">
<property name="visible">True</property>
<property name="n_rows">1</property>
<property name="n_columns">1</property>
<child>
- <widget class="GtkComboBox" id="cvs_server_type">
+ <object class="GtkComboBox" id="cvs_server_type">
<property name="visible">True</property>
- <property name="items" translatable="yes">Local
-Extern (rsh)
-Password server (pserver)
-</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="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkTable" id="table4">
+ <object class="GtkTable" id="table4">
<property name="visible">True</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
<child>
- <widget class="GtkLabel" id="label24">
+ <object class="GtkLabel" id="label24">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Password:</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="label23">
+ <object class="GtkLabel" id="label23">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Username:</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="GtkEntry" id="cvs_password">
+ <object class="GtkEntry" id="cvs_password">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="visibility">False</property>
<property name="invisible_char">*</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="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="cvs_username">
+ <object class="GtkEntry" id="cvs_username">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">*</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label30">
+ <child type="label">
+ <object class="GtkLabel" id="label30">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Repository: </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 internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area3">
+ <object class="GtkHButtonBox" id="dialog-action_area3">
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="cancelbutton3">
+ <object class="GtkButton" id="cancelbutton3">
<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="okbutton3">
+ <object class="GtkButton" id="okbutton3">
<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">1</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="-6">cancelbutton3</action-widget>
+ <action-widget response="-5">okbutton3</action-widget>
+ </action-widgets>
+ </object>
+</interface>
diff --git a/plugins/cvs-plugin/cvs-actions.c b/plugins/cvs-plugin/cvs-actions.c
index db8cbbf..f90180d 100644
--- a/plugins/cvs-plugin/cvs-actions.c
+++ b/plugins/cvs-plugin/cvs-actions.c
@@ -23,7 +23,6 @@
#include "cvs-execute.h"
#include "cvs-callbacks.h"
-#include "glade/glade.h"
#include "libgen.h"
#include <libanjuta/anjuta-preferences.h>
@@ -46,13 +45,13 @@ void cvs_diff_dialog(GtkAction* action, CVSPlugin* plugin, gchar *filename);
void cvs_status_dialog(GtkAction* action, CVSPlugin* plugin, gchar *filename);
void cvs_log_dialog(GtkAction* action, CVSPlugin* plugin, gchar *filename);
-static void on_server_type_changed(GtkComboBox* combo, GladeXML* gxml)
+static void on_server_type_changed(GtkComboBox* combo, GtkBuilder* bxml)
{
GtkWidget* username;
GtkWidget* password;
- username = glade_xml_get_widget(gxml, "cvs_username");
- password = glade_xml_get_widget(gxml, "cvs_password");
+ username = GTK_WIDGET(gtk_builder_get_object(bxml, "cvs_username"));
+ password = GTK_WIDGET(gtk_builder_get_object(bxml, "cvs_password"));
switch (gtk_combo_box_get_active(combo))
{
@@ -129,23 +128,29 @@ on_browse_button_clicked(GtkButton *button, GtkEntry *entry)
void cvs_add_dialog(GtkAction* action, CVSPlugin* plugin, gchar *filename)
{
- GladeXML* gxml;
+ GtkBuilder* bxml;
GtkWidget* dialog;
GtkWidget* fileentry;
GtkWidget* button;
CVSData* data;
- gxml = glade_xml_new(GLADE_FILE, "cvs_add", NULL);
+ GError* error = NULL;
+ 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);
+ }
- dialog = glade_xml_get_widget(gxml, "cvs_add");
- fileentry = glade_xml_get_widget(gxml, "cvs_filename");
+ dialog = GTK_WIDGET(gtk_builder_get_object(bxml, "cvs_add"));
+ fileentry = GTK_WIDGET(gtk_builder_get_object(bxml, "cvs_add_filename"));
if (filename)
gtk_entry_set_text(GTK_ENTRY(fileentry), filename);
- button = glade_xml_get_widget(gxml, BROWSE_BUTTON_ADD_DIALOG);
+ button = GTK_WIDGET(gtk_builder_get_object(bxml, BROWSE_BUTTON_ADD_DIALOG));
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(on_browse_button_clicked), fileentry);
- data = cvs_data_new(plugin, gxml);
+ data = cvs_data_new(plugin, bxml);
g_signal_connect(G_OBJECT(dialog), "response",
G_CALLBACK(on_cvs_add_response), data);
@@ -154,24 +159,29 @@ void cvs_add_dialog(GtkAction* action, CVSPlugin* plugin, gchar *filename)
void cvs_remove_dialog(GtkAction* action, CVSPlugin* plugin, gchar *filename)
{
- GladeXML* gxml;
+ GtkBuilder* bxml;
GtkWidget* dialog;
GtkWidget* fileentry;
GtkWidget* button;
CVSData* data;
+ GError* error = NULL;
+ 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);
+ }
- gxml = glade_xml_new(GLADE_FILE, "cvs_remove", NULL);
-
- dialog = glade_xml_get_widget(gxml, "cvs_remove");
- fileentry = glade_xml_get_widget(gxml, "cvs_filename");
+ dialog = GTK_WIDGET(gtk_builder_get_object(bxml, "cvs_remove"));
+ fileentry = GTK_WIDGET(gtk_builder_get_object(bxml, "cvs_remove_filename"));
if (filename)
gtk_entry_set_text(GTK_ENTRY(fileentry), filename);
- button = glade_xml_get_widget(gxml, BROWSE_BUTTON_REMOVE_DIALOG);
+ button = GTK_WIDGET(gtk_builder_get_object(bxml, BROWSE_BUTTON_REMOVE_DIALOG));
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(on_browse_button_clicked), fileentry);
- data = cvs_data_new(plugin, gxml);
+ data = cvs_data_new(plugin, bxml);
g_signal_connect(G_OBJECT(dialog), "response",
G_CALLBACK(on_cvs_remove_response), data);
@@ -181,31 +191,36 @@ void cvs_remove_dialog(GtkAction* action, CVSPlugin* plugin, gchar *filename)
void cvs_commit_dialog (GtkAction* action, CVSPlugin* plugin, gchar *filename)
{
- GladeXML* gxml;
+ GtkBuilder* bxml;
GtkWidget* dialog;
GtkWidget* fileentry;
GtkWidget* project;
GtkWidget* button;
CVSData* data;
+ GError* error = NULL;
+ 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);
+ }
- gxml = glade_xml_new(GLADE_FILE, "cvs_commit", NULL);
-
- dialog = glade_xml_get_widget(gxml, "cvs_commit");
- fileentry = glade_xml_get_widget(gxml, "cvs_filename");
+ dialog = GTK_WIDGET(gtk_builder_get_object(bxml, "cvs_commit"));
+ fileentry = GTK_WIDGET(gtk_builder_get_object(bxml, "cvs_commit_filename"));
if (filename)
gtk_entry_set_text(GTK_ENTRY(fileentry), filename);
- project = glade_xml_get_widget(gxml, "cvs_project");
+ project = GTK_WIDGET(gtk_builder_get_object(bxml, "cvs_commit_project"));
g_object_set_data (G_OBJECT (project), "fileentry", fileentry);
g_signal_connect(G_OBJECT(project), "toggled",
G_CALLBACK(on_whole_project_toggled), plugin);
init_whole_project(plugin, project);
- button = glade_xml_get_widget(gxml, BROWSE_BUTTON_COMMIT_DIALOG);
+ button = GTK_WIDGET(gtk_builder_get_object(bxml, BROWSE_BUTTON_COMMIT_DIALOG));
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(on_browse_button_clicked), fileentry);
- data = cvs_data_new(plugin, gxml);
+ data = cvs_data_new(plugin, bxml);
g_signal_connect(G_OBJECT(dialog), "response",
G_CALLBACK(on_cvs_commit_response), data);
@@ -215,31 +230,36 @@ void cvs_commit_dialog (GtkAction* action, CVSPlugin* plugin, gchar *filename)
void cvs_update_dialog (GtkAction* action, CVSPlugin* plugin, gchar *filename)
{
- GladeXML* gxml;
+ GtkBuilder* bxml;
GtkWidget* dialog;
GtkWidget* fileentry;
GtkWidget* project;
GtkWidget* button;
CVSData* data;
+ GError* error = NULL;
+ 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);
+ }
- gxml = glade_xml_new(GLADE_FILE, "cvs_update", NULL);
-
- dialog = glade_xml_get_widget(gxml, "cvs_update");
- fileentry = glade_xml_get_widget(gxml, "cvs_filename");
+ dialog = GTK_WIDGET(gtk_builder_get_object(bxml, "cvs_update"));
+ fileentry = GTK_WIDGET(gtk_builder_get_object(bxml, "cvs_update_filename"));
if (filename)
gtk_entry_set_text(GTK_ENTRY(fileentry), filename);
- project = glade_xml_get_widget(gxml, "cvs_project");
+ project = GTK_WIDGET(gtk_builder_get_object(bxml, "cvs_update_project"));
g_object_set_data (G_OBJECT (project), "fileentry", fileentry);
g_signal_connect(G_OBJECT(project), "toggled",
G_CALLBACK(on_whole_project_toggled), plugin);
init_whole_project(plugin, project);
- button = glade_xml_get_widget(gxml, BROWSE_BUTTON_UPDATE_DIALOG);
+ button = GTK_WIDGET(gtk_builder_get_object(bxml, BROWSE_BUTTON_UPDATE_DIALOG));
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(on_browse_button_clicked), fileentry);
- data = cvs_data_new(plugin, gxml);
+ data = cvs_data_new(plugin, bxml);
g_signal_connect(G_OBJECT(dialog), "response",
G_CALLBACK(on_cvs_update_response), data);
@@ -248,7 +268,7 @@ void cvs_update_dialog (GtkAction* action, CVSPlugin* plugin, gchar *filename)
void cvs_diff_dialog (GtkAction* action, CVSPlugin* plugin, gchar *filename)
{
- GladeXML* gxml;
+ GtkBuilder* bxml;
GtkWidget* dialog;
GtkWidget* fileentry;
GtkWidget* diff_type;
@@ -256,31 +276,36 @@ void cvs_diff_dialog (GtkAction* action, CVSPlugin* plugin, gchar *filename)
GtkWidget* project;
GtkWidget* button;
CVSData* data;
+ GError* error = NULL;
+ 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);
+ }
- gxml = glade_xml_new(GLADE_FILE, "cvs_diff", NULL);
-
- dialog = glade_xml_get_widget(gxml, "cvs_diff");
- fileentry = glade_xml_get_widget(gxml, "cvs_filename");
+ dialog = GTK_WIDGET(gtk_builder_get_object(bxml, "cvs_diff"));
+ fileentry = GTK_WIDGET(gtk_builder_get_object(bxml, "cvs_diff_filename"));
if (filename)
gtk_entry_set_text(GTK_ENTRY(fileentry), filename);
- project = glade_xml_get_widget(gxml, "cvs_project");
+ project = GTK_WIDGET(gtk_builder_get_object(bxml, "cvs_diff_project"));
g_object_set_data (G_OBJECT (project), "fileentry", fileentry);
g_signal_connect(G_OBJECT(project), "toggled",
G_CALLBACK(on_whole_project_toggled), plugin);
init_whole_project(plugin, project);
- diff_type = glade_xml_get_widget(gxml, "cvs_diff_type");
- unified_diff = glade_xml_get_widget(gxml, "cvs_unified");
+ diff_type = GTK_WIDGET(gtk_builder_get_object(bxml, "cvs_diff_type"));
+ unified_diff = GTK_WIDGET(gtk_builder_get_object(bxml, "cvs_unified"));
gtk_combo_box_set_active(GTK_COMBO_BOX(diff_type), DIFF_PATCH);
g_signal_connect(G_OBJECT(diff_type), "changed",
G_CALLBACK(on_diff_type_changed), unified_diff);
- button = glade_xml_get_widget(gxml, BROWSE_BUTTON_DIFF_DIALOG);
+ button = GTK_WIDGET(gtk_builder_get_object(bxml, BROWSE_BUTTON_DIFF_DIALOG));
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(on_browse_button_clicked), fileentry);
- data = cvs_data_new(plugin, gxml);
+ data = cvs_data_new(plugin, bxml);
g_signal_connect(G_OBJECT(dialog), "response",
G_CALLBACK(on_cvs_diff_response), data);
@@ -289,31 +314,36 @@ void cvs_diff_dialog (GtkAction* action, CVSPlugin* plugin, gchar *filename)
void cvs_status_dialog (GtkAction* action, CVSPlugin* plugin, gchar *filename)
{
- GladeXML* gxml;
+ GtkBuilder* bxml;
GtkWidget* dialog;
GtkWidget* fileentry;
GtkWidget* project;
GtkWidget* button;
CVSData* data;
+ GError* error = NULL;
+ 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);
+ }
- gxml = glade_xml_new(GLADE_FILE, "cvs_status", NULL);
-
- dialog = glade_xml_get_widget(gxml, "cvs_status");
- fileentry = glade_xml_get_widget(gxml, "cvs_filename");
+ dialog = GTK_WIDGET(gtk_builder_get_object(bxml, "cvs_status"));
+ fileentry = GTK_WIDGET(gtk_builder_get_object(bxml, "cvs_status_filename"));
if (filename)
gtk_entry_set_text(GTK_ENTRY(fileentry), filename);
- project = glade_xml_get_widget(gxml, "cvs_project");
+ project = GTK_WIDGET(gtk_builder_get_object(bxml, "cvs_status_project"));
g_object_set_data (G_OBJECT (project), "fileentry", fileentry);
g_signal_connect(G_OBJECT(project), "toggled",
G_CALLBACK(on_whole_project_toggled), plugin);
init_whole_project(plugin, project);
- button = glade_xml_get_widget(gxml, BROWSE_BUTTON_STATUS_DIALOG);
+ button = GTK_WIDGET(gtk_builder_get_object(bxml, BROWSE_BUTTON_STATUS_DIALOG));
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(on_browse_button_clicked), fileentry);
- data = cvs_data_new(plugin, gxml);
+ data = cvs_data_new(plugin, bxml);
g_signal_connect(G_OBJECT(dialog), "response",
G_CALLBACK(on_cvs_status_response), data);
@@ -322,31 +352,36 @@ void cvs_status_dialog (GtkAction* action, CVSPlugin* plugin, gchar *filename)
void cvs_log_dialog (GtkAction* action, CVSPlugin* plugin, gchar *filename)
{
- GladeXML* gxml;
+ GtkBuilder* bxml;
GtkWidget* dialog;
GtkWidget* fileentry;
GtkWidget* project;
GtkWidget* button;
CVSData* data;
-
- gxml = glade_xml_new(GLADE_FILE, "cvs_logdialog", NULL);
+ GError* error = NULL;
+ 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);
+ }
- dialog = glade_xml_get_widget(gxml, "cvs_logdialog");
- fileentry = glade_xml_get_widget(gxml, "cvs_filename");
+ dialog = GTK_WIDGET(gtk_builder_get_object(bxml, "cvs_logdialog"));
+ fileentry = GTK_WIDGET(gtk_builder_get_object(bxml, "cvs_logdialog_filename"));
if (filename)
gtk_entry_set_text(GTK_ENTRY(fileentry), filename);
- project = glade_xml_get_widget(gxml, "cvs_project");
+ project = GTK_WIDGET(gtk_builder_get_object(bxml, "cvs_logdialog_project"));
g_object_set_data (G_OBJECT (project), "fileentry", fileentry);
g_signal_connect(G_OBJECT(project), "toggled",
G_CALLBACK(on_whole_project_toggled), plugin);
init_whole_project(plugin, project);
- button = glade_xml_get_widget(gxml, BROWSE_BUTTON_LOG_DIALOG);
+ button = GTK_WIDGET(gtk_builder_get_object(bxml, BROWSE_BUTTON_LOG_DIALOG));
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(on_browse_button_clicked), fileentry);
- data = cvs_data_new(plugin, gxml);
+ data = cvs_data_new(plugin, bxml);
g_signal_connect(G_OBJECT(dialog), "response",
G_CALLBACK(on_cvs_log_response), data);
@@ -385,26 +420,32 @@ void on_menu_cvs_status (GtkAction* action, CVSPlugin* plugin)
void on_menu_cvs_import (GtkAction* action, CVSPlugin* plugin)
{
- GladeXML* gxml;
+ GtkBuilder* bxml;
GtkWidget* dialog;
GtkFileChooser* dir;
GtkWidget* typecombo;
CVSData* data;
- gxml = glade_xml_new(GLADE_FILE, "cvs_import", NULL);
+ GError* error = NULL;
+ 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);
+ }
- dialog = glade_xml_get_widget(gxml, "cvs_import");
- dir = GTK_FILE_CHOOSER (glade_xml_get_widget(gxml, "cvs_rootdir"));
- typecombo = glade_xml_get_widget(gxml, "cvs_server_type");
+ dialog = GTK_WIDGET(gtk_builder_get_object(bxml, "cvs_import"));
+ dir = GTK_FILE_CHOOSER (gtk_builder_get_object(bxml, "cvs_rootdir"));
+ typecombo = GTK_WIDGET(gtk_builder_get_object(bxml, "cvs_server_type"));
g_signal_connect (G_OBJECT(typecombo), "changed",
- G_CALLBACK(on_server_type_changed), gxml);
+ G_CALLBACK(on_server_type_changed), bxml);
gtk_combo_box_set_active(GTK_COMBO_BOX(typecombo), SERVER_LOCAL);
if (plugin->project_root_dir)
gtk_file_chooser_set_filename(dir, plugin->project_root_dir);
- data = cvs_data_new(plugin, gxml);
+ data = cvs_data_new(plugin, bxml);
g_signal_connect(G_OBJECT(dialog), "response",
G_CALLBACK(on_cvs_import_response), data);
diff --git a/plugins/cvs-plugin/cvs-callbacks.c b/plugins/cvs-plugin/cvs-callbacks.c
index 1333740..fdb3c1e 100644
--- a/plugins/cvs-plugin/cvs-callbacks.c
+++ b/plugins/cvs-plugin/cvs-callbacks.c
@@ -18,7 +18,6 @@
#include "cvs-callbacks.h"
#include "cvs-execute.h"
#include "cvs-interface.h"
-#include "glade/glade.h"
static gchar* get_log_from_textview(GtkWidget* textview)
{
@@ -84,11 +83,11 @@ is_busy (CVSPlugin* plugin, GtkDialog* dialog)
return FALSE;
}
-CVSData* cvs_data_new(CVSPlugin* plugin, GladeXML* gxml)
+CVSData* cvs_data_new(CVSPlugin* plugin, GtkBuilder* bxml)
{
CVSData* data = g_new0(CVSData, 1);
data->plugin = plugin;
- data->gxml = gxml;
+ data->bxml = bxml;
return data;
}
@@ -108,8 +107,8 @@ on_cvs_add_response(GtkDialog* dialog, gint response, CVSData* data)
{
case GTK_RESPONSE_OK:
{
- GtkWidget* binary = glade_xml_get_widget(data->gxml, "cvs_binary");
- GtkWidget* fileentry = glade_xml_get_widget(data->gxml, "cvs_filename");
+ GtkWidget* binary = GTK_WIDGET(gtk_builder_get_object(data->bxml, "cvs_binary"));
+ GtkWidget* fileentry = GTK_WIDGET(gtk_builder_get_object(data->bxml, "cvs_add_filename"));
const gchar* filename = gtk_entry_get_text(GTK_ENTRY(fileentry));
if (!check_filename(dialog, filename))
@@ -140,7 +139,7 @@ on_cvs_remove_response(GtkDialog* dialog, gint response, CVSData* data)
{
case GTK_RESPONSE_OK:
{
- GtkWidget* fileentry = glade_xml_get_widget(data->gxml, "cvs_filename");
+ GtkWidget* fileentry = GTK_WIDGET(gtk_builder_get_object(data->bxml, "cvs_remove_filename"));
const gchar* filename = gtk_entry_get_text(GTK_ENTRY(fileentry));
if (!check_filename(dialog, filename))
@@ -185,15 +184,15 @@ on_cvs_update_response(GtkDialog* dialog, gint response, CVSData* data)
GtkWidget* norecurse;
GtkWidget* removesticky;
GtkWidget* revisionentry;
- GtkWidget* fileentry = glade_xml_get_widget(data->gxml, "cvs_filename");
+ GtkWidget* fileentry = GTK_WIDGET(gtk_builder_get_object(data->bxml, "cvs_update_filename"));
const gchar* filename = g_strdup(gtk_entry_get_text(GTK_ENTRY(fileentry)));
- norecurse = glade_xml_get_widget(data->gxml, "cvs_norecurse");
- removedir = glade_xml_get_widget(data->gxml, "cvs_removedir");
- createdir = glade_xml_get_widget(data->gxml, "cvs_createdir");
- revisionentry = glade_xml_get_widget(data->gxml, "cvs_revision");
+ norecurse = GTK_WIDGET(gtk_builder_get_object(data->bxml, "cvs_update_norecurse"));
+ removedir = GTK_WIDGET(gtk_builder_get_object(data->bxml, "cvs_removedir"));
+ createdir = GTK_WIDGET(gtk_builder_get_object(data->bxml, "cvs_createdir"));
+ revisionentry = GTK_WIDGET(gtk_builder_get_object(data->bxml, "cvs_update_revision"));
revision = gtk_entry_get_text(GTK_ENTRY(revisionentry));
- removesticky = glade_xml_get_widget(data->gxml, "cvs_removesticky");
+ removesticky = GTK_WIDGET(gtk_builder_get_object(data->bxml, "cvs_removesticky"));
if (!check_filename(dialog, filename))
break;
@@ -231,10 +230,10 @@ on_cvs_commit_response(GtkDialog* dialog, gint response, CVSData* data)
GtkWidget* logtext;
GtkWidget* revisionentry;
GtkWidget* norecurse;
- GtkWidget* fileentry = glade_xml_get_widget(data->gxml, "cvs_filename");
+ GtkWidget* fileentry = GTK_WIDGET(gtk_builder_get_object(data->bxml, "cvs_commit_filename"));
const gchar* filename = gtk_entry_get_text(GTK_ENTRY(fileentry));
- logtext = glade_xml_get_widget(data->gxml, "cvs_log");
+ logtext = GTK_WIDGET(gtk_builder_get_object(data->bxml, "cvs_commit_log"));
log = get_log_from_textview(logtext);
if (!g_utf8_strlen(log, -1))
{
@@ -253,10 +252,10 @@ on_cvs_commit_response(GtkDialog* dialog, gint response, CVSData* data)
gtk_widget_destroy(dlg);
}
- revisionentry = glade_xml_get_widget(data->gxml, "cvs_revision");
+ revisionentry = GTK_WIDGET(gtk_builder_get_object(data->bxml, "cvs_commit_revision"));
rev = gtk_entry_get_text(GTK_ENTRY(revisionentry));
- norecurse = glade_xml_get_widget(data->gxml, "cvs_norecurse");
+ norecurse = GTK_WIDGET(gtk_builder_get_object(data->bxml, "cvs_commit_norecurse"));
if (!check_filename(dialog, filename))
break;
@@ -295,16 +294,16 @@ on_cvs_diff_response(GtkDialog* dialog, gint response, CVSData* data)
GtkWidget* diff_type;
GtkWidget* unified_diff;
- GtkWidget* fileentry = glade_xml_get_widget(data->gxml, "cvs_filename");
+ GtkWidget* fileentry = GTK_WIDGET(gtk_builder_get_object(data->bxml, "cvs_diff_filename"));
const gchar* filename = g_strdup(gtk_entry_get_text(GTK_ENTRY(fileentry)));
- revisionentry = glade_xml_get_widget(data->gxml, "cvs_revision");
+ revisionentry = GTK_WIDGET(gtk_builder_get_object(data->bxml, "cvs_diff_revision"));
rev = gtk_entry_get_text(GTK_ENTRY(revisionentry));
- norecurse = glade_xml_get_widget(data->gxml, "cvs_norecurse");
+ norecurse = GTK_WIDGET(gtk_builder_get_object(data->bxml, "cvs_diff_norecurse"));
- diff_type = glade_xml_get_widget(data->gxml, "cvs_diff_type");
- unified_diff = glade_xml_get_widget(data->gxml, "cvs_unified");
+ diff_type = GTK_WIDGET(gtk_builder_get_object(data->bxml, "cvs_diff_type"));
+ unified_diff = GTK_WIDGET(gtk_builder_get_object(data->bxml, "cvs_unified"));
diff_type_nr = gtk_combo_box_get_active(GTK_COMBO_BOX(diff_type));
if (diff_type_nr == DIFF_PATCH)
{
@@ -343,11 +342,11 @@ on_cvs_status_response(GtkDialog* dialog, gint response, CVSData* data)
{
GtkWidget* norecurse;
GtkWidget* verbose;
- GtkWidget* fileentry = glade_xml_get_widget(data->gxml, "cvs_filename");
+ GtkWidget* fileentry = GTK_WIDGET(gtk_builder_get_object(data->bxml, "cvs_status_filename"));
const gchar* filename = gtk_entry_get_text(GTK_ENTRY(fileentry));
- norecurse = glade_xml_get_widget(data->gxml, "cvs_norecurse");
- verbose = glade_xml_get_widget(data->gxml, "cvs_verbose");
+ norecurse = GTK_WIDGET(gtk_builder_get_object(data->bxml, "cvs_status_norecurse"));
+ verbose = GTK_WIDGET(gtk_builder_get_object(data->bxml, "cvs_status_verbose"));
if (!check_filename(dialog, filename))
@@ -383,10 +382,10 @@ on_cvs_log_response(GtkDialog* dialog, gint response, CVSData* data)
GtkWidget* verbose;
GtkWidget* fileentry;
- norecurse = glade_xml_get_widget(data->gxml, "cvs_norecurse");
- verbose = glade_xml_get_widget(data->gxml, "cvs_verbose");
+ norecurse = GTK_WIDGET(gtk_builder_get_object(data->bxml, "cvs_logdialog_norecurse"));
+ verbose = GTK_WIDGET(gtk_builder_get_object(data->bxml, "cvs_logdialog_verbose"));
- fileentry = glade_xml_get_widget(data->gxml, "cvs_filename");
+ fileentry = GTK_WIDGET(gtk_builder_get_object(data->bxml, "cvs_logdialog_filename"));
filename = gtk_entry_get_text(GTK_ENTRY(fileentry));
if (!check_filename(dialog, filename))
break;
@@ -429,28 +428,28 @@ on_cvs_import_response(GtkDialog* dialog, gint response, CVSData* data)
GtkFileChooser* dir;
gchar* log;
- username = glade_xml_get_widget(data->gxml, "cvs_username");
- password = glade_xml_get_widget(data->gxml, "cvs_password");
+ username = GTK_WIDGET(gtk_builder_get_object(data->bxml, "cvs_username"));
+ password = GTK_WIDGET(gtk_builder_get_object(data->bxml, "cvs_password"));
- cvsroot_entry = glade_xml_get_widget(data->gxml, "cvs_cvsroot");
+ cvsroot_entry = GTK_WIDGET(gtk_builder_get_object(data->bxml, "cvs_cvsroot"));
if (!check_entry(dialog, cvsroot_entry, _("CVSROOT")))
break;
- module_entry = glade_xml_get_widget(data->gxml, "cvs_module");
+ module_entry = GTK_WIDGET(gtk_builder_get_object(data->bxml, "cvs_module"));
if (!check_entry(dialog, module_entry, _("Module")))
break;
- vendortag = glade_xml_get_widget(data->gxml, "cvs_vendor");
+ vendortag = GTK_WIDGET(gtk_builder_get_object(data->bxml, "cvs_vendor"));
if (!check_entry(dialog, vendortag, _("Vendor")))
break;
- releasetag = glade_xml_get_widget(data->gxml, "cvs_release");
+ releasetag = GTK_WIDGET(gtk_builder_get_object(data->bxml, "cvs_release"));
if (!check_entry(dialog, releasetag, _("Release")))
break;
- typecombo = glade_xml_get_widget(data->gxml, "cvs_server_type");
- dir = GTK_FILE_CHOOSER(glade_xml_get_widget(data->gxml, "cvs_rootdir"));
+ typecombo = GTK_WIDGET(gtk_builder_get_object(data->bxml, "cvs_server_type"));
+ dir = GTK_FILE_CHOOSER(gtk_builder_get_object(data->bxml, "cvs_rootdir"));
dirname = gtk_file_chooser_get_filename (dir);
if (!dirname)
break;
- logtext = glade_xml_get_widget(data->gxml, "cvs_log");
+ logtext = GTK_WIDGET(gtk_builder_get_object(data->bxml, "cvs_import_log"));
log = get_log_from_textview(logtext);
if (!strlen(log))
{
diff --git a/plugins/cvs-plugin/cvs-callbacks.h b/plugins/cvs-plugin/cvs-callbacks.h
index 4b0c543..b2df966 100644
--- a/plugins/cvs-plugin/cvs-callbacks.h
+++ b/plugins/cvs-plugin/cvs-callbacks.h
@@ -22,7 +22,7 @@
typedef struct
{
- GladeXML* gxml;
+ GtkBuilder* bxml;
CVSPlugin* plugin;
} CVSData;
@@ -39,7 +39,7 @@ enum
SERVER_PASSWORD = 2,
};
-CVSData* cvs_data_new(CVSPlugin* plugin, GladeXML* gxml);
+CVSData* cvs_data_new(CVSPlugin* plugin, GtkBuilder* bxml);
void cvs_data_free(CVSData* data);
void
diff --git a/plugins/cvs-plugin/cvs-execute.c b/plugins/cvs-plugin/cvs-execute.c
index cd51b61..45e06b3 100644
--- a/plugins/cvs-plugin/cvs-execute.c
+++ b/plugins/cvs-plugin/cvs-execute.c
@@ -28,7 +28,6 @@
#include <libanjuta/anjuta-debug.h>
#include <unistd.h>
-#include <glade/glade.h>
#define CVS_ICON ""
#define CVS_INFO_REGEXP "(cvs update:.|cvs server:.)"
@@ -268,12 +267,18 @@ cvs_execute(CVSPlugin* plugin, const gchar* command, const gchar* dir)
void
cvs_execute_status(CVSPlugin* plugin, const gchar* command, const gchar* dir)
{
- GladeXML* gxml;
+ GtkBuilder* bxml;
GtkWidget* window;
-
- gxml = glade_xml_new(GLADE_FILE, "cvs_status_output", NULL);
- window = glade_xml_get_widget(gxml, "cvs_status_output");
- status_text = glade_xml_get_widget(gxml, "cvs_status_text");
+ GError* error = NULL;
+ 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);
+ }
+
+ window = GTK_WIDGET(gtk_builder_get_object(bxml, "cvs_status_output"));
+ status_text = GTK_WIDGET(gtk_builder_get_object(bxml, "cvs_status_text"));
g_signal_connect(G_OBJECT(window), "delete-event",
G_CALLBACK(on_cvs_status_destroy), status_text);
diff --git a/plugins/cvs-plugin/plugin.c b/plugins/cvs-plugin/plugin.c
index 222d7a2..32c077f 100644
--- a/plugins/cvs-plugin/plugin.c
+++ b/plugins/cvs-plugin/plugin.c
@@ -457,10 +457,15 @@ static void
ipreferences_merge(IAnjutaPreferences* ipref, AnjutaPreferences* prefs, GError** e)
{
/* Create the messages preferences page */
- GladeXML* gxml;
- gxml = glade_xml_new (GLADE_FILE, "cvs", NULL);
- anjuta_preferences_add_page (prefs, gxml, "cvs", _("CVS"), ICON_FILE);
- g_object_unref (gxml);
+ GError* error = NULL;
+ GtkBuilder *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);
+ }
+ anjuta_preferences_add_from_builder (prefs, bxml, "cvs", _("CVS"), ICON_FILE);
+ g_object_unref (bxml);
}
static void
diff --git a/plugins/cvs-plugin/plugin.h b/plugins/cvs-plugin/plugin.h
index d3de75f..5d8b034 100644
--- a/plugins/cvs-plugin/plugin.h
+++ b/plugins/cvs-plugin/plugin.h
@@ -27,7 +27,7 @@
#include <libanjuta/interfaces/ianjuta-message-manager.h>
#include <libanjuta/interfaces/ianjuta-editor.h>
-#define GLADE_FILE PACKAGE_DATA_DIR"/glade/anjuta-cvs-plugin.glade"
+#define GLADE_FILE PACKAGE_DATA_DIR"/glade/anjuta-cvs-plugin.ui"
extern GType cvs_plugin_get_type (GTypeModule *module);
#define ANJUTA_TYPE_PLUGIN_CVS (cvs_plugin_get_type (NULL))
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0e71006..b5f23f1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -40,7 +40,7 @@ plugins/class-gen/plugin.c
plugins/class-gen/transform.c
plugins/class-gen/validator.c
plugins/class-gen/window.c
-plugins/cvs-plugin/anjuta-cvs-plugin.glade
+plugins/cvs-plugin/anjuta-cvs-plugin.ui
plugins/cvs-plugin/cvs-actions.c
plugins/cvs-plugin/cvs-callbacks.c
plugins/cvs-plugin/cvs-execute.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
