[nemiver] Fix some Gtk deprecations in several UI files and source.
- From: Hubert Figuière <hub src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nemiver] Fix some Gtk deprecations in several UI files and source.
- Date: Tue, 8 Nov 2016 03:58:03 +0000 (UTC)
commit 6f2eb0a51633e6ecbddd0f3e7d8c971d71e1daab
Author: Hubert Figuière <hub figuiere net>
Date: Tue Nov 1 22:56:05 2016 -0400
Fix some Gtk deprecations in several UI files and source.
This closes bug 72265, bug 697279, bug 741644.
* src/persp/dbgperspective/ui/callfunctiondialog.ui:
src/persp/dbgperspective/ui/chooseoverloadsdialog.ui:
src/persp/dbgperspective/ui/exprinspectordialog.ui:
src/persp/dbgperspective/ui/findtextdialog.ui:
src/persp/dbgperspective/ui/globalvarsinspector.ui:
src/persp/dbgperspective/ui/loadcoredialog.ui:
src/persp/dbgperspective/ui/openfiledialog.ui:
src/persp/dbgperspective/ui/preferencesdialog.ui:
src/persp/dbgperspective/ui/proclistdialog.ui:
src/persp/dbgperspective/ui/remotetargetdialog.ui:
src/persp/dbgperspective/ui/runprogramdialog.ui:
src/persp/dbgperspective/ui/savedsessionsdialog.ui:
src/persp/dbgperspective/ui/setbreakpointdialog.ui:
src/persp/dbgperspective/ui/setjumptodialog.ui:
src/persp/dbgperspective/ui/watchpointdialog.ui:
ui/locatefiledialog.ui:
ui/workbench.ui:
Replace Gtk[VH]Box by GtkBox, replace xalign properties
Replace some GtkTable by horizontal GtkBox.
* src/persp/dbgperspective/nmv-dbg-perspective-dynamic-layout.cc
(DBGPerspectiveDynamicLayout::do_lay_out): change Gtk::HBox to Gtk::Box
* src/persp/dbgperspective/nmv-dbg-perspective.cc
(struct DBGPerspective::Priv) (DBGPerspective::init_toolbar)
(DBGPerspective::append_source_editor) (DBGPerspective::get_terminal_box):
change Gtk::HBox to Gtk::Box
* src/persp/dbgperspective/nmv-file-list.cc (struct FileList::Priv) (Priv::Priv):
change Gtk::VBox to Gtk::Box
* src/persp/dbgperspective/nmv-memory-view.cc (struct MemoryView::Priv) (Priv::Priv):
change Gtk::VBox and Gtk::HBox to Gtk::Box
* src/persp/dbgperspective/nmv-open-file-dialog.cc
(struct OpenFileDialog::Priv) (Priv::Priv): change Gtk::VBox to Gtk::Box
* src/persp/dbgperspective/nmv-preferences-dialog.cc
(struct PreferencesDialog::Priv) (Priv::Priv): change Gtk::HBox to Gtk::Box
* src/uicommon/nmv-source-editor.h (class SourceEditor): now derive Gtk::Box.
* src/uicommon/nmv-source-editor.cc (struct SourceEditor::Priv) (Priv::Priv)
(SourceEditor::init): change Gtk::HBox to Gtk::Box
* src/workbench/nmv-workbench.cc (Workbench::add_perspective_toolbars):
change Gtk::VBox to Gtk::Box
.../nmv-dbg-perspective-dynamic-layout.cc | 2 +-
src/persp/dbgperspective/nmv-dbg-perspective.cc | 8 +-
src/persp/dbgperspective/nmv-file-list.cc | 4 +-
src/persp/dbgperspective/nmv-memory-view.cc | 8 +-
src/persp/dbgperspective/nmv-open-file-dialog.cc | 8 +-
src/persp/dbgperspective/nmv-preferences-dialog.cc | 4 +-
src/persp/dbgperspective/ui/callfunctiondialog.ui | 90 +++++----
.../dbgperspective/ui/chooseoverloadsdialog.ui | 113 ++++++-----
src/persp/dbgperspective/ui/exprinspectordialog.ui | 59 +++---
src/persp/dbgperspective/ui/findtextdialog.ui | 132 ++++++++------
src/persp/dbgperspective/ui/globalvarsinspector.ui | 43 +++--
src/persp/dbgperspective/ui/loadcoredialog.ui | 108 ++++++-----
src/persp/dbgperspective/ui/openfiledialog.ui | 115 +++++++-----
src/persp/dbgperspective/ui/preferencesdialog.ui | 129 ++++++++-----
src/persp/dbgperspective/ui/proclistdialog.ui | 118 +++++++-----
src/persp/dbgperspective/ui/remotetargetdialog.ui | 182 ++++++++++--------
src/persp/dbgperspective/ui/runprogramdialog.ui | 146 +++++++++-----
src/persp/dbgperspective/ui/savedsessionsdialog.ui | 9 +-
src/persp/dbgperspective/ui/setbreakpointdialog.ui | 201 +++++++++++---------
src/persp/dbgperspective/ui/setjumptodialog.ui | 152 +++++++++-------
src/persp/dbgperspective/ui/watchpointdialog.ui | 137 ++++++++-----
src/uicommon/nmv-source-editor.cc | 11 +-
src/uicommon/nmv-source-editor.h | 4 +-
src/workbench/nmv-workbench.cc | 2 +-
ui/locatefiledialog.ui | 93 +++++----
ui/workbench.ui | 36 +++-
26 files changed, 1103 insertions(+), 811 deletions(-)
---
diff --git a/src/persp/dbgperspective/nmv-dbg-perspective-dynamic-layout.cc
b/src/persp/dbgperspective/nmv-dbg-perspective-dynamic-layout.cc
index b0866c0..34629c1 100644
--- a/src/persp/dbgperspective/nmv-dbg-perspective-dynamic-layout.cc
+++ b/src/persp/dbgperspective/nmv-dbg-perspective-dynamic-layout.cc
@@ -148,7 +148,7 @@ DBGPerspectiveDynamicLayout::do_lay_out (IPerspective &a_perspective)
m_priv->dock_bar.reset (new Gdl::DockBar (*m_priv->dock));
m_priv->dock_bar->set_style (Gdl::DOCK_BAR_TEXT);
- m_priv->main_box.reset (new Gtk::HBox);
+ m_priv->main_box.reset (new Gtk::Box (Gtk::ORIENTATION_HORIZONTAL));
m_priv->main_box->pack_start (*m_priv->dock_bar, false, false);
m_priv->main_box->pack_end (*m_priv->dock);
m_priv->main_box->show_all ();
diff --git a/src/persp/dbgperspective/nmv-dbg-perspective.cc b/src/persp/dbgperspective/nmv-dbg-perspective.cc
index ac207e4..40cf32a 100644
--- a/src/persp/dbgperspective/nmv-dbg-perspective.cc
+++ b/src/persp/dbgperspective/nmv-dbg-perspective.cc
@@ -888,7 +888,7 @@ struct DBGPerspective::Priv {
LayoutManager layout_mgr;
IWorkbench *workbench;
- SafePtr<Gtk::HBox> toolbar;
+ SafePtr<Gtk::Box> toolbar;
SafePtr<Gtk::Notebook> sourceviews_notebook;
SafePtr<SpinnerToolItem> throbber;
sigc::signal<void, bool> activated_signal;
@@ -3789,7 +3789,7 @@ DBGPerspective::init_toolbar ()
add_perspective_toolbar_entries ();
m_priv->throbber.reset (new SpinnerToolItem);
- m_priv->toolbar.reset ((new Gtk::HBox));
+ m_priv->toolbar.reset ((new Gtk::Box (Gtk::ORIENTATION_HORIZONTAL)));
THROW_IF_FAIL (m_priv->toolbar);
Gtk::Toolbar *glade_toolbar = dynamic_cast<Gtk::Toolbar*>
(workbench ().get_ui_manager ()->get_widget ("/ToolBar"));
@@ -4029,7 +4029,7 @@ DBGPerspective::append_source_editor (SourceEditor &a_sv,
message.printf (_("Close %s"), path.c_str ());
close_button->set_tooltip_text (message);
- SafePtr<Gtk::HBox> hbox (Gtk::manage (new Gtk::HBox ()));
+ SafePtr<Gtk::Box> hbox (Gtk::manage (new Gtk::Box (Gtk::ORIENTATION_HORIZONTAL)));
// add a bit of space between the label and the close button
hbox->set_spacing (4);
@@ -8383,7 +8383,7 @@ DBGPerspective::get_terminal_box ()
{
THROW_IF_FAIL (m_priv);
if (!m_priv->terminal_box) {
- m_priv->terminal_box.reset (new Gtk::HBox);
+ m_priv->terminal_box.reset (new Gtk::Box (Gtk::ORIENTATION_HORIZONTAL));
THROW_IF_FAIL (m_priv->terminal_box);
Gtk::VScrollbar *scrollbar = Gtk::manage (new Gtk::VScrollbar);
m_priv->terminal_box->pack_end (*scrollbar, false, false, 0);
diff --git a/src/persp/dbgperspective/nmv-file-list.cc b/src/persp/dbgperspective/nmv-file-list.cc
index 0a84b53..7a4fe5c 100644
--- a/src/persp/dbgperspective/nmv-file-list.cc
+++ b/src/persp/dbgperspective/nmv-file-list.cc
@@ -412,7 +412,7 @@ FileListView::find_filename_recursive (const Gtk::TreeModel::iterator &a_iter,
struct FileList::Priv : public sigc::trackable {
public:
- SafePtr<Gtk::VBox> vbox;
+ SafePtr<Gtk::Box> vbox;
SafePtr<Gtk::ScrolledWindow> scrolled_window;
SafePtr<Gtk::Label> loading_indicator;
SafePtr<FileListView> tree_view;
@@ -422,7 +422,7 @@ public:
UString start_path;
Priv (IDebuggerSafePtr &a_debugger, const UString &a_starting_path) :
- vbox (new Gtk::VBox()),
+ vbox (new Gtk::Box (Gtk::ORIENTATION_VERTICAL)),
scrolled_window (new Gtk::ScrolledWindow ()),
loading_indicator (new Gtk::Label (_("Loading files from target executable..."))),
debugger (a_debugger),
diff --git a/src/persp/dbgperspective/nmv-memory-view.cc b/src/persp/dbgperspective/nmv-memory-view.cc
index 303c18f..daf68a8 100644
--- a/src/persp/dbgperspective/nmv-memory-view.cc
+++ b/src/persp/dbgperspective/nmv-memory-view.cc
@@ -84,8 +84,8 @@ public:
SafePtr<Gtk::Label> m_address_label;
SafePtr<Gtk::Entry> m_address_entry;
SafePtr<Gtk::Button> m_jump_button;
- SafePtr<Gtk::HBox> m_hbox;
- SafePtr<Gtk::VBox> m_vbox;
+ SafePtr<Gtk::Box> m_hbox;
+ SafePtr<Gtk::Box> m_vbox;
SafePtr<Gtk::Label> m_group_label;
GroupingComboBox m_grouping_combo;
SafePtr<Gtk::ScrolledWindow> m_container;
@@ -98,8 +98,8 @@ public:
m_address_label (new Gtk::Label (_("Address:"))),
m_address_entry (new Gtk::Entry ()),
m_jump_button (new Gtk::Button (_("Show"))),
- m_hbox (new Gtk::HBox ()),
- m_vbox (new Gtk::VBox ()),
+ m_hbox (new Gtk::Box (Gtk::ORIENTATION_HORIZONTAL)),
+ m_vbox (new Gtk::Box (Gtk::ORIENTATION_VERTICAL)),
m_group_label (new Gtk::Label (_("Group By:"))),
m_container (new Gtk::ScrolledWindow ()),
m_document (Hex::Document::create ()),
diff --git a/src/persp/dbgperspective/nmv-open-file-dialog.cc
b/src/persp/dbgperspective/nmv-open-file-dialog.cc
index f6446aa..65344c4 100644
--- a/src/persp/dbgperspective/nmv-open-file-dialog.cc
+++ b/src/persp/dbgperspective/nmv-open-file-dialog.cc
@@ -40,7 +40,7 @@ using namespace nemiver::common;
namespace nemiver {
class OpenFileDialog::Priv {
public:
- Gtk::VBox* vbox_file_list;
+ Gtk::Box* vbox_file_list;
Gtk::RadioButton *radio_button_file_list, *radio_button_chooser;
Gtk::FileChooserWidget file_chooser;
FileList file_list;
@@ -66,7 +66,7 @@ public:
"okbutton");
THROW_IF_FAIL (okbutton);
vbox_file_list =
- ui_utils::get_widget_from_gtkbuilder<Gtk::VBox> (a_gtkbuilder,
+ ui_utils::get_widget_from_gtkbuilder<Gtk::Box> (a_gtkbuilder,
"vbox_file_list");
THROW_IF_FAIL (vbox_file_list);
radio_button_file_list =
@@ -108,14 +108,14 @@ public:
LOG_DD("Target file list is active");
// remove existing children of vbox_file_list
vbox_file_list->foreach (sigc::mem_fun (vbox_file_list,
- &Gtk::VBox::remove));
+ &Gtk::Box::remove));
vbox_file_list->pack_start (file_list.widget ());
file_list.widget ().show ();
} else if (radio_button_chooser->get_active ()) {
LOG_DD("file chooser is active");
// remove existing children of vbox_file_list
vbox_file_list->foreach (sigc::mem_fun (vbox_file_list,
- &Gtk::VBox::remove));
+ &Gtk::Box::remove));
vbox_file_list->pack_start (file_chooser);
file_chooser.show ();
}
diff --git a/src/persp/dbgperspective/nmv-preferences-dialog.cc
b/src/persp/dbgperspective/nmv-preferences-dialog.cc
index e133d16..a030b76 100644
--- a/src/persp/dbgperspective/nmv-preferences-dialog.cc
+++ b/src/persp/dbgperspective/nmv-preferences-dialog.cc
@@ -82,7 +82,7 @@ public:
Glib::RefPtr<Gtk::ListStore> m_editor_style_model;
StyleModelColumns m_style_columns;
Gtk::CellRendererText m_style_name_renderer;
- Gtk::HBox *custom_font_box;
+ Gtk::Box *custom_font_box;
Gtk::Box *layout_box;
Gtk::CheckButton *show_lines_check_button;
Gtk::CheckButton *launch_terminal_check_button;
@@ -358,7 +358,7 @@ public:
&PreferencesDialog::Priv::on_custom_font_set_signal));
custom_font_box =
- ui_utils::get_widget_from_gtkbuilder<Gtk::HBox>
+ ui_utils::get_widget_from_gtkbuilder<Gtk::Box>
(gtkbuilder, "customfonthbox");
THROW_IF_FAIL (custom_font_box);
diff --git a/src/persp/dbgperspective/ui/callfunctiondialog.ui
b/src/persp/dbgperspective/ui/callfunctiondialog.ui
index 16517b9..6479798 100644
--- a/src/persp/dbgperspective/ui/callfunctiondialog.ui
+++ b/src/persp/dbgperspective/ui/callfunctiondialog.ui
@@ -1,8 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
- <!-- interface-requires gtk+ 2.6 -->
- <!-- interface-naming-policy toplevel-contextual -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="callfunctiondialog">
+ <property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">Call a Function</property>
<property name="modal">True</property>
@@ -10,24 +11,23 @@
<property name="default_width">300</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox1">
+ <object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
- <child>
- <object class="GtkVBox" id="vbox1">
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
<child>
- <object class="GtkLabel" id="label1">
+ <object class="GtkButton" id="cancelbutton">
+ <property name="label">gtk-cancel</property>
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Call a function:</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -36,17 +36,18 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="callexpressionentry">
+ <object class="GtkButton" id="okbutton">
+ <property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="has_entry">True</property>
- <child internal-child="entry">
- <object class="GtkEntry" id="comboboxentry-entry">
- <property name="can_focus">True</property>
- </object>
- </child>
+ <property name="can_default">True</property>
+ <property name="has_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>
@@ -54,20 +55,26 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area1">
+ <child>
+ <object class="GtkBox" id="vbox1">
<property name="visible">True</property>
- <property name="layout_style">end</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkButton" id="cancelbutton">
- <property name="label">gtk-cancel</property>
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Call a function:</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -76,26 +83,27 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="okbutton">
- <property name="label">gtk-ok</property>
+ <object class="GtkComboBox" id="callexpressionentry">
<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>
- <property name="use_stock">True</property>
+ <property name="has_entry">True</property>
+ <child internal-child="entry">
+ <object class="GtkEntry" id="comboboxentry-entry">
+ <property name="can_focus">True</property>
+ </object>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
diff --git a/src/persp/dbgperspective/ui/chooseoverloadsdialog.ui
b/src/persp/dbgperspective/ui/chooseoverloadsdialog.ui
index 902270a..793a41e 100644
--- a/src/persp/dbgperspective/ui/chooseoverloadsdialog.ui
+++ b/src/persp/dbgperspective/ui/chooseoverloadsdialog.ui
@@ -1,9 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
- <!-- interface-requires gtk+ 2.6 -->
- <!-- interface-naming-policy toplevel-contextual -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="chooseoverloadsdialog">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="title" translatable="yes">Set Breakpoint</property>
<property name="modal">True</property>
<property name="default_width">400</property>
@@ -12,19 +13,67 @@
<property name="skip_taskbar_hint">True</property>
<property name="skip_pager_hint">True</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox1">
+ <object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="cancelbutton">
+ <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="has_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="okbutton">
+ <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="has_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="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
- <object class="GtkVBox" id="treeviewcontainer">
+ <object class="GtkBox" id="treeviewcontainer">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Choose Overloaded Function</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -39,7 +88,8 @@
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Multiple functions match the specified name.
Please choose one from the list below.</property>
<property name="wrap">True</property>
</object>
@@ -53,63 +103,22 @@
<object class="GtkScrolledWindow" id="treeviewscrolledwindow">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<placeholder/>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
- <property name="position">1</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="cancelbutton">
- <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="has_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="okbutton">
- <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="has_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="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
diff --git a/src/persp/dbgperspective/ui/exprinspectordialog.ui
b/src/persp/dbgperspective/ui/exprinspectordialog.ui
index d4ceed7..2ac1ccc 100644
--- a/src/persp/dbgperspective/ui/exprinspectordialog.ui
+++ b/src/persp/dbgperspective/ui/exprinspectordialog.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
- <!-- interface-requires gtk+ 2.6 -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="exprinspectordialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -24,7 +25,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -39,7 +39,6 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -57,47 +56,46 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox1">
+ <object class="GtkBox" id="vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkTable" id="table1">
+ <object class="GtkBox" id="table1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">6</property>
- <property name="row_spacing">6</property>
<child>
- <object class="GtkComboBox" id="variablenameentry">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="has_entry">True</property>
- <child internal-child="entry">
- <object class="GtkEntry" id="comboboxentry-entry">
- <property name="can_focus">True</property>
- </object>
- </child>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">_Variable Name:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">variablenameentry</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_SHRINK</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label1">
+ <object class="GtkComboBox" id="variablenameentry">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Variable Name:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">variablenameentry</property>
+ <property name="has_entry">True</property>
+ <child internal-child="entry">
+ <object class="GtkEntry" id="comboboxentry-entry">
+ <property name="can_focus">True</property>
+ </object>
+ </child>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -106,14 +104,12 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -124,9 +120,10 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="inspectorwidgetbox">
+ <object class="GtkBox" id="inspectorwidgetbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
diff --git a/src/persp/dbgperspective/ui/findtextdialog.ui b/src/persp/dbgperspective/ui/findtextdialog.ui
index 18980da..60899dc 100644
--- a/src/persp/dbgperspective/ui/findtextdialog.ui
+++ b/src/persp/dbgperspective/ui/findtextdialog.ui
@@ -1,41 +1,89 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
- <!-- interface-requires gtk+ 2.6 -->
- <!-- interface-naming-policy toplevel-contextual -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="findtextdialog">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="title" translatable="yes">Find Text</property>
<property name="default_width">150</property>
<property name="default_height">100</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox1">
+ <object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="closebutton1">
+ <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="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="searchbutton">
+ <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="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="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
- <object class="GtkVBox" id="vbox1">
+ <object class="GtkBox" id="vbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkTable" id="table1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_columns">2</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
<object class="GtkLabel" id="searchlabel">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">_Search:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">searchtextcombo</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -63,30 +111,34 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox1">
+ <object class="GtkBox" id="hbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkTable" id="table2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">2</property>
<property name="row_spacing">6</property>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Match Options:</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox2">
+ <object class="GtkBox" id="vbox2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkCheckButton" id="matchcasecheckbutton">
@@ -128,31 +180,36 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkTable" id="table3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">2</property>
<property name="row_spacing">6</property>
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Cycling Options:</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox3">
+ <object class="GtkBox" id="vbox3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkCheckButton" id="wraparoundcheckbutton">
@@ -194,58 +251,23 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</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="closebutton1">
- <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="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="searchbutton">
- <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="receives_default">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
diff --git a/src/persp/dbgperspective/ui/globalvarsinspector.ui
b/src/persp/dbgperspective/ui/globalvarsinspector.ui
index c09da5a..5187b41 100644
--- a/src/persp/dbgperspective/ui/globalvarsinspector.ui
+++ b/src/persp/dbgperspective/ui/globalvarsinspector.ui
@@ -1,33 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
- <!-- interface-requires gtk+ 2.6 -->
- <!-- interface-naming-policy toplevel-contextual -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="globalvarsinspector">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="title" translatable="yes">Global Variables</property>
<property name="default_width">600</property>
<property name="default_height">500</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox1">
+ <object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <child>
- <object class="GtkVBox" id="inspectorwidgetbox">
- <property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="orientation">vertical</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
<child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area1">
+ <object class="GtkButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="closebutton">
@@ -47,10 +37,27 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <object class="GtkBox" id="inspectorwidgetbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
</child>
<action-widgets>
diff --git a/src/persp/dbgperspective/ui/loadcoredialog.ui b/src/persp/dbgperspective/ui/loadcoredialog.ui
index dbb9005..e1ef4a1 100644
--- a/src/persp/dbgperspective/ui/loadcoredialog.ui
+++ b/src/persp/dbgperspective/ui/loadcoredialog.ui
@@ -1,36 +1,83 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
- <!-- interface-requires gtk+ 2.6 -->
- <!-- interface-naming-policy toplevel-contextual -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="loadcoredialog">
<property name="width_request">300</property>
+ <property name="can_focus">False</property>
<property name="title" translatable="yes">Choose a Core File to Debug</property>
<property name="resizable">False</property>
<property name="default_width">350</property>
<property name="default_height">200</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox1">
+ <object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="cancelbutton">
+ <property name="label">gtk-cancel</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="okbutton">
+ <property name="label">gtk-ok</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>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
- <object class="GtkVBox" id="vbox1">
+ <object class="GtkBox" id="vbox1">
+ <property name="orientation">vertical</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkFrame" id="frame_corefile">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkFileChooserButton" id="filechooserbutton_corefile">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="title" translatable="yes">Select a Core File</property>
</object>
</child>
@@ -39,6 +86,7 @@
<child type="label">
<object class="GtkLabel" id="label_corefile">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Core File:</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -47,21 +95,26 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame_executable">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkFileChooserButton" id="filechooserbutton_executable">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="title" translatable="yes">Select the executable that created the
core file</property>
</object>
</child>
@@ -70,6 +123,7 @@
<child type="label">
<object class="GtkLabel" id="label_executable">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Executable:</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -78,54 +132,18 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</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="cancelbutton">
- <property name="label">gtk-cancel</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="okbutton">
- <property name="label">gtk-ok</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>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
</object>
</child>
<action-widgets>
diff --git a/src/persp/dbgperspective/ui/openfiledialog.ui b/src/persp/dbgperspective/ui/openfiledialog.ui
index 43d8584..cb0cec9 100644
--- a/src/persp/dbgperspective/ui/openfiledialog.ui
+++ b/src/persp/dbgperspective/ui/openfiledialog.ui
@@ -1,36 +1,86 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
- <!-- interface-requires gtk+ 2.6 -->
- <!-- interface-naming-policy toplevel-contextual -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="dialog_open_source_file">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="title" translatable="yes">Open Source Files</property>
<property name="default_width">500</property>
<property name="default_height">400</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox1">
+ <object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="cancelbutton">
+ <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="okbutton">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</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="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
- <object class="GtkVBox" id="vbox1">
+ <object class="GtkBox" id="vbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkVBox" id="vbox2">
+ <object class="GtkBox" id="vbox2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkRadioButton" id="radiobutton_target">
@@ -38,6 +88,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -53,6 +104,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">radiobutton_target</property>
@@ -70,6 +122,7 @@
<child type="label">
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Choose Source Files to Open</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -79,12 +132,14 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox_file_list">
+ <object class="GtkBox" id="vbox_file_list">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
@@ -92,54 +147,16 @@
</child>
</object>
<packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</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="cancelbutton">
- <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="okbutton">
- <property name="label">gtk-ok</property>
- <property name="visible">True</property>
- <property name="sensitive">False</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="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
diff --git a/src/persp/dbgperspective/ui/preferencesdialog.ui
b/src/persp/dbgperspective/ui/preferencesdialog.ui
index c77f26a..6485838 100644
--- a/src/persp/dbgperspective/ui/preferencesdialog.ui
+++ b/src/persp/dbgperspective/ui/preferencesdialog.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
- <!-- interface-requires gtk+ 2.6 -->
- <!-- interface-naming-policy toplevel-contextual -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="preferencesdialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -11,11 +11,12 @@
<property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox1">
+ <object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area1">
+ <object class="GtkButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
@@ -48,10 +49,11 @@
<property name="can_focus">True</property>
<property name="border_width">6</property>
<child>
- <object class="GtkVBox" id="vbox3">
+ <object class="GtkBox" id="vbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkFrame" id="frame3">
@@ -66,9 +68,10 @@
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkVBox" id="vbox4">
+ <object class="GtkBox" id="vbox4">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="systemfontcheckbutton">
@@ -76,6 +79,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -87,7 +91,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="customfonthbox">
+ <object class="GtkBox" id="customfonthbox">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
@@ -109,6 +113,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="font">Sans 12</property>
</object>
<packing>
<property name="expand">True</property>
@@ -199,6 +204,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -241,6 +247,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -277,14 +284,15 @@
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkVBox" id="vbox5">
+ <object class="GtkBox" id="vbox5">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">When a source file is
changed:</property>
</object>
<packing>
@@ -300,15 +308,17 @@
<property name="top_padding">6</property>
<property name="left_padding">6</property>
<child>
- <object class="GtkVBox" id="vbox6">
+ <object class="GtkBox" id="vbox6">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkRadioButton" id="reloadradiobutton">
<property name="label" translatable="yes">Reload the file</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -324,6 +334,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">reloadradiobutton</property>
@@ -340,6 +351,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">reloadradiobutton</property>
@@ -398,6 +410,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -435,12 +448,13 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox1">
+ <object class="GtkBox" id="vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkHBox" id="hbox1">
+ <object class="GtkBox" id="hbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
@@ -453,6 +467,9 @@
<object class="GtkTreeView" id="dirstreeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"/>
+ </child>
</object>
</child>
</object>
@@ -463,9 +480,10 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox2">
+ <object class="GtkBox" id="vbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkButton" id="adddirbutton">
@@ -526,10 +544,11 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox7">
+ <object class="GtkBox" id="vbox7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkFrame" id="frame7">
@@ -548,6 +567,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -584,15 +604,17 @@
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkVBox" id="vbox8">
+ <object class="GtkBox" id="vbox8">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkRadioButton" id="pureasmradio">
<property name="label" translatable="yes">Pure assembly</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -608,6 +630,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">pureasmradio</property>
@@ -693,34 +716,34 @@
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkTable" id="table2">
+ <object class="GtkBox" id="table2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">6</property>
- <property name="row_spacing">6</property>
<child>
- <object class="GtkFileChooserButton" id="pathtogdbfilechooser">
+ <object class="GtkLabel" id="label16">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="title" translatable="yes">Choose a File</property>
+ <property name="halign">start</property>
+ <property name="hexpand">True</property>
+ <property name="label" translatable="yes">Path to the GDB binary
used</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label16">
+ <object class="GtkFileChooserButton" id="pathtogdbfilechooser">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Path to the GDB binary
used</property>
+ <property name="hexpand">True</property>
+ <property name="title" translatable="yes">Choose a File</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -757,39 +780,36 @@
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkTable" id="table1">
+ <object class="GtkBox" id="table1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">6</property>
- <property name="row_spacing">6</property>
<child>
- <object class="GtkSpinButton" id="defaultnumasmspin">
+ <object class="GtkLabel" id="label14">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
- <property name="climb_rate">1</property>
- <property name="numeric">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="hexpand">True</property>
+ <property name="label" translatable="yes">Number of instructions to
disassemble by default</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"/>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label14">
+ <object class="GtkSpinButton" id="defaultnumasmspin">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Number of instructions to
disassemble by default</property>
+ <property name="can_focus">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="climb_rate">1</property>
+ <property name="numeric">True</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -831,6 +851,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -867,15 +888,17 @@
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkVBox" id="vbox9">
+ <object class="GtkBox" id="vbox9">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkRadioButton" id="followparentradio">
<property name="label" translatable="yes">Follow parent</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -891,6 +914,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">followparentradio</property>
@@ -939,10 +963,11 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="layoutbox">
+ <object class="GtkBox" id="layoutbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
+ <property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
diff --git a/src/persp/dbgperspective/ui/proclistdialog.ui b/src/persp/dbgperspective/ui/proclistdialog.ui
index 7e06f97..49f06ae 100644
--- a/src/persp/dbgperspective/ui/proclistdialog.ui
+++ b/src/persp/dbgperspective/ui/proclistdialog.ui
@@ -1,28 +1,75 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
- <!-- interface-requires gtk+ 2.6 -->
- <!-- interface-naming-policy toplevel-contextual -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="proclistdialog">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Attach to a Running Program</property>
<property name="default_width">500</property>
<property name="default_height">500</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox1">
+ <object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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="okbutton">
+ <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="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="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
- <object class="GtkVBox" id="vbox1">
+ <object class="GtkBox" id="vbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Choose a Process to Debug</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -30,6 +77,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -43,20 +91,28 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="reorderable">True</property>
+ <property name="expand">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"/>
+ </child>
</object>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox1">
+ <object class="GtkBox" id="hbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Filter list:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry_filter</property>
@@ -72,62 +128,26 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">●</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
- <property name="position">1</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="okbutton">
- <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="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">end</property>
- <property name="position">0</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
diff --git a/src/persp/dbgperspective/ui/remotetargetdialog.ui
b/src/persp/dbgperspective/ui/remotetargetdialog.ui
index 39b297d..ecb4675 100644
--- a/src/persp/dbgperspective/ui/remotetargetdialog.ui
+++ b/src/persp/dbgperspective/ui/remotetargetdialog.ui
@@ -1,9 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
- <!-- interface-requires gtk+ 2.6 -->
- <!-- interface-naming-policy toplevel-contextual -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="remotetargetdialog">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="title" translatable="yes">Connect to Remote Target</property>
<property name="resizable">False</property>
<property name="modal">True</property>
@@ -11,20 +12,67 @@
<property name="default_height">300</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox1">
+ <object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="cancelbutton">
+ <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="okbutton">
+ <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="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="fill">False</property>
+ <property name="padding">6</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
- <object class="GtkVBox" id="vbox1">
+ <object class="GtkBox" id="vbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Executable to Load</property>
<property name="single_line_mode">True</property>
<attributes>
@@ -40,23 +88,27 @@
<child>
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
<child>
<object class="GtkFileChooserButton" id="execfilechooserbutton">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="title" translatable="yes">Choose a File</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="solibprefixlabesolibprefixlabel">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Shared Libraries Location</property>
<property name="single_line_mode">True</property>
<attributes>
@@ -72,10 +124,12 @@
<child>
<object class="GtkAlignment" id="alignmentfoo">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
<child>
<object class="GtkFileChooserButton" id="solibprefixchooserbutton">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="action">select-folder</property>
<property name="title" translatable="yes">Choose a Directory</property>
</object>
@@ -83,13 +137,15 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Remote Debugging Server</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -104,10 +160,12 @@
<child>
<object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
<child>
- <object class="GtkVBox" id="vbox2">
+ <object class="GtkBox" id="vbox2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkRadioButton" id="tcpradiobutton">
@@ -115,6 +173,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -127,64 +186,67 @@
<child>
<object class="GtkAlignment" id="tcpconnectioncontainer">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
<child>
- <object class="GtkTable" id="table2">
+ <object class="GtkBox" id="table2">
<property name="visible">True</property>
- <property name="n_columns">4</property>
- <property name="column_spacing">6</property>
- <property name="row_spacing">6</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkEntry" id="portentry">
+ <object class="GtkLabel" id="label5">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Address:</property>
</object>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label6">
+ <object class="GtkEntry" id="addressentry">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Port:</property>
+ <property name="can_focus">True</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label5">
+ <object class="GtkLabel" id="label6">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Address:</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Port:</property>
</object>
<packing>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
- <object class="GtkEntry" id="addressentry">
+ <object class="GtkEntry" id="portentry">
<property name="visible">True</property>
<property name="can_focus">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -194,6 +256,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">tcpradiobutton</property>
@@ -207,14 +270,18 @@
<child>
<object class="GtkAlignment" id="serialconnectioncontainer">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
<child>
<object class="GtkFileChooserButton" id="serialchooserbutton">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
@@ -222,53 +289,16 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">5</property>
</packing>
</child>
</object>
<packing>
- <property name="position">1</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="cancelbutton">
- <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="okbutton">
- <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="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">end</property>
- <property name="position">0</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
diff --git a/src/persp/dbgperspective/ui/runprogramdialog.ui b/src/persp/dbgperspective/ui/runprogramdialog.ui
index 22928ed..8fb24c5 100644
--- a/src/persp/dbgperspective/ui/runprogramdialog.ui
+++ b/src/persp/dbgperspective/ui/runprogramdialog.ui
@@ -1,35 +1,84 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
- <!-- interface-requires gtk+ 2.6 -->
- <!-- interface-naming-policy toplevel-contextual -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="runprogramdialog">
<property name="width_request">300</property>
+ <property name="can_focus">False</property>
<property name="title" translatable="yes">Choose a Program to Execute</property>
<property name="default_width">350</property>
<property name="default_height">400</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox1">
+ <object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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">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="executebutton">
+ <property name="label">gtk-execute</property>
+ <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>
+ <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="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
- <object class="GtkVBox" id="vbox1">
+ <object class="GtkBox" id="vbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkFrame" id="frame_program">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkFileChooserButton" id="filechooserbutton">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="title" translatable="yes">Choose an Executable</property>
</object>
</child>
@@ -38,6 +87,7 @@
<child type="label">
<object class="GtkLabel" id="label_program">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Program:</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -47,21 +97,25 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame_arguments">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkEntry" id="argumentsentry">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
</child>
</object>
@@ -69,6 +123,7 @@
<child type="label">
<object class="GtkLabel" id="label_arguments">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Arguments:</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -78,21 +133,25 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame_workingdir">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkFileChooserButton" id="filechooserbutton_workingdir">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="action">select-folder</property>
<property name="title" translatable="yes">Choose a Working Directory</property>
</object>
@@ -102,6 +161,7 @@
<child type="label">
<object class="GtkLabel" id="label_workingdir">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Working Directory:</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -111,42 +171,52 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame_environment">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkHBox" id="hbox2">
+ <object class="GtkBox" id="hbox2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">out</property>
<child>
<object class="GtkTreeView" id="treeview_environment">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"/>
+ </child>
</object>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkVButtonBox" id="vbuttonbox1">
+ <object class="GtkButtonBox" id="vbuttonbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<property name="layout_style">start</property>
<child>
@@ -158,15 +228,18 @@
<child>
<object class="GtkAlignment" id="alignment6">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <object class="GtkHBox" id="hbox3">
+ <object class="GtkBox" id="hbox3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
<object class="GtkImage" id="image4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="stock">gtk-add</property>
</object>
<packing>
@@ -178,6 +251,7 @@
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Add</property>
<property name="use_underline">True</property>
</object>
@@ -208,15 +282,18 @@
<child>
<object class="GtkAlignment" id="alignment7">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <object class="GtkHBox" id="hbox4">
+ <object class="GtkBox" id="hbox4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
<object class="GtkImage" id="image5">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="stock">gtk-remove</property>
</object>
<packing>
@@ -228,6 +305,7 @@
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Remove</property>
<property name="use_underline">True</property>
</object>
@@ -262,6 +340,7 @@
<child type="label">
<object class="GtkLabel" id="label_environment">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Environment Variables:</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -270,53 +349,16 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
</object>
<packing>
- <property name="position">1</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="button2">
- <property name="label">gtk-cancel</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="executebutton">
- <property name="label">gtk-execute</property>
- <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>
- <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">end</property>
- <property name="position">0</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
diff --git a/src/persp/dbgperspective/ui/savedsessionsdialog.ui
b/src/persp/dbgperspective/ui/savedsessionsdialog.ui
index f4b6431..e875483 100644
--- a/src/persp/dbgperspective/ui/savedsessionsdialog.ui
+++ b/src/persp/dbgperspective/ui/savedsessionsdialog.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
- <!-- interface-requires gtk+ 2.6 -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="savedsessionsdialog">
<property name="width_request">300</property>
<property name="height_request">300</property>
@@ -29,7 +30,6 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -45,7 +45,6 @@
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<child>
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
@@ -53,7 +52,7 @@
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <object class="GtkHBox" id="hbox2">
+ <object class="GtkBox" id="hbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
@@ -105,7 +104,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Choose a Session to Debug</property>
<attributes>
<attribute name="weight" value="bold"/>
diff --git a/src/persp/dbgperspective/ui/setbreakpointdialog.ui
b/src/persp/dbgperspective/ui/setbreakpointdialog.ui
index a248681..be4c21b 100644
--- a/src/persp/dbgperspective/ui/setbreakpointdialog.ui
+++ b/src/persp/dbgperspective/ui/setbreakpointdialog.ui
@@ -1,29 +1,78 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
- <!-- interface-requires gtk+ 2.6 -->
- <!-- interface-naming-policy toplevel-contextual -->
+ <requires lib="gtk+" version="3.0"/>
+ <object class="GtkListStore" id="liststore1"/>
<object class="GtkDialog" id="setbreakpointdialog">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="title" translatable="yes">Set Breakpoint</property>
<property name="modal">True</property>
<property name="window_position">center-on-parent</property>
<property name="default_width">300</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox">
+ <object class="GtkBox" id="dialog-vbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="cancelbutton">
+ <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="okbutton">
+ <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="has_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="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
- <object class="GtkVBox" id="vbox3">
+ <object class="GtkBox" id="vbox3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Set a Breakpoint:</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -38,18 +87,35 @@
<child>
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkTable" id="table4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">11</property>
<property name="n_columns">2</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
<object class="GtkEntry" id="lineentry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">●</property>
<property name="activates_default">True</property>
</object>
<packing>
@@ -57,14 +123,14 @@
<property name="right_attach">2</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkEntry" id="filenameentry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">●</property>
<property name="activates_default">True</property>
</object>
<packing>
@@ -72,14 +138,14 @@
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkEntry" id="functionentry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">●</property>
<property name="activates_default">True</property>
</object>
<packing>
@@ -87,13 +153,14 @@
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Condition:</property>
<property name="mnemonic_widget">conditionentry</property>
</object>
@@ -101,21 +168,21 @@
<property name="top_attach">10</property>
<property name="bottom_attach">11</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkEntry" id="conditionentry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">●</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">10</property>
<property name="bottom_attach">11</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -139,6 +206,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -146,29 +214,33 @@
<property name="top_attach">7</property>
<property name="bottom_attach">8</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkEntry" id="addressentry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">●</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<object class="GtkRadioButton" id="binarylocationradio">
<property name="label" translatable="yes">_Binary Location:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">eventradio</property>
@@ -177,7 +249,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>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -186,6 +258,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">eventradio</property>
@@ -194,7 +267,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>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -203,19 +276,21 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">eventradio</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label9">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
<property name="label" translatable="yes">Address:</property>
<property name="mnemonic_widget">addressentry</property>
</object>
@@ -223,13 +298,14 @@
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label_filename">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
<property name="label" translatable="yes">File name:</property>
<property name="mnemonic_widget">filenameentry</property>
</object>
@@ -237,13 +313,14 @@
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label_function">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
<property name="label" translatable="yes">Function:</property>
<property name="mnemonic_widget">functionentry</property>
</object>
@@ -251,13 +328,14 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label_line">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
<property name="label" translatable="yes">Line:</property>
<property name="mnemonic_widget">lineentry</property>
</object>
@@ -265,7 +343,7 @@
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -281,24 +359,6 @@
<property name="bottom_attach">10</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
</object>
@@ -310,49 +370,9 @@
</child>
</object>
<packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="cancelbutton">
- <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="okbutton">
- <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="has_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="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -362,5 +382,4 @@
<action-widget response="-5">okbutton</action-widget>
</action-widgets>
</object>
- <object class="GtkListStore" id="liststore1"/>
</interface>
diff --git a/src/persp/dbgperspective/ui/setjumptodialog.ui b/src/persp/dbgperspective/ui/setjumptodialog.ui
index 7a842db..d8390f4 100644
--- a/src/persp/dbgperspective/ui/setjumptodialog.ui
+++ b/src/persp/dbgperspective/ui/setjumptodialog.ui
@@ -1,8 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
- <requires lib="gtk+" version="2.16"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="setjumptodialog">
+ <property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">Set Location to Jump To</property>
<property name="window_position">center-on-parent</property>
@@ -10,19 +11,64 @@
<property name="type_hint">dialog</property>
<property name="gravity">center</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox1">
+ <object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="cancelbutton">
+ <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="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="okbutton">
+ <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="receives_default">True</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="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
- <object class="GtkVBox" id="vbox1">
+ <object class="GtkBox" id="vbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Jump to location:</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -37,19 +83,31 @@
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkTable" id="table1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">8</property>
<property name="n_columns">2</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
<object class="GtkRadioButton" id="functionnameradio">
<property name="label" translatable="yes">F_unction Name:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -65,6 +123,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -83,6 +142,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -96,7 +156,8 @@
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
<property name="label" translatable="yes">Function:</property>
</object>
<packing>
@@ -107,7 +168,8 @@
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
<property name="label" translatable="yes">File name:</property>
</object>
<packing>
@@ -118,7 +180,8 @@
<child>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
<property name="label" translatable="yes">Line:</property>
</object>
<packing>
@@ -129,7 +192,8 @@
<child>
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
- <property name="xalign">1</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
<property name="label" translatable="yes">Address:</property>
</object>
<packing>
@@ -141,7 +205,7 @@
<object class="GtkEntry" id="functionentry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">●</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -156,7 +220,7 @@
<object class="GtkEntry" id="filenameentry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">●</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -171,7 +235,7 @@
<object class="GtkEntry" id="lineentry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">●</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -184,7 +248,7 @@
<object class="GtkEntry" id="addressentry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">●</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -196,11 +260,15 @@
</packing>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<object class="GtkCheckButton" id="breakatdestinationcheck">
<property name="label" translatable="yes">Break at Destination</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -208,68 +276,20 @@
<property name="bottom_attach">8</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
</object>
<packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</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="cancelbutton">
- <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="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="okbutton">
- <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="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
diff --git a/src/persp/dbgperspective/ui/watchpointdialog.ui b/src/persp/dbgperspective/ui/watchpointdialog.ui
index 8d22dd4..fbcd2ab 100644
--- a/src/persp/dbgperspective/ui/watchpointdialog.ui
+++ b/src/persp/dbgperspective/ui/watchpointdialog.ui
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
- <!-- interface-requires gtk+ 2.6 -->
- <!-- interface-naming-policy toplevel-contextual -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="watchpointdialog">
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -10,48 +10,102 @@
<property name="default_width">300</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox1">
+ <object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="cancelbutton">
+ <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="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="okbutton">
+ <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="has_default">True</property>
+ <property name="receives_default">True</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="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
- <object class="GtkVBox" id="vbox1">
+ <object class="GtkBox" id="vbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Set a watchpoint:</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">1</property>
<child>
- <object class="GtkVBox" id="vbox2">
+ <object class="GtkBox" id="vbox2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkHBox" id="hbox1">
+ <object class="GtkBox" id="hbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Expression:</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -62,6 +116,8 @@
<property name="can_default">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -74,6 +130,8 @@
<property name="receives_default">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -85,16 +143,20 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox2">
+ <object class="GtkBox" id="hbox2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Triggers on:</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -104,9 +166,12 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="draw_indicator">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -116,10 +181,13 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -131,7 +199,7 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="varinspectorbox">
+ <object class="GtkBox" id="varinspectorbox">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="orientation">vertical</property>
@@ -141,6 +209,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -148,6 +218,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -158,47 +230,6 @@
<property name="position">1</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="cancelbutton">
- <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="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="okbutton">
- <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="has_default">True</property>
- <property name="receives_default">True</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">end</property>
- <property name="position">0</property>
- </packing>
- </child>
</object>
</child>
<action-widgets>
diff --git a/src/uicommon/nmv-source-editor.cc b/src/uicommon/nmv-source-editor.cc
index 62b718a..3702bcd 100644
--- a/src/uicommon/nmv-source-editor.cc
+++ b/src/uicommon/nmv-source-editor.cc
@@ -176,7 +176,7 @@ struct SourceEditor::Priv {
Gtk::Window &parent_window;
nemiver::SourceView *source_view;
Gtk::Label *line_col_label;
- Gtk::HBox *status_box;
+ Gtk::Box *status_box;
enum SourceEditor::BufferType buffer_type;
UString path;
@@ -715,7 +715,7 @@ struct SourceEditor::Priv {
parent_window (a_parent_window),
source_view (Gtk::manage (new SourceView)),
line_col_label (Gtk::manage (new Gtk::Label)),
- status_box (Gtk::manage (new Gtk::HBox)),
+ status_box (Gtk::manage (new Gtk::Box (Gtk::ORIENTATION_HORIZONTAL))),
non_asm_ctxt (-1, -1)
{
@@ -730,7 +730,7 @@ struct SourceEditor::Priv {
parent_window (a_parent_window),
source_view (Gtk::manage (new SourceView (a_buf))),
line_col_label (Gtk::manage (new Gtk::Label)),
- status_box (Gtk::manage (new Gtk::HBox)),
+ status_box (Gtk::manage (new Gtk::Box (Gtk::ORIENTATION_HORIZONTAL))),
non_asm_ctxt (-1, -1)
{
Glib::RefPtr<Buffer> b;
@@ -749,7 +749,7 @@ struct SourceEditor::Priv {
root_dir (a_root_dir),
parent_window (a_parent_window),
source_view (Gtk::manage (new SourceView (a_buf))),
- status_box (Gtk::manage (new Gtk::HBox)),
+ status_box (Gtk::manage (new Gtk::Box (Gtk::ORIENTATION_HORIZONTAL))),
non_asm_ctxt (-1, -1)
{
Glib::RefPtr<Buffer> b;
@@ -798,7 +798,8 @@ SourceEditor::init ()
SourceEditor::SourceEditor (Gtk::Window &a_parent_window,
const UString &a_root_dir,
Glib::RefPtr<Buffer> &a_buf,
- bool a_assembly)
+ bool a_assembly) :
+ Box (Gtk::ORIENTATION_VERTICAL)
{
m_priv.reset (new Priv (a_parent_window,
a_root_dir,
diff --git a/src/uicommon/nmv-source-editor.h b/src/uicommon/nmv-source-editor.h
index e625a33..7218b84 100644
--- a/src/uicommon/nmv-source-editor.h
+++ b/src/uicommon/nmv-source-editor.h
@@ -39,7 +39,7 @@
using Gsv::View;
using Gsv::Buffer;
-using Gtk::VBox;
+using Gtk::Box;
using nemiver::common::SafePtr;
using nemiver::common::UString;
using nemiver::common::Address;
@@ -57,7 +57,7 @@ extern const char* WHERE_CATEGORY;
extern const char* WHERE_MARK;
-class SourceEditor : public VBox {
+class SourceEditor : public Box {
//non copyable
SourceEditor (const SourceEditor&);
SourceEditor& operator= (const SourceEditor&);
diff --git a/src/workbench/nmv-workbench.cc b/src/workbench/nmv-workbench.cc
index d822d3a..b880ca7 100644
--- a/src/workbench/nmv-workbench.cc
+++ b/src/workbench/nmv-workbench.cc
@@ -782,7 +782,7 @@ Workbench::add_perspective_toolbars (IPerspectiveSafePtr &a_perspective,
if (a_tbs.empty ()) {return;}
- SafePtr<Gtk::Box> box (Gtk::manage (new Gtk::VBox));
+ SafePtr<Gtk::Box> box (Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL)));
list<Gtk::Widget*>::const_iterator iter;
for (iter = a_tbs.begin (); iter != a_tbs.end (); ++iter) {
diff --git a/ui/locatefiledialog.ui b/ui/locatefiledialog.ui
index e6b85c7..9c07f50 100644
--- a/ui/locatefiledialog.ui
+++ b/ui/locatefiledialog.ui
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
- <!-- interface-requires gtk+ 2.6 -->
- <!-- interface-naming-policy toplevel-contextual -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="locatefiledialog">
<property name="width_request">300</property>
+ <property name="can_focus">False</property>
<property name="title" translatable="yes">Select File Location</property>
<property name="default_width">350</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox1">
+ <object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <child>
- <object class="GtkVBox" id="vbox1">
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
<child>
- <object class="GtkLabel" id="label1">
+ <object class="GtkButton" id="cancelbutton">
+ <property name="label">gtk-cancel</property>
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Locate File</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <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>
@@ -33,10 +33,12 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_filename">
+ <object class="GtkButton" id="okbutton">
+ <property name="label">gtk-ok</property>
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label">Nemiver cannot locate the following file:</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>
@@ -44,32 +46,30 @@
<property name="position">1</property>
</packing>
</child>
- <child>
- <object class="GtkFileChooserButton" id="filechooserbutton_location">
- <property name="visible">True</property>
- <property name="title">Select File Location: </property>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
- <property name="position">1</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area1">
+ <child>
+ <object class="GtkBox" id="vbox1">
<property name="visible">True</property>
- <property name="layout_style">end</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkButton" id="cancelbutton">
- <property name="label">gtk-cancel</property>
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
+ <property name="label" translatable="yes">Locate File</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -78,12 +78,11 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="okbutton">
- <property name="label">gtk-ok</property>
+ <object class="GtkLabel" id="label_filename">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
+ <property name="label">Nemiver cannot locate the following file:</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -91,11 +90,23 @@
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkFileChooserButton" id="filechooserbutton_location">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="title">Select File Location: </property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
diff --git a/ui/workbench.ui b/ui/workbench.ui
index 22d555b..cc3236a 100644
--- a/ui/workbench.ui
+++ b/ui/workbench.ui
@@ -1,20 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
- <!-- interface-requires gtk+ 2.6 -->
- <!-- interface-naming-policy toplevel-contextual -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkWindow" id="workbench">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="title" translatable="yes">Nemiver</property>
<property name="default_width">800</property>
<property name="default_height">600</property>
<property name="destroy_with_parent">True</property>
<child>
- <object class="GtkVBox" id="vbox1">
+ <object class="GtkBox" id="vbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
- <object class="GtkVBox" id="menucontainer">
+ <object class="GtkBox" id="menucontainer">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
@@ -27,18 +30,20 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="toolbarvbox">
+ <object class="GtkBox" id="toolbarvbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkNotebook" id="toolbarcontainer">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
<object class="GtkVBox" id="emptytoolbar">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<child>
<placeholder/>
</child>
@@ -47,6 +52,7 @@
<child type="tab">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">label1</property>
</object>
<packing>
@@ -55,27 +61,32 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkVBox" id="bodybox">
+ <object class="GtkBox" id="bodybox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkNotebook" id="bodynotebook">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="show_tabs">False</property>
<child>
- <object class="GtkVBox" id="emptybody">
+ <object class="GtkBox" id="emptybody">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<child>
<placeholder/>
</child>
@@ -84,6 +95,7 @@
<child type="tab">
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">label2</property>
</object>
<packing>
@@ -92,11 +104,15 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
