[anjuta] bgo#593539 - Please remove unnecessary markup from glade files
- From: Johannes Schmid <jhs src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [anjuta] bgo#593539 - Please remove unnecessary markup from glade files
- Date: Tue, 22 Sep 2009 08:38:03 +0000 (UTC)
commit 44aff6e79c042e5943936900dcdd1a9d7ea1b721
Author: Gabor Kelemen <kelemeng gnome hu>
Date: Tue Sep 22 10:36:43 2009 +0200
bgo#593539 - Please remove unnecessary markup from glade files
.../anjuta-build-basic-autotools-plugin.ui | 145 +++++---
plugins/class-gen/anjuta-class-gen-plugin.ui | 241 ++++++++---
plugins/cvs-plugin/anjuta-cvs-plugin.ui | 412 ++++++++++++-------
plugins/debug-manager/anjuta-debug-manager.ui | 20 +-
.../document-manager/anjuta-document-manager.ui | 61 ++--
plugins/file-wizard/anjuta-file-wizard.ui | 12 +-
plugins/gbf-am/gbf-am-dialogs.ui | 438 ++++++++------------
plugins/git/anjuta-git.ui | 36 ++-
plugins/macro/anjuta-macro.ui | 104 +++--
.../message-view/anjuta-message-manager-plugin.ui | 106 +++---
plugins/project-import/project-import.ui | 14 +-
plugins/project-wizard/anjuta-project-wizard.ui | 41 +-
plugins/search/anjuta-search.ui | 366 +++++++++-------
plugins/symbol-db/anjuta-symbol-db.ui | 14 +-
plugins/terminal/anjuta-terminal-plugin.ui | 21 +-
plugins/tools/anjuta-tools.ui | 6 +-
16 files changed, 1171 insertions(+), 866 deletions(-)
---
diff --git a/plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui b/plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui
index 7cc6ca3..64e2cb8 100644
--- a/plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui
+++ b/plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui
@@ -1,20 +1,20 @@
<?xml version="1.0"?>
-<!--*- mode: xml -*-->
<interface>
+ <requires lib="gtk+" version="2.16"/>
+ <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAdjustment" id="adjustment1">
- <property name="upper">30</property>
+ <property name="value">4</property>
<property name="lower">1</property>
- <property name="page_increment">10</property>
+ <property name="upper">30</property>
<property name="step_increment">1</property>
- <property name="page_size">0</property>
- <property name="value">4</property>
+ <property name="page_increment">10</property>
</object>
<object class="GtkDialog" id="execute_dialog">
<property name="title" translatable="yes">Select Program</property>
- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+ <property name="window_position">center-on-parent</property>
<property name="default_width">400</property>
<property name="default_height">300</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+ <property name="type_hint">normal</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox5">
<property name="visible">True</property>
@@ -25,7 +25,7 @@
<property name="border_width">5</property>
<property name="label_xalign">0</property>
<property name="label_yalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
@@ -34,9 +34,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="border_width">5</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="programs_treeview">
<property name="visible">True</property>
@@ -44,6 +44,9 @@
</object>
</child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkHBox" id="hbox27">
@@ -56,6 +59,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -77,10 +81,11 @@
</child>
<child>
<object class="GtkCheckButton" id="program_run_in_terminal">
+ <property name="label" translatable="yes">Run in terminal</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="receives_default">False</property>
<property name="border_width">5</property>
- <property name="label" translatable="yes">Run in terminal</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -97,8 +102,10 @@
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Select Program to run:</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Select Program to run:</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -109,40 +116,49 @@
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area5">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cancelbutton2">
+ <property name="label">gtk-cancel</property>
<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="receives_default">False</property>
<property name="use_stock">True</property>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="okbutton3">
+ <property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
- <property name="label">gtk-ok</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
</child>
<action-widgets>
- <action-widget response="0">program_run_in_terminal</action-widget>
<action-widget response="-6">cancelbutton2</action-widget>
<action-widget response="-5">okbutton3</action-widget>
</action-widgets>
@@ -158,7 +174,7 @@
<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>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
@@ -175,14 +191,16 @@
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="preferences_toggle:bool:0:0:build.parallel.make">
+ <property name="label" translatable="yes">Run several commands at a time:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Run several commands at a time:</property>
+ <property name="receives_default">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -205,13 +223,15 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="preferences_toggle:bool:0:0:build.continue.error">
+ <property name="label" translatable="yes">Continue on errors</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Continue on errors</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -223,9 +243,10 @@
</child>
<child>
<object class="GtkCheckButton" id="preferences_toggle:bool:1:0:build.translate.message">
+ <property name="label" translatable="yes">Translate messages</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Translate messages</property>
+ <property name="receives_default">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -234,9 +255,10 @@
</child>
<child>
<object class="GtkCheckButton" id="preferences_toggle:bool:0:0:indicators.automatic">
+ <property name="label" translatable="yes">Highlight message locations in editor</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Highlight message locations in editor</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -255,14 +277,17 @@
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Build</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Build</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -270,7 +295,7 @@
<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>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
@@ -287,15 +312,17 @@
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="preferences_toggle:bool:0:0:build.install.root">
+ <property name="label" translatable="yes">Install as root:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Install as root:</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -313,6 +340,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
@@ -324,8 +352,10 @@
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Install</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Install</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -342,9 +372,9 @@
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">Configure Project</property>
- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+ <property name="window_position">center-on-parent</property>
<property name="default_width">450</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox2">
@@ -359,17 +389,23 @@
<object class="GtkCheckButton" id="force_autogen_check">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="draw_indicator">True</property>
<child>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes"><b>Regenerate project</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Regenerate project</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkVBox" id="vbox6">
@@ -385,25 +421,21 @@
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Configuration:</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Configuration:</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBoxEntry" id="configuration_combo_entry">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child internal-child="entry">
- <object class="GtkEntry" id="comboboxentry-entry2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </object>
- </child>
</object>
<packing>
<property name="position">1</property>
@@ -413,6 +445,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -439,7 +472,7 @@
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -453,20 +486,20 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkFileChooserButton" id="build_dir_chooser">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
+ <property name="action">select-folder</property>
<property name="title" translatable="yes">Select a build directory</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -478,7 +511,7 @@
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
</object>
@@ -504,34 +537,42 @@
<object class="GtkHButtonBox" id="dialog-action_area2">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="button2">
+ <property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="ok_button">
+ <property name="label">gtk-execute</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label">gtk-execute</property>
<property name="use_stock">True</property>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
diff --git a/plugins/class-gen/anjuta-class-gen-plugin.ui b/plugins/class-gen/anjuta-class-gen-plugin.ui
index cbcf2da..a19b474 100644
--- a/plugins/class-gen/anjuta-class-gen-plugin.ui
+++ b/plugins/class-gen/anjuta-class-gen-plugin.ui
@@ -1,13 +1,10 @@
<?xml version="1.0"?>
-<!--Generated with glade3 3.4.0 on Sun Feb 3 22:47:36 2008
- Version: 3.0.1
- Date: Sun Oct 22 11:16:36 2006
- User: ck
- Host: unununium
--->
<interface>
+ <requires lib="gtk+" version="2.16"/>
+ <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkListStore" id="model1">
<columns>
+ <!-- column-name gchararray -->
<column type="gchararray"/>
</columns>
<data>
@@ -24,6 +21,7 @@
</object>
<object class="GtkListStore" id="model2">
<columns>
+ <!-- column-name gchararray -->
<column type="gchararray"/>
</columns>
<data>
@@ -41,7 +39,7 @@
<object class="GtkDialog" id="classgen_main">
<property name="title" translatable="yes">Class Generator</property>
<property name="default_height">582</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox2">
<property name="visible">True</property>
@@ -63,7 +61,7 @@
<object class="GtkFrame" id="frame7">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment7">
<property name="visible">True</property>
@@ -77,12 +75,6 @@
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
<object class="GtkLabel" id="label38">
<property name="visible">True</property>
<property name="xalign">1</property>
@@ -189,8 +181,10 @@
</child>
<child>
<object class="GtkCheckButton" id="cc_inline">
- <property name="visible">True</property>
<property name="label" translatable="yes">Inline the declaration and implementation</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -203,8 +197,10 @@
</child>
<child>
<object class="GtkCheckButton" id="cc_headings">
- <property name="visible">True</property>
<property name="label" translatable="yes">Author/Date/Time</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -216,6 +212,12 @@
<property name="y_options">GTK_FILL</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
</object>
@@ -223,20 +225,23 @@
<child type="label">
<object class="GtkLabel" id="label47">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>General Class Properties</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">General Class Properties</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame8">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment8">
<property name="visible">True</property>
@@ -251,35 +256,49 @@
<property name="height_request">100</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="cc_elements">
<property name="visible">True</property>
</object>
</child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkHButtonBox" id="hbuttonbox4">
<property name="visible">True</property>
<property name="spacing">6</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cc_elements_remove">
- <property name="visible">True</property>
<property name="label">gtk-remove</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="cc_elements_add">
- <property name="visible">True</property>
<property name="label">gtk-add</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -296,8 +315,10 @@
<child type="label">
<object class="GtkLabel" id="label48">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Class Elements</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Class Elements</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -325,7 +346,7 @@
<object class="GtkFrame" id="frame5">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment5">
<property name="visible">True</property>
@@ -339,12 +360,6 @@
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
<object class="GtkLabel" id="label27">
<property name="visible">True</property>
<property name="xalign">1</property>
@@ -417,8 +432,10 @@
</child>
<child>
<object class="GtkCheckButton" id="go_headings">
- <property name="visible">True</property>
<property name="label" translatable="yes">Author/Date-Time</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -441,6 +458,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -493,9 +511,15 @@
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
</object>
@@ -503,20 +527,23 @@
<child type="label">
<object class="GtkLabel" id="label36">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>General Class Properties</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">General Class Properties</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame6">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment6">
<property name="visible">True</property>
@@ -535,35 +562,49 @@
<property name="height_request">100</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="go_members">
<property name="visible">True</property>
</object>
</child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkHButtonBox" id="hbuttonbox5">
<property name="visible">True</property>
<property name="spacing">6</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="go_members_remove">
- <property name="visible">True</property>
<property name="label">gtk-remove</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="go_members_add">
- <property name="visible">True</property>
<property name="label">gtk-add</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -594,35 +635,49 @@
<property name="height_request">100</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="go_properties">
<property name="visible">True</property>
</object>
</child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkHButtonBox" id="hbuttonbox7">
<property name="visible">True</property>
<property name="spacing">6</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="go_properties_remove">
- <property name="visible">True</property>
<property name="label">gtk-remove</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="go_properties_add">
- <property name="visible">True</property>
<property name="label">gtk-add</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -633,9 +688,12 @@
</packing>
</child>
</object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
</child>
<child type="tab">
- <object class="GtkLabel" id="">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">Properties</property>
</object>
@@ -654,35 +712,49 @@
<property name="height_request">100</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="go_signals">
<property name="visible">True</property>
</object>
</child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkHButtonBox" id="hbuttonbox8">
<property name="visible">True</property>
<property name="spacing">6</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="go_signals_remove">
- <property name="visible">True</property>
<property name="label">gtk-remove</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="go_signals_add">
- <property name="visible">True</property>
<property name="label">gtk-add</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -693,6 +765,9 @@
</packing>
</child>
</object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
</child>
<child type="tab">
<object class="GtkLabel" id="label54">
@@ -711,8 +786,10 @@
<child type="label">
<object class="GtkLabel" id="label37">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Class Elements</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Class Elements</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -721,6 +798,9 @@
</packing>
</child>
</object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
</child>
<child type="tab">
<object class="GtkLabel" id="label3">
@@ -733,6 +813,9 @@
</packing>
</child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkTable" id="table1">
@@ -847,6 +930,9 @@
<property name="visible">True</property>
<property name="activates_default">True</property>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
<packing>
@@ -877,6 +963,9 @@
<property name="visible">True</property>
<property name="activates_default">True</property>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
<packing>
@@ -899,16 +988,23 @@
<property name="spacing">12</property>
<child>
<object class="GtkCheckButton" id="add_project">
- <property name="visible">True</property>
<property name="label" translatable="yes">Add to Project</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkCheckButton" id="add_repository">
- <property name="visible">True</property>
<property name="label" translatable="yes">Add to Repository</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -930,20 +1026,29 @@
<object class="GtkHButtonBox" id="dialog-action_area3">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cancel_button">
+ <property name="label">gtk-cancel</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="can_default">True</property>
- <property name="label">gtk-cancel</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="create_button">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
+ <property name="receives_default">False</property>
<child>
<object class="GtkHBox" id="hbox3">
<property name="visible">True</property>
@@ -952,6 +1057,9 @@
<property name="visible">True</property>
<property name="stock">gtk-save</property>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkLabel" id="label4">
@@ -966,13 +1074,16 @@
</child>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
diff --git a/plugins/cvs-plugin/anjuta-cvs-plugin.ui b/plugins/cvs-plugin/anjuta-cvs-plugin.ui
index 58a9851..a97deef 100644
--- a/plugins/cvs-plugin/anjuta-cvs-plugin.ui
+++ b/plugins/cvs-plugin/anjuta-cvs-plugin.ui
@@ -1,16 +1,16 @@
<?xml version="1.0"?>
-<!--*- mode: xml -*-->
<interface>
+ <requires lib="gtk+" version="2.16"/>
+ <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAdjustment" id="adjustment1">
+ <property name="value">1</property>
<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>
+ <property name="page_increment">10</property>
</object>
<object class="GtkListStore" id="model1">
<columns>
+ <!-- column-name gchararray -->
<column type="gchararray"/>
</columns>
<data>
@@ -24,6 +24,7 @@
</object>
<object class="GtkListStore" id="model2">
<columns>
+ <!-- column-name gchararray -->
<column type="gchararray"/>
</columns>
<data>
@@ -45,7 +46,7 @@
<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>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkTable" id="table1">
<property name="visible">True</property>
@@ -55,18 +56,6 @@
<property name="column_spacing">10</property>
<property name="row_spacing">10</property>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
<object class="GtkLabel" id="label">
<property name="visible">True</property>
<property name="xalign">0</property>
@@ -74,7 +63,7 @@
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -84,7 +73,7 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -102,14 +91,15 @@
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="preferences_toggle:bool:1:0:cvs.ignorerc">
+ <property name="label" translatable="yes">Ignore .cvsrc file (recommended)</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Ignore .cvsrc file (recommended)</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -118,7 +108,7 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -133,7 +123,7 @@
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
</object>
@@ -144,13 +134,27 @@
<property name="x_options">GTK_FILL</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
<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>
+ <property name="label" translatable="yes">CVS Options</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -159,7 +163,7 @@
<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>
+ <property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
@@ -179,6 +183,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -186,10 +191,10 @@
<property name="visible">True</property>
<child>
<object class="GtkEntry" id="cvs_add_filename">
+ <property name="width_request">260</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="width_request">260</property>
</object>
<packing>
<property name="position">0</property>
@@ -216,9 +221,10 @@
</child>
<child>
<object class="GtkCheckButton" id="cvs_binary">
+ <property name="label" translatable="yes">File is binary</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">File is binary</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -236,32 +242,42 @@
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cancelbutton1">
+ <property name="label">gtk-cancel</property>
<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="receives_default">False</property>
<property name="use_stock">True</property>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="okbutton1">
+ <property name="label">gtk-ok</property>
<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="receives_default">False</property>
<property name="use_stock">True</property>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
@@ -274,7 +290,7 @@
<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>
+ <property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
@@ -294,6 +310,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -301,10 +318,10 @@
<property name="visible">True</property>
<child>
<object class="GtkEntry" id="cvs_remove_filename">
+ <property name="width_request">260</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="width_request">260</property>
</object>
<packing>
<property name="position">0</property>
@@ -352,32 +369,42 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<child internal-child="action_area">
<object class="GtkHButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="button3">
+ <property name="label">gtk-cancel</property>
<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="receives_default">False</property>
<property name="use_stock">True</property>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="button2">
+ <property name="label">gtk-ok</property>
<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="receives_default">False</property>
<property name="use_stock">True</property>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
@@ -392,7 +419,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<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>
+ <property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkVBox" id="vbox4">
<property name="visible">True</property>
@@ -412,6 +439,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -419,10 +447,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<property name="visible">True</property>
<child>
<object class="GtkEntry" id="cvs_commit_filename">
+ <property name="width_request">260</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="width_request">260</property>
</object>
<packing>
<property name="position">0</property>
@@ -449,9 +477,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
</child>
<child>
<object class="GtkCheckButton" id="cvs_commit_project">
+ <property name="label" translatable="yes">Whole project</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Whole project</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -478,15 +507,15 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<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>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<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>
+ <property name="wrap_mode">word</property>
</object>
</child>
</object>
@@ -501,7 +530,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<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>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
@@ -523,25 +552,29 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="cvs_commit_revision">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">*</property>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkCheckButton" id="cvs_commit_norecurse">
+ <property name="label" translatable="yes">Do not act recursively</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Do not act recursively</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -558,8 +591,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<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>
+ <property name="label" translatable="yes">Options:</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -575,32 +610,42 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<child internal-child="action_area">
<object class="GtkHButtonBox" id="hbuttonbox2">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="button4">
+ <property name="label">gtk-cancel</property>
<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="receives_default">False</property>
<property name="use_stock">True</property>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="button5">
+ <property name="label">gtk-ok</property>
<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="receives_default">False</property>
<property name="use_stock">True</property>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
@@ -614,7 +659,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<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>
+ <property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkVBox" id="vbox8">
<property name="visible">True</property>
@@ -634,6 +679,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -641,10 +687,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<property name="visible">True</property>
<child>
<object class="GtkEntry" id="cvs_update_filename">
+ <property name="width_request">260</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="width_request">260</property>
</object>
<packing>
<property name="position">0</property>
@@ -671,9 +717,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
</child>
<child>
<object class="GtkCheckButton" id="cvs_update_project">
+ <property name="label" translatable="yes">Whole project</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Whole project</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -687,7 +734,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<object class="GtkFrame" id="frame3">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
@@ -697,9 +744,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<property name="visible">True</property>
<child>
<object class="GtkCheckButton" id="cvs_removedir">
+ <property name="label" translatable="yes">Delete empty directories</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Delete empty directories</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -707,13 +755,15 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="cvs_createdir">
+ <property name="label" translatable="yes">Create new directories</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Create new directories</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -726,9 +776,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
</child>
<child>
<object class="GtkCheckButton" id="cvs_removesticky">
+ <property name="label" translatable="yes">Reset sticky tags</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Reset sticky tags</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -740,9 +791,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
</child>
<child>
<object class="GtkCheckButton" id="cvs_update_norecurse">
+ <property name="label" translatable="yes">Do not act recursively</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Do not act recursively</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -764,13 +816,13 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="cvs_update_revision">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">*</property>
</object>
<packing>
<property name="position">1</property>
@@ -788,8 +840,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<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>
+ <property name="label" translatable="yes">Options:</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -805,32 +859,42 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<child internal-child="action_area">
<object class="GtkHButtonBox" id="hbuttonbox3">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="button6">
+ <property name="label">gtk-cancel</property>
<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="receives_default">False</property>
<property name="use_stock">True</property>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="button7">
+ <property name="label">gtk-ok</property>
<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="receives_default">False</property>
<property name="use_stock">True</property>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
@@ -849,9 +913,9 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<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>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<object class="GtkTextView" id="cvs_status_text">
<property name="visible">True</property>
@@ -865,7 +929,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<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>
+ <property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkVBox" id="vbox11">
<property name="visible">True</property>
@@ -885,6 +949,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -892,10 +957,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<property name="visible">True</property>
<child>
<object class="GtkEntry" id="cvs_status_filename">
+ <property name="width_request">260</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="width_request">260</property>
</object>
<packing>
<property name="position">0</property>
@@ -922,9 +987,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
</child>
<child>
<object class="GtkCheckButton" id="cvs_status_project">
+ <property name="label" translatable="yes">Whole project</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Whole project</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -938,7 +1004,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<object class="GtkFrame" id="frame4">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
@@ -948,22 +1014,25 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<property name="visible">True</property>
<child>
<object class="GtkCheckButton" id="cvs_status_verbose">
+ <property name="label" translatable="yes">Be verbose</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Be verbose</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="cvs_status_norecurse">
+ <property name="label" translatable="yes">Do not act recursively</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Do not act recursively</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -980,8 +1049,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<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>
+ <property name="label" translatable="yes">Options:</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -997,32 +1068,42 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<child internal-child="action_area">
<object class="GtkHButtonBox" id="hbuttonbox4">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="button8">
+ <property name="label">gtk-cancel</property>
<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="receives_default">False</property>
<property name="use_stock">True</property>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="button9">
+ <property name="label">gtk-ok</property>
<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="receives_default">False</property>
<property name="use_stock">True</property>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
@@ -1035,7 +1116,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<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>
+ <property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkVBox" id="vbox14">
<property name="visible">True</property>
@@ -1055,6 +1136,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -1062,10 +1144,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<property name="visible">True</property>
<child>
<object class="GtkEntry" id="cvs_diff_filename">
+ <property name="width_request">260</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="width_request">260</property>
</object>
<packing>
<property name="position">0</property>
@@ -1092,9 +1174,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
</child>
<child>
<object class="GtkCheckButton" id="cvs_diff_project">
+ <property name="label" translatable="yes">Whole project</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Whole project</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -1108,7 +1191,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<object class="GtkFrame" id="frame5">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment5">
<property name="visible">True</property>
@@ -1131,14 +1214,16 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="cvs_unified">
+ <property name="label" translatable="yes">Unified format instead of context format</property>
<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="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -1160,13 +1245,13 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="cvs_diff_revision">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">*</property>
</object>
<packing>
<property name="position">1</property>
@@ -1181,9 +1266,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
</child>
<child>
<object class="GtkCheckButton" id="cvs_diff_norecurse">
+ <property name="label" translatable="yes">Do not act recursively</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Do not act recursively</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -1200,8 +1286,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<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>
+ <property name="label" translatable="yes">Options:</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -1217,32 +1305,42 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<child internal-child="action_area">
<object class="GtkHButtonBox" id="hbuttonbox5">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="button10">
+ <property name="label">gtk-cancel</property>
<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="receives_default">False</property>
<property name="use_stock">True</property>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="button11">
+ <property name="label">gtk-ok</property>
<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="receives_default">False</property>
<property name="use_stock">True</property>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
@@ -1256,7 +1354,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<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>
+ <property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox2">
<property name="visible">True</property>
@@ -1275,6 +1373,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -1282,10 +1381,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<property name="visible">True</property>
<child>
<object class="GtkEntry" id="cvs_logdialog_filename">
+ <property name="width_request">260</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="width_request">260</property>
</object>
<packing>
<property name="position">0</property>
@@ -1312,9 +1411,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
</child>
<child>
<object class="GtkCheckButton" id="cvs_logdialog_project">
+ <property name="label" translatable="yes">Whole project</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Whole project</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -1328,7 +1428,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<object class="GtkFrame" id="frame6">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment6">
<property name="visible">True</property>
@@ -1338,9 +1438,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<property name="visible">True</property>
<child>
<object class="GtkCheckButton" id="cvs_logdialog_verbose">
+ <property name="label" translatable="yes">Be verbose</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Be verbose</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -1348,13 +1449,15 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="cvs_logdialog_norecurse">
+ <property name="label" translatable="yes">Do not act recursively</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Do not act recursively</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -1371,8 +1474,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<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>
+ <property name="label" translatable="yes">Options</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -1388,32 +1493,42 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area2">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cancelbutton2">
+ <property name="label">gtk-cancel</property>
<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="receives_default">False</property>
<property name="use_stock">True</property>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="okbutton2">
+ <property name="label">gtk-ok</property>
<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="receives_default">False</property>
<property name="use_stock">True</property>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
@@ -1426,7 +1541,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<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>
+ <property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox3">
<property name="visible">True</property>
@@ -1435,7 +1550,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<object class="GtkFrame" id="frame8">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment8">
<property name="visible">True</property>
@@ -1457,7 +1572,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1471,7 +1586,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1485,7 +1600,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1498,7 +1613,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1511,7 +1626,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1525,7 +1640,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1544,14 +1659,14 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<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>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<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>
+ <property name="wrap_mode">word</property>
</object>
</child>
</object>
@@ -1566,7 +1681,6 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<object class="GtkEntry" id="cvs_module">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">*</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -1581,7 +1695,6 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<object class="GtkEntry" id="cvs_cvsroot">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">*</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -1596,7 +1709,6 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<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>
</object>
<packing>
@@ -1612,7 +1724,6 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<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>
</object>
<packing>
@@ -1631,8 +1742,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<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>
+ <property name="label" translatable="yes">Module Details:</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -1644,7 +1757,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<object class="GtkFrame" id="frame7">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment7">
<property name="visible">True</property>
@@ -1657,8 +1770,6 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<child>
<object class="GtkTable" id="table8">
<property name="visible">True</property>
- <property name="n_rows">1</property>
- <property name="n_columns">1</property>
<child>
<object class="GtkComboBox" id="cvs_server_type">
<property name="visible">True</property>
@@ -1671,14 +1782,15 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
</child>
</object>
<packing>
- <property name="x_options"/>
- <property name="y_options"/>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -1698,7 +1810,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1709,7 +1821,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -1717,26 +1829,24 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="visibility">False</property>
- <property name="invisible_char">*</property>
</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 name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkEntry" id="cvs_username">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">*</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
</object>
@@ -1751,8 +1861,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<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>
+ <property name="label" translatable="yes">Repository:</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -1763,32 +1875,42 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area3">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cancelbutton3">
+ <property name="label">gtk-cancel</property>
<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="receives_default">False</property>
<property name="use_stock">True</property>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="okbutton3">
+ <property name="label">gtk-ok</property>
<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="receives_default">False</property>
<property name="use_stock">True</property>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
diff --git a/plugins/debug-manager/anjuta-debug-manager.ui b/plugins/debug-manager/anjuta-debug-manager.ui
index e5d6626..66cec1e 100644
--- a/plugins/debug-manager/anjuta-debug-manager.ui
+++ b/plugins/debug-manager/anjuta-debug-manager.ui
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<interface>
- <requires lib="gtk+" version="2.14"/>
+ <requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy project-wide -->
<object class="GtkDialog" id="attach_process_dialog">
<property name="title" translatable="yes">Attach to process</property>
@@ -1702,8 +1702,10 @@
<child type="label">
<object class="GtkLabel" id="label12350">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Debugger:</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Debugger:</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -2201,7 +2203,7 @@
</action-widgets>
</object>
<object class="GtkWindow" id="debug_manager_preferences">
- <property name="title" translatable="no">window1</property>
+ <property name="title">window1</property>
<child>
<object class="GtkVBox" id="preferences_container">
<property name="visible">True</property>
@@ -2349,8 +2351,10 @@
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Remote debugging</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Remote debugging</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -2443,7 +2447,7 @@ When optimizations are enabled, the debugger cannot always identify the source c
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="button4">
- <property name="label" translatable="no">gtk-cancel</property>
+ <property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -2457,7 +2461,7 @@ When optimizations are enabled, the debugger cannot always identify the source c
</child>
<child>
<object class="GtkButton" id="button8">
- <property name="label" translatable="no">gtk-execute</property>
+ <property name="label">gtk-execute</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
diff --git a/plugins/document-manager/anjuta-document-manager.ui b/plugins/document-manager/anjuta-document-manager.ui
index 67fe19f..0c5fcc8 100644
--- a/plugins/document-manager/anjuta-document-manager.ui
+++ b/plugins/document-manager/anjuta-document-manager.ui
@@ -1,24 +1,23 @@
<?xml version="1.0"?>
-<!--*- mode: xml -*-->
<interface>
+ <requires lib="gtk+" version="2.16"/>
+ <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAdjustment" id="adjustment1">
- <property name="upper">1000</property>
+ <property name="value">10</property>
<property name="lower">1</property>
- <property name="page_increment">10</property>
+ <property name="upper">1000</property>
<property name="step_increment">1</property>
- <property name="page_size">0</property>
- <property name="value">10</property>
+ <property name="page_increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment2">
+ <property name="value">10</property>
<property name="upper">1000</property>
- <property name="lower">0</property>
- <property name="page_increment">10</property>
<property name="step_increment">1</property>
- <property name="page_size">0</property>
- <property name="value">10</property>
+ <property name="page_increment">10</property>
</object>
<object class="GtkListStore" id="model1">
<columns>
+ <!-- column-name gchararray -->
<column type="gchararray"/>
</columns>
<data>
@@ -51,7 +50,7 @@
<object class="GtkFrame" id="frame46">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkVBox" id="vbox1119">
<property name="visible">True</property>
@@ -59,15 +58,17 @@
<property name="spacing">5</property>
<child>
<object class="GtkCheckButton" id="preferences_toggle:bool:1:0:save.automatic">
+ <property name="label" translatable="yes">Enable files autosave</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Enable files autosave</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -87,7 +88,7 @@
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -101,7 +102,7 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -114,7 +115,7 @@
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -128,7 +129,7 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
</object>
@@ -142,13 +143,16 @@
<child type="label">
<object class="GtkLabel" id="label12335">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Autosave</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Autosave</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -160,6 +164,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -173,7 +178,7 @@
<object class="GtkFrame" id="frame31">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkVBox" id="vbox33">
<property name="visible">True</property>
@@ -181,9 +186,10 @@
<property name="spacing">5</property>
<child>
<object class="GtkRadioButton" id="radiobutton9">
+ <property name="label" translatable="yes">Sorted in opening order</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Sorted in opening order</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -191,13 +197,15 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="preferences_toggle:bool:0:0:editor.tabs.recent.first">
+ <property name="label" translatable="yes">Sorted by most recent use</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Sorted by most recent use</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">radiobutton9</property>
@@ -210,9 +218,10 @@
</child>
<child>
<object class="GtkRadioButton" id="preferences_toggle:bool:0:0:editor.tabs.ordering">
+ <property name="label" translatable="yes">Sorted in alphabetical order</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Sorted in alphabetical order</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">radiobutton9</property>
@@ -225,9 +234,10 @@
</child>
<child>
<object class="GtkRadioButton" id="preferences_toggle:bool:0:0:editor.tabs.hide">
+ <property name="label" translatable="yes">Do not show tabs</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Do not show tabs</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">radiobutton9</property>
@@ -251,6 +261,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -282,8 +293,10 @@
<child type="label">
<object class="GtkLabel" id="label113">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Editor tabs</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Editor tabs</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
diff --git a/plugins/file-wizard/anjuta-file-wizard.ui b/plugins/file-wizard/anjuta-file-wizard.ui
index cac2af7..698bac9 100644
--- a/plugins/file-wizard/anjuta-file-wizard.ui
+++ b/plugins/file-wizard/anjuta-file-wizard.ui
@@ -25,8 +25,10 @@
<object class="GtkLabel" id="label12346">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>File Information</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">File Information</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -151,8 +153,10 @@ The extension will be added according to the type.</property>
<object class="GtkLabel" id="label12342">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Options</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Options</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
diff --git a/plugins/gbf-am/gbf-am-dialogs.ui b/plugins/gbf-am/gbf-am-dialogs.ui
index 57256dd..120b26b 100644
--- a/plugins/gbf-am/gbf-am-dialogs.ui
+++ b/plugins/gbf-am/gbf-am-dialogs.ui
@@ -1,111 +1,106 @@
<?xml version="1.0"?>
-<!--*- mode: xml -*-->
<interface>
+ <requires lib="gtk+" version="2.16"/>
+ <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkWindow" id="project_properties_dialog">
<property name="title" translatable="yes">window1</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
<child>
<object class="GtkNotebook" id="top_level">
- <property name="border_width">5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="show_tabs">True</property>
- <property name="show_border">True</property>
- <property name="tab_pos">GTK_POS_TOP</property>
- <property name="scrollable">False</property>
- <property name="enable_popup">False</property>
+ <property name="border_width">5</property>
<child>
<object class="GtkTable" id="general_properties_table">
<property name="visible">True</property>
<property name="n_rows">7</property>
<property name="n_columns">2</property>
- <property name="homogeneous">False</property>
- <property name="row_spacing">0</property>
- <property name="column_spacing">0</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
- <packing>
- <property name="tab_expand">False</property>
- <property name="tab_fill">True</property>
- </packing>
</child>
<child type="tab">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="label" translatable="yes">General</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
</child>
<child>
<object class="GtkVBox" id="vbox1">
<property name="height_request">300</property>
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
<child>
<object class="GtkHButtonBox" id="hbuttonbox1">
- <property name="border_width">5</property>
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="border_width">5</property>
<property name="spacing">5</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="add_module_button">
<property name="visible">True</property>
- <property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
<child>
<object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
<property name="spacing">2</property>
<child>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -113,23 +108,11 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Add _module</property>
<property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -137,44 +120,36 @@
</object>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="add_package_button">
<property name="visible">True</property>
- <property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
<child>
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
<child>
<object class="GtkHBox" id="hbox2">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
<property name="spacing">2</property>
<child>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -182,23 +157,11 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Add _Package</property>
<property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -206,272 +169,180 @@
</object>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="remove_button">
+ <property name="label">gtk-remove</property>
<property name="visible">True</property>
- <property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-remove</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
</child>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="border_width">5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+ <property name="border_width">5</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">etched-in</property>
<child>
<object class="GtkTreeView" id="packages_treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="headers_visible">True</property>
- <property name="rules_hint">False</property>
- <property name="reorderable">False</property>
- <property name="enable_search">True</property>
- <property name="fixed_height_mode">False</property>
- <property name="hover_selection">False</property>
- <property name="hover_expand">False</property>
</object>
</child>
</object>
<packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="tab_expand">False</property>
- <property name="tab_fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
<child type="tab">
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="label" translatable="yes">Packages</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
</child>
<child>
<object class="GtkVBox" id="vbox3">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
<child>
<object class="GtkHButtonBox" id="hbuttonbox2">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
<property name="spacing">5</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="add_variable_button">
+ <property name="label">gtk-add</property>
<property name="visible">True</property>
- <property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-add</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="remove_variable_button">
+ <property name="label">gtk-remove</property>
<property name="visible">True</property>
- <property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-remove</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow3">
- <property name="border_width">5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+ <property name="border_width">5</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="variables_treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="headers_visible">True</property>
- <property name="rules_hint">False</property>
- <property name="reorderable">False</property>
- <property name="enable_search">True</property>
- <property name="fixed_height_mode">False</property>
- <property name="hover_selection">False</property>
- <property name="hover_expand">False</property>
</object>
</child>
</object>
<packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="tab_expand">False</property>
- <property name="tab_fill">True</property>
+ <property name="position">2</property>
</packing>
</child>
<child type="tab">
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="label" translatable="yes">Variables</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
</object>
+ <packing>
+ <property name="position">2</property>
+ <property name="tab_fill">False</property>
+ </packing>
</child>
</object>
</child>
</object>
<object class="GtkDialog" id="package_selection_dialog">
<property name="title" translatable="yes">Select package</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
<property name="default_width">600</property>
<property name="default_height">500</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="has_separator">True</property>
+ <property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
- <child>
- <object class="GtkButton" id="cancelbutton1">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-cancel</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </object>
- </child>
- <child>
- <object class="GtkButton" id="okbutton1">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-add</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
<child>
<object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">1</property>
- <property name="yscale">1</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
<property name="left_padding">12</property>
- <property name="right_padding">0</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow2">
- <property name="border_width">5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+ <property name="border_width">5</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="pkg_treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="headers_visible">True</property>
- <property name="rules_hint">False</property>
- <property name="reorderable">False</property>
- <property name="enable_search">True</property>
- <property name="fixed_height_mode">False</property>
- <property name="hover_selection">False</property>
- <property name="hover_expand">False</property>
</object>
</child>
</object>
@@ -481,34 +352,61 @@
<child type="label">
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Select Package to add:</b></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
+ <property name="label" translatable="yes">Select Package to add:</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
<packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="cancelbutton1">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="okbutton1">
+ <property name="label">gtk-add</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
diff --git a/plugins/git/anjuta-git.ui b/plugins/git/anjuta-git.ui
index ad0fcac..b57e437 100644
--- a/plugins/git/anjuta-git.ui
+++ b/plugins/git/anjuta-git.ui
@@ -2066,8 +2066,10 @@
<child type="label">
<object class="GtkLabel" id="label64">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Options</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Options</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -4964,8 +4966,10 @@
<child type="label">
<object class="GtkLabel" id="label63">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Tags</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Tags</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -5563,8 +5567,10 @@
<child type="label">
<object class="GtkLabel" id="label65">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Stash Message (Optional)</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Stash Message (Optional)</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -5595,8 +5601,10 @@
<child type="label">
<object class="GtkLabel" id="label66">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Options</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Options</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -5886,8 +5894,10 @@
<child type="label">
<object class="GtkLabel" id="label68">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Stash to Apply</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Stash to Apply</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -5918,8 +5928,10 @@
<child type="label">
<object class="GtkLabel" id="label69">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Options</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Options</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
diff --git a/plugins/macro/anjuta-macro.ui b/plugins/macro/anjuta-macro.ui
index dd8285d..72e82ff 100644
--- a/plugins/macro/anjuta-macro.ui
+++ b/plugins/macro/anjuta-macro.ui
@@ -1,6 +1,7 @@
<?xml version="1.0"?>
-<!--*- mode: xml -*-->
<interface>
+ <requires lib="gtk+" version="2.16"/>
+ <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkVBox" id="macro_dialog_table">
<property name="visible">True</property>
<child>
@@ -16,12 +17,15 @@
<object class="GtkLabel" id="label10">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Macros:</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Macros:</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -29,9 +33,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="border_width">5</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="macro_tree">
<property name="visible">True</property>
@@ -68,12 +72,15 @@
<object class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Macro text:</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Macro text:</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -81,9 +88,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="border_width">5</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<object class="GtkTextView" id="macro_preview">
<property name="visible">True</property>
@@ -100,8 +107,10 @@
<object class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Macro details:</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Macro details:</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -127,46 +136,61 @@
</packing>
</child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkHButtonBox" id="hbuttonbox2">
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="spacing">5</property>
- <property name="layout_style">GTK_BUTTONBOX_START</property>
+ <property name="layout_style">start</property>
<child>
<object class="GtkButton" id="macro_add">
+ <property name="label">gtk-add</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-add</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <signal handler="on_add_clicked" name="clicked"/>
+ <signal name="clicked" handler="on_add_clicked"/>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="macro_edit">
+ <property name="label" translatable="yes">Edit...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label" translatable="yes">Edit...</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <signal handler="on_edit_clicked" name="clicked"/>
+ <signal name="clicked" handler="on_edit_clicked"/>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="macro_remove">
+ <property name="label">gtk-remove</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-remove</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <signal handler="on_remove_clicked" name="clicked"/>
+ <signal name="clicked" handler="on_remove_clicked"/>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
@@ -186,34 +210,32 @@
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
<child>
- <placeholder/>
- </child>
- <child>
<object class="GtkEntry" id="macro_shortcut">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="max_length">1</property>
- <property name="invisible_char">*</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label12">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Macro details:</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Macro details:</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -227,36 +249,37 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkEntry" id="macro_name">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">*</property>
</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 name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Macro text:</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Macro text:</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="right_attach">2</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -264,9 +287,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="border_width">5</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<object class="GtkTextView" id="macro_text">
<property name="visible">True</property>
@@ -292,7 +315,7 @@
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -306,8 +329,11 @@
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</interface>
diff --git a/plugins/message-view/anjuta-message-manager-plugin.ui b/plugins/message-view/anjuta-message-manager-plugin.ui
index df2ecc2..59022a1 100644
--- a/plugins/message-view/anjuta-message-manager-plugin.ui
+++ b/plugins/message-view/anjuta-message-manager-plugin.ui
@@ -1,24 +1,24 @@
<?xml version="1.0"?>
-<!--*- mode: xml -*-->
<interface>
+ <requires lib="gtk+" version="2.16"/>
+ <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAdjustment" id="adjustment1">
- <property name="upper">1000</property>
+ <property name="value">50</property>
<property name="lower">1</property>
- <property name="page_increment">10</property>
+ <property name="upper">1000</property>
<property name="step_increment">1</property>
- <property name="page_size">0</property>
- <property name="value">50</property>
+ <property name="page_increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment2">
- <property name="upper">1000</property>
+ <property name="value">50</property>
<property name="lower">1</property>
- <property name="page_increment">10</property>
+ <property name="upper">1000</property>
<property name="step_increment">1</property>
- <property name="page_size">0</property>
- <property name="value">50</property>
+ <property name="page_increment">10</property>
</object>
<object class="GtkListStore" id="model1">
<columns>
+ <!-- column-name gchararray -->
<column type="gchararray"/>
</columns>
<data>
@@ -38,28 +38,30 @@
</object>
<object class="GtkListStore" id="model2">
<columns>
+ <!-- column-name gchararray -->
<column type="gchararray"/>
</columns>
<data>
<row>
- <col id="0" comments="text style in editor" translatable="yes">Underline-Plain</col>
+ <col id="0" translatable="yes" comments="text style in editor">Underline-Plain</col>
</row>
<row>
- <col id="0" comments="text style in editor" translatable="yes">Underline-Squiggle</col>
+ <col id="0" translatable="yes" comments="text style in editor">Underline-Squiggle</col>
</row>
<row>
- <col id="0" comments="text style in editor, TT is for typewriter text" translatable="yes">Underline-TT</col>
+ <col id="0" translatable="yes" comments="text style in editor, TT is for typewriter text">Underline-TT</col>
</row>
<row>
- <col id="0" comments="text style in editor" translatable="yes">Diagonal</col>
+ <col id="0" translatable="yes" comments="text style in editor">Diagonal</col>
</row>
<row>
- <col id="0" comments="text style in editor" translatable="yes">Strike-Out</col>
+ <col id="0" translatable="yes" comments="text style in editor">Strike-Out</col>
</row>
</data>
</object>
<object class="GtkListStore" id="model3">
<columns>
+ <!-- column-name gchararray -->
<column type="gchararray"/>
</columns>
<data>
@@ -82,6 +84,7 @@
</object>
<object class="GtkListStore" id="model4">
<columns>
+ <!-- column-name gchararray -->
<column type="gchararray"/>
</columns>
<data>
@@ -112,7 +115,7 @@
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkTable" id="table18">
<property name="visible">True</property>
@@ -122,9 +125,6 @@
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
<child>
- <placeholder/>
- </child>
- <child>
<object class="GtkLabel" id="label138">
<property name="visible">True</property>
<property name="xalign">0</property>
@@ -134,7 +134,7 @@
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -150,7 +150,7 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -166,7 +166,7 @@
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -178,7 +178,7 @@
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -190,19 +190,20 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="preferences_toggle:bool:0:0:truncat.messages">
- <property name="can_focus">True</property>
<property name="label" translatable="yes">Truncate long messages</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -224,18 +225,24 @@
<property name="bottom_attach">4</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label135">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Messages options</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Messages options</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -243,7 +250,7 @@
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkTable" id="table19">
<property name="visible">True</property>
@@ -262,7 +269,7 @@
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -275,7 +282,7 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -286,7 +293,7 @@
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -349,8 +356,10 @@
<child type="label">
<object class="GtkLabel" id="label139">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Indicators</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Indicators</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -364,43 +373,38 @@
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkTable" id="table20">
<property name="visible">True</property>
<property name="border_width">10</property>
- <property name="n_rows">1</property>
<property name="n_columns">6</property>
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
<object class="GtkColorButton" id="preferences_color:color:#E00000:0:messages.color.error">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="receives_default">False</property>
</object>
<packing>
<property name="left_attach">5</property>
<property name="right_attach">6</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkColorButton" id="preferences_color:color:#F05000:0:messages.color.warning">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="receives_default">False</property>
</object>
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -413,7 +417,7 @@
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -426,16 +430,24 @@
<property name="left_attach">4</property>
<property name="right_attach">5</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label143">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Message colors</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Message colors</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
diff --git a/plugins/project-import/project-import.ui b/plugins/project-import/project-import.ui
index 0aaf81d..cdbb7ef 100644
--- a/plugins/project-import/project-import.ui
+++ b/plugins/project-import/project-import.ui
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<interface>
- <requires lib="gtk+" version="2.14"/>
+ <requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy project-wide -->
<object class="GtkWindow" id="window1">
<child>
@@ -36,8 +36,10 @@
<child type="label">
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Project name</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Project name</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -230,8 +232,10 @@
<child type="label">
<object class="GtkLabel" id="label12">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Import options</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Import options</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
diff --git a/plugins/project-wizard/anjuta-project-wizard.ui b/plugins/project-wizard/anjuta-project-wizard.ui
index 81e3d11..673e9af 100644
--- a/plugins/project-wizard/anjuta-project-wizard.ui
+++ b/plugins/project-wizard/anjuta-project-wizard.ui
@@ -1,8 +1,9 @@
<?xml version="1.0"?>
-<!--*- mode: xml -*-->
<interface>
+ <requires lib="gtk+" version="2.16"/>
+ <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAssistant" id="druid_window">
- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+ <property name="window_position">center-on-parent</property>
<property name="skip_taskbar_hint">True</property>
<property name="skip_pager_hint">True</property>
<child>
@@ -14,9 +15,9 @@
<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>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<object class="GtkIconView" id="project_list">
<property name="width_request">468</property>
@@ -24,13 +25,11 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_tooltip">True</property>
- <property name="pixbuf_column">0</property>
- <property name="text_column">1</property>
- <property name="selection_mode">GTK_SELECTION_BROWSE</property>
+ <property name="selection_mode">browse</property>
<property name="row_spacing">0</property>
<property name="column_spacing">12</property>
<property name="tooltip_column">2</property>
- <signal handler="on_druid_project_select_icon" name="selection_changed"/>
+ <signal name="selection_changed" handler="on_druid_project_select_icon"/>
</object>
</child>
</object>
@@ -46,8 +45,8 @@
</child>
</object>
<packing>
- <property name="page_type">GTK_ASSISTANT_PAGE_INTRO</property>
- <property name="title" translatable="yes">Select project type</property>
+ <property name="page_type">intro</property>
+ <property name="title">Select project type</property>
<property name="header_image">applogo.png</property>
</packing>
</child>
@@ -61,11 +60,12 @@
<property name="yalign">0</property>
<property name="ypad">6</property>
<property name="stock">gtk-dialog-error</property>
- <property name="icon_size">6</property>
+ <property name="icon-size">6</property>
</object>
<packing>
<property name="expand">False</property>
<property name="padding">6</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -84,6 +84,7 @@
<packing>
<property name="expand">False</property>
<property name="padding">6</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -101,8 +102,10 @@
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Details</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Details</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -127,7 +130,7 @@
<property name="wrap">True</property>
</object>
<packing>
- <property name="page_type">GTK_ASSISTANT_PAGE_PROGRESS</property>
+ <property name="page_type">progress</property>
<property name="title">Application Assistant</property>
<property name="header_image">applogo.png</property>
</packing>
@@ -138,7 +141,7 @@
<property name="use_markup">True</property>
</object>
<packing>
- <property name="page_type">GTK_ASSISTANT_PAGE_CONFIRM</property>
+ <property name="page_type">confirm</property>
<property name="title">Summary</property>
<property name="header_image">applogo.png</property>
<property name="sidebar_image">appwizard.png</property>
@@ -147,11 +150,11 @@
<child>
<object class="GtkScrolledWindow" id="property_page">
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="vscrollbar_policy">automatic</property>
<child>
<object class="GtkViewport" id="viewport1">
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkTable" id="property_table">
<property name="border_width">5</property>
diff --git a/plugins/search/anjuta-search.ui b/plugins/search/anjuta-search.ui
index 4201694..4966efa 100644
--- a/plugins/search/anjuta-search.ui
+++ b/plugins/search/anjuta-search.ui
@@ -1,16 +1,17 @@
<?xml version="1.0"?>
-<!--*- mode: xml -*-->
<interface>
+ <requires lib="gtk+" version="2.16"/>
+ <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAdjustment" id="adjustment1">
- <property name="upper">400</property>
+ <property name="value">100</property>
<property name="lower">1</property>
- <property name="page_increment">10</property>
+ <property name="upper">400</property>
<property name="step_increment">1</property>
- <property name="page_size">0</property>
- <property name="value">100</property>
+ <property name="page_increment">10</property>
</object>
<object class="GtkListStore" id="model1">
<columns>
+ <!-- column-name gchararray -->
<column type="gchararray"/>
</columns>
<data>
@@ -21,52 +22,55 @@
</object>
<object class="GtkListStore" id="model2">
<columns>
+ <!-- column-name gchararray -->
<column type="gchararray"/>
</columns>
<data>
<row>
- <col id="0" translatable="no">CVS</col>
+ <col id="0">CVS</col>
</row>
<row>
- <col id="0" translatable="no">CVS intl po </col>
+ <col id="0">CVS intl po </col>
</row>
</data>
</object>
<object class="GtkListStore" id="model3">
<columns>
+ <!-- column-name gchararray -->
<column type="gchararray"/>
</columns>
<data>
<row>
- <col id="0" translatable="no">*.so *.o *.a *.la</col>
+ <col id="0">*.so *.o *.a *.la</col>
</row>
</data>
</object>
<object class="GtkListStore" id="model4">
<columns>
+ <!-- column-name gchararray -->
<column type="gchararray"/>
</columns>
<data>
<row>
- <col id="0" translatable="no">*\.*</col>
+ <col id="0">*\.*</col>
</row>
<row>
- <col id="0" translatable="no">*.c *.cpp *.cxx *.cc *.C *.h *.H *.hh *.hxx *.hpp</col>
+ <col id="0">*.c *.cpp *.cxx *.cc *.C *.h *.H *.hh *.hxx *.hpp</col>
</row>
<row>
- <col id="0" translatable="no">*.cpp *.cxx *.cc *.C *.h *.H *.hh *.hxx *.hpp Makefile.am configure.* README AUTHORS ChangeLog *.m4</col>
+ <col id="0">*.cpp *.cxx *.cc *.C *.h *.H *.hh *.hxx *.hpp Makefile.am configure.* README AUTHORS ChangeLog *.m4</col>
</row>
</data>
</object>
<object class="GtkWindow" id="dialog.search.replace">
<property name="title" translatable="yes">Find & Replace</property>
- <signal after="yes" handler="on_search_dialog_key_press_event" name="key_press_event" object="dialog.search.replace"/>
- <signal handler="on_search_replace_delete_event" name="delete_event"/>
+ <signal name="key_press_event" handler="on_search_dialog_key_press_event" object="dialog.search.replace" after="yes"/>
+ <signal name="delete_event" handler="on_search_replace_delete_event"/>
<child>
<object class="GtkFrame" id="frame9">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkVBox" id="vbox10">
<property name="visible">True</property>
@@ -74,7 +78,7 @@
<object class="GtkFrame" id="frame10">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkNotebook" id="search.notebook">
<property name="visible">True</property>
@@ -84,19 +88,18 @@
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkTable" id="table3">
<property name="visible">True</property>
<property name="n_rows">3</property>
- <property name="n_columns">1</property>
<property name="column_spacing">10</property>
<property name="row_spacing">7</property>
<child>
<object class="GtkFrame" id="frame50">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkTable" id="table30">
<property name="visible">True</property>
@@ -105,13 +108,11 @@
<property name="n_columns">3</property>
<property name="row_spacing">5</property>
<child>
- <placeholder/>
- </child>
- <child>
<object class="GtkCheckButton" id="replace.regex">
+ <property name="label" translatable="yes">Expand regex back references</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Expand regex back references</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -120,24 +121,20 @@
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
<property name="x_padding">4</property>
</packing>
</child>
<child>
<object class="GtkComboBoxEntry" id="replace.string.combo">
<property name="visible">True</property>
- <child internal-child="entry">
- <object class="GtkEntry" id="comboboxentry-entry2">
- </object>
- </child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -146,27 +143,23 @@
<property name="xalign">0</property>
<property name="xpad">5</property>
<property name="label" translatable="yes">Replace With:</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="justify">center</property>
</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 name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkComboBoxEntry" id="search.string.combo">
<property name="visible">True</property>
- <child internal-child="entry">
- <object class="GtkEntry" id="comboboxentry-entry1">
- </object>
- </child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">3</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -174,21 +167,26 @@
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="xpad">5</property>
- <property comments="This is "the search expression" (noun)" name="label" translatable="yes">Search Expression:</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="label" translatable="yes" comments="This is "the search expression" (noun)">Search Expression:</property>
+ <property name="justify">center</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label12357">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Parameters</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Parameters</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -201,7 +199,7 @@
<object class="GtkFrame" id="frame.search.basic">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkHBox" id="hbox1127">
<property name="visible">True</property>
@@ -209,27 +207,30 @@
<property name="spacing">20</property>
<child>
<object class="GtkRadioButton" id="search.full_buffer">
+ <property name="label" translatable="yes">Full Buffer</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Full Buffer</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <signal handler="on_search_full_buffer_toggled" name="toggled"/>
+ <signal name="toggled" handler="on_search_full_buffer_toggled"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="search.forward">
+ <property name="label" translatable="yes">Forward</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Forward</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">search.full_buffer</property>
- <signal handler="on_search_forward_toggled" name="toggled"/>
+ <signal name="toggled" handler="on_search_forward_toggled"/>
</object>
<packing>
<property name="expand">False</property>
@@ -239,13 +240,14 @@
</child>
<child>
<object class="GtkRadioButton" id="search.backward">
+ <property name="label" translatable="yes">Backward</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Backward</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">search.full_buffer</property>
- <signal handler="on_search_backward_toggled" name="toggled"/>
+ <signal name="toggled" handler="on_search_backward_toggled"/>
</object>
<packing>
<property name="expand">False</property>
@@ -258,8 +260,10 @@
<child type="label">
<object class="GtkLabel" id="label12356">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Scope</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Scope</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -273,7 +277,7 @@
<object class="GtkFrame" id="frame51">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkTable" id="table31">
<property name="visible">True</property>
@@ -282,12 +286,13 @@
<property name="n_columns">2</property>
<child>
<object class="GtkCheckButton" id="search.match.word.start">
+ <property name="label" translatable="yes">Match at start of word</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Match at start of word</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <signal handler="on_search_match_word_start_toggled" name="toggled"/>
+ <signal name="toggled" handler="on_search_match_word_start_toggled"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -295,18 +300,19 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
<property name="x_padding">5</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="search.match.whole.line">
+ <property name="label" translatable="yes">Match complete lines</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Match complete lines</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <signal handler="on_search_match_whole_line_toggled" name="toggled"/>
+ <signal name="toggled" handler="on_search_match_whole_line_toggled"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -314,15 +320,16 @@
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
<property name="x_padding">5</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="search.greedy">
+ <property name="label" translatable="yes">Greedy matching</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Greedy matching</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -330,32 +337,34 @@
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
<property name="x_padding">5</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="search.match.whole.word">
+ <property name="label" translatable="yes">Match complete words</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Match complete words</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <signal handler="on_search_match_whole_word_toggled" name="toggled"/>
+ <signal name="toggled" handler="on_search_match_whole_word_toggled"/>
</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 name="y_options"></property>
<property name="x_padding">5</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="search.match.case">
+ <property name="label" translatable="yes">Match case</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Match case</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -363,22 +372,23 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
<property name="x_padding">5</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="search.regex">
+ <property name="label" translatable="yes">Regular expression</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Regular expression</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <signal handler="on_search_regex_toggled" name="toggled"/>
+ <signal name="toggled" handler="on_search_regex_toggled"/>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
<property name="x_padding">5</property>
</packing>
</child>
@@ -387,8 +397,10 @@
<child type="label">
<object class="GtkLabel" id="label12355">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Options</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Options</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -405,8 +417,8 @@
<child type="tab">
<object class="GtkLabel" id="search.expression.tab">
<property name="visible">True</property>
- <property comments="This is "the search expression" (noun)" name="label" translatable="yes">Search Expression</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="label" translatable="yes" comments="This is "the search expression" (noun)">Search Expression</property>
+ <property name="justify">center</property>
</object>
<packing>
<property name="tab_fill">False</property>
@@ -417,7 +429,7 @@
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkTable" id="table4">
<property name="visible">True</property>
@@ -427,7 +439,7 @@
<object class="GtkFrame" id="frame60">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkTable" id="table33">
<property name="visible">True</property>
@@ -443,7 +455,7 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -455,7 +467,7 @@
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -463,13 +475,13 @@
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Search Direction:</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="justify">center</property>
</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 name="y_options"></property>
</packing>
</child>
<child>
@@ -477,11 +489,11 @@
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Search In:</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="justify">center</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
</object>
@@ -489,8 +501,10 @@
<child type="label">
<object class="GtkLabel" id="label12358">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Scope</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Scope</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -503,7 +517,7 @@
<object class="GtkFrame" id="frame56">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkTable" id="table32">
<property name="visible">True</property>
@@ -525,16 +539,18 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="actions.no_limit">
+ <property name="label" translatable="yes">No Limit</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">No Limit</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <signal handler="on_actions_no_limit_clicked" name="clicked"/>
+ <signal name="clicked" handler="on_actions_no_limit_clicked"/>
</object>
<packing>
<property name="expand">False</property>
@@ -557,13 +573,13 @@
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Maximum Actions</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="justify">center</property>
</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 name="y_options"></property>
</packing>
</child>
<child>
@@ -573,7 +589,7 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -581,11 +597,11 @@
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Search Action:</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="justify">center</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
</object>
@@ -593,8 +609,10 @@
<child type="label">
<object class="GtkLabel" id="label12354">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Actions</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Actions</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -608,14 +626,10 @@
<child>
<object class="GtkFrame" id="frame.search.var">
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkComboBoxEntry" id="search.var.combo">
<property name="visible">True</property>
- <child internal-child="entry">
- <object class="GtkEntry" id="comboboxentry-entry7">
- </object>
- </child>
<property name="model">model1</property>
<child>
<object class="GtkCellRendererText" id="renderer1"/>
@@ -628,8 +642,10 @@
<child type="label">
<object class="GtkLabel" id="label41">
<property name="visible">True</property>
- <property comments="User can select variables that contain lists of files, so this is a combined noun" name="label" translatable="yes"><b>Search variable</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes" comments="User can select variables that contain lists of files, so this is a combined noun">Search variable</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -643,7 +659,7 @@
<child>
<object class="GtkFrame" id="frame.file.filter">
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkTable" id="table5">
<property name="visible">True</property>
@@ -655,10 +671,6 @@
<child>
<object class="GtkComboBoxEntry" id="dir.filter.unmatch.combo">
<property name="visible">True</property>
- <child internal-child="entry">
- <object class="GtkEntry" id="comboboxentry-entry6">
- </object>
- </child>
<property name="model">model2</property>
<child>
<object class="GtkCellRendererText" id="renderer2"/>
@@ -672,32 +684,24 @@
<property name="right_attach">3</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkComboBoxEntry" id="dir.filter.match.combo">
<property name="visible">True</property>
- <child internal-child="entry">
- <object class="GtkEntry" id="comboboxentry-entry5">
- </object>
- </child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">3</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkComboBoxEntry" id="file.filter.unmatch.combo">
<property name="visible">True</property>
- <child internal-child="entry">
- <object class="GtkEntry" id="comboboxentry-entry4">
- </object>
- </child>
<property name="model">model3</property>
<child>
<object class="GtkCellRendererText" id="renderer3"/>
@@ -711,16 +715,12 @@
<property name="right_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkComboBoxEntry" id="file.filter.match.combo">
<property name="visible">True</property>
- <child internal-child="entry">
- <object class="GtkEntry" id="comboboxentry-entry3">
- </object>
- </child>
<property name="model">model4</property>
<child>
<object class="GtkCellRendererText" id="renderer4"/>
@@ -732,14 +732,15 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">3</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="ignore.binary.files">
+ <property name="label" translatable="yes">Ignore Binary Files</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Ignore Binary Files</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -748,14 +749,15 @@
<property name="right_attach">3</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="search.dir.recursive">
+ <property name="label" translatable="yes">Search Recursively</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Search Recursively</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -764,14 +766,15 @@
<property name="right_attach">3</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="ignore.hidden.dirs">
+ <property name="label" translatable="yes">Ignore Hidden Directories</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Ignore Hidden Directories</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -779,7 +782,7 @@
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -787,13 +790,13 @@
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Ignore Directories:</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="justify">center</property>
</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 name="y_options"></property>
</packing>
</child>
<child>
@@ -801,20 +804,21 @@
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Choose Directories:</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="justify">center</property>
</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 name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="ignore.hidden.files">
+ <property name="label" translatable="yes">Ignore Hidden Files</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Ignore Hidden Files</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -822,7 +826,7 @@
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -830,13 +834,13 @@
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Ignore Files:</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="justify">center</property>
</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 name="y_options"></property>
</packing>
</child>
<child>
@@ -844,11 +848,11 @@
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Choose Files:</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="justify">center</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
</object>
@@ -856,8 +860,10 @@
<child type="label">
<object class="GtkLabel" id="label40">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>File Filter</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">File Filter</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -871,12 +877,15 @@
</object>
</child>
</object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
</child>
<child type="tab">
<object class="GtkLabel" id="search.target.tab">
<property name="visible">True</property>
<property name="label" translatable="yes">Search Target</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="justify">center</property>
</object>
<packing>
<property name="position">1</property>
@@ -887,7 +896,7 @@
<object class="GtkFrame" id="frame.setting">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkVBox" id="vbox1124">
<property name="visible">True</property>
@@ -897,21 +906,23 @@
<property name="visible">True</property>
<property name="border_width">3</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkCheckButton" id="search.basic">
+ <property name="label" translatable="yes">Basic Search & Replace</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Basic Search & Replace</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <signal handler="on_setting_basic_search_toggled" name="toggled"/>
+ <signal name="toggled" handler="on_setting_basic_search_toggled"/>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -919,7 +930,7 @@
<property name="visible">True</property>
<property name="border_width">3</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkVBox" id="vbox1126">
<property name="visible">True</property>
@@ -933,9 +944,9 @@
<property name="height_request">100</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="setting.pref.treeview">
<property name="visible">True</property>
@@ -943,6 +954,9 @@
</object>
</child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkVBox" id="vbox1125">
@@ -958,13 +972,13 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">5</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="setting.pref.entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">*</property>
</object>
<packing>
<property name="expand">False</property>
@@ -980,6 +994,9 @@
</packing>
</child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkHBox" id="hbox1129">
@@ -989,22 +1006,27 @@
<property name="homogeneous">True</property>
<child>
<object class="GtkButton" id="setting.pref.add">
+ <property name="label">gtk-add</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-add</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <signal handler="on_setting_pref_add_clicked" name="clicked"/>
+ <signal name="clicked" handler="on_setting_pref_add_clicked"/>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="setting.pref.remove">
+ <property name="label">gtk-remove</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-remove</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <signal handler="on_setting_pref_remove_clicked" name="clicked"/>
+ <signal name="clicked" handler="on_setting_pref_remove_clicked"/>
</object>
<packing>
<property name="position">1</property>
@@ -1012,12 +1034,13 @@
</child>
<child>
<object class="GtkButton" id="setting.pref.modify">
+ <property name="label" translatable="yes">Modify</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label" translatable="yes">Modify</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <signal handler="on_setting_pref_modify_clicked" name="clicked"/>
+ <signal name="clicked" handler="on_setting_pref_modify_clicked"/>
</object>
<packing>
<property name="position">2</property>
@@ -1042,6 +1065,9 @@
</object>
</child>
</object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
</child>
<child type="tab">
<object class="GtkLabel" id="label12342">
@@ -1056,59 +1082,77 @@
</object>
</child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkHButtonBox" id="hbuttonbox7">
<property name="visible">True</property>
<property name="border_width">3</property>
<property name="spacing">4</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="button.close">
+ <property name="label">gtk-close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-close</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <signal handler="on_search_button_close_clicked" name="clicked"/>
+ <signal name="clicked" handler="on_search_button_close_clicked"/>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="button.stop">
+ <property name="label">gtk-stop</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-stop</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <signal handler="on_search_button_stop_clicked" name="clicked"/>
+ <signal name="clicked" handler="on_search_button_stop_clicked"/>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="button.next">
+ <property name="label">gtk-find</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-find</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <signal handler="on_search_button_next_clicked" name="clicked"/>
+ <signal name="clicked" handler="on_search_button_next_clicked"/>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkButton" id="button.jump">
+ <property name="label">gtk-find</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-find</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <signal handler="on_search_button_jump_clicked" name="clicked"/>
+ <signal name="clicked" handler="on_search_button_jump_clicked"/>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">3</property>
</packing>
</child>
diff --git a/plugins/symbol-db/anjuta-symbol-db.ui b/plugins/symbol-db/anjuta-symbol-db.ui
index 64665e8..3ca3ee0 100644
--- a/plugins/symbol-db/anjuta-symbol-db.ui
+++ b/plugins/symbol-db/anjuta-symbol-db.ui
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<interface>
- <!-- interface-requires gtk+ 2.12 -->
+ <requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkWindow" id="symbol_db_pref_window">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -101,8 +101,10 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes"><b>Global</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Global</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -147,8 +149,10 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes"><b>Available API tags</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Available API tags</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
diff --git a/plugins/terminal/anjuta-terminal-plugin.ui b/plugins/terminal/anjuta-terminal-plugin.ui
index 14b72f7..bb9bba0 100644
--- a/plugins/terminal/anjuta-terminal-plugin.ui
+++ b/plugins/terminal/anjuta-terminal-plugin.ui
@@ -1,8 +1,10 @@
<?xml version="1.0"?>
-<!--*- mode: xml -*-->
<interface>
+ <requires lib="gtk+" version="2.16"/>
+ <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkListStore" id="model1">
<columns>
+ <!-- column-name gchararray -->
<column type="gchararray"/>
</columns>
<data>
@@ -18,7 +20,7 @@
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkTable" id="table24">
<property name="visible">True</property>
@@ -42,14 +44,15 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="preferences_toggle:bool:1:0:terminal.default.profile">
+ <property name="label" translatable="yes">Use currently selected profile in GNOME terminal</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Use currently selected profile in GNOME terminal</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -58,7 +61,7 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -69,7 +72,7 @@
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
</object>
@@ -77,8 +80,10 @@
<child type="label">
<object class="GtkLabel" id="label166">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Terminal options</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Terminal options</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
diff --git a/plugins/tools/anjuta-tools.ui b/plugins/tools/anjuta-tools.ui
index 615b518..95e62eb 100644
--- a/plugins/tools/anjuta-tools.ui
+++ b/plugins/tools/anjuta-tools.ui
@@ -141,8 +141,10 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes"><b>Tools</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Tools</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
