commit 9ff8b913a4e74f441fef5a895c4fb1b0b44ad2fb Author: Hubert Figuière Date: Tue Nov 1 22:56:05 2016 -0400 Fix some Gtk deprecations in several UI files and source. * 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 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 toolbar; + SafePtr toolbar; SafePtr sourceviews_notebook; SafePtr throbber; sigc::signal 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 (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 hbox (Gtk::manage (new Gtk::HBox ())); + SafePtr 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 vbox; + SafePtr vbox; SafePtr scrolled_window; SafePtr loading_indicator; SafePtr 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 m_address_label; SafePtr m_address_entry; SafePtr m_jump_button; - SafePtr m_hbox; - SafePtr m_vbox; + SafePtr m_hbox; + SafePtr m_vbox; SafePtr m_group_label; GroupingComboBox m_grouping_combo; SafePtr 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 (a_gtkbuilder, + ui_utils::get_widget_from_gtkbuilder (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 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 + ui_utils::get_widget_from_gtkbuilder (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 @@ - + + - - + + False 5 Call a Function True @@ -10,24 +11,23 @@ 300 dialog - + True + False vertical 2 - - + + True - 6 - vertical - 6 + False + end - + + gtk-cancel True - 0 - Call a function: - - - + True + False + True False @@ -36,17 +36,18 @@ - + + gtk-ok True False - True - - - True - - + True + True + False + True + False + False 1 @@ -54,20 +55,26 @@ False False - 1 + end + 0 - - + + True - end + False + 6 + vertical + 6 - - gtk-cancel + True - True - False - True + False + start + Call a function: + + + False @@ -76,26 +83,27 @@ - - gtk-ok + True False - True - True - False - True + True + + + True + + - False - False + True + True 1 False - end - 0 + False + 1 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 @@ - + + - - + True + False Set Breakpoint True 400 @@ -12,19 +13,67 @@ True True - + True + False vertical + + + True + False + end + + + gtk-cancel + True + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + True + True + True + True + False + True + + + False + False + 1 + + + + + False + False + end + 0 + + - + True + False 6 vertical 6 True - 0 + False + start Choose Overloaded Function @@ -39,7 +88,8 @@ True - 0 + False + start Multiple functions match the specified name. Please choose one from the list below. True @@ -53,63 +103,22 @@ True True - automatic - automatic in + True + True 2 - 1 - - - - - True - end - - - gtk-cancel - True - True - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - True - False - True - - - False - False - 1 - - - - False - end - 0 + True + 1 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 @@ + - + True False @@ -24,7 +25,6 @@ True True True - False False @@ -39,7 +39,6 @@ True True False - False True @@ -57,47 +56,46 @@ - + True False 6 + vertical 6 - + True False - 3 - 6 - 6 - + True False - True - - - True - - + start + _Variable Name: + True + variablenameentry - 1 - 2 - GTK_SHRINK + False + True + 0 - + True False - 0 - _Variable Name: - True - variablenameentry + True + + + True + + - GTK_FILL - + False + True + 1 @@ -106,14 +104,12 @@ True True False - False True - 2 - 3 - GTK_FILL - + False + True + 2 @@ -124,9 +120,10 @@ - + True False + vertical 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 @@ - + + - - + True + False Find Text 150 100 dialog - + True + False vertical 6 + + + True + False + end + + + gtk-close + True + True + True + False + True + + + False + False + 0 + + + + + gtk-find + True + True + True + False + True + + + False + False + 1 + + + + + False + False + end + 0 + + - + True + False 6 vertical 12 True + False 2 6 6 True - 0 + False + start _Search: True searchtextcombo GTK_FILL - + @@ -63,30 +111,34 @@ - + True + False True + False 2 6 True - 0 + False Match Options: + 0 GTK_FILL - + - + True + False vertical @@ -128,31 +180,36 @@ + True + True 0 True + False 2 6 True - 0 + False Cycling Options: + 0 GTK_FILL - + - + True + False vertical @@ -194,58 +251,23 @@ + True + True 1 - 1 - - - - - 1 - - - - - True - end - - - gtk-close - True - True - True - False - True - - - False - False - 0 - - - - - gtk-find - True - True - True - False - True - - - False - False + True + True 1 False - end - 0 + True + 1 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 @@ - + + - - + True + False Global Variables 600 500 dialog - + True + False vertical - - - True - 6 - vertical - - - - - - 1 - - - + True + False end @@ -47,10 +37,27 @@ False + False end 0 + + + True + False + 6 + vertical + + + + + + False + True + 1 + + 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 @@ - + + - - + 300 + False Choose a Core File to Debug False 350 200 dialog - + True + False vertical + + + True + False + end + + + gtk-cancel + True + False + False + True + + + False + False + 0 + + + + + gtk-ok + True + False + False + True + + + False + False + 1 + + + + + False + False + end + 0 + + - + + vertical True + False 6 - vertical 6 True + False 0 none True + False 12 True + False Select a Core File @@ -39,6 +86,7 @@ True + False Core File: @@ -47,21 +95,26 @@ + True + True 0 True + False 0 none True + False 12 True + False Select the executable that created the core file @@ -70,6 +123,7 @@ True + False Executable: @@ -78,54 +132,18 @@ + True + True 1 False + True 1 - - - True - end - - - gtk-cancel - True - False - False - True - - - False - False - 0 - - - - - gtk-ok - True - False - False - True - - - False - False - 1 - - - - - False - end - 0 - - 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 @@ - + + - - + True + False Open Source Files 500 400 dialog - + True + False vertical + + + True + False + end + + + gtk-cancel + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + True + False + True + True + False + True + + + False + False + 1 + + + + + False + False + end + 0 + + - + True + False 6 vertical 6 True + False 0 none True + False 6 12 - + True + False vertical @@ -38,6 +88,7 @@ True True False + start True True @@ -53,6 +104,7 @@ True True False + start True True radiobutton_target @@ -70,6 +122,7 @@ True + False Choose Source Files to Open @@ -79,12 +132,14 @@ False + True 0 - + True + False True vertical @@ -92,54 +147,16 @@ - 1 - - - - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - True - False - True - True - False - True - - - False - False + True + True 1 False - end - 0 + True + 1 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 @@ + - - + True False @@ -11,11 +11,12 @@ dialog True - + True False + vertical - + True False end @@ -48,10 +49,11 @@ True 6 - + True False 6 + vertical 12 @@ -66,9 +68,10 @@ 6 12 - + True False + vertical 6 @@ -76,6 +79,7 @@ True True False + start True True True @@ -87,7 +91,7 @@ - + True False False @@ -109,6 +113,7 @@ True True False + Sans 12 True @@ -199,6 +204,7 @@ True True False + start True True True @@ -241,6 +247,7 @@ True True False + start True True @@ -277,14 +284,15 @@ 6 12 - + True False + vertical True False - 0 + start When a source file is changed: @@ -300,15 +308,17 @@ 6 6 - + True False + vertical Reload the file True True False + start True True @@ -324,6 +334,7 @@ True True False + start True True reloadradiobutton @@ -340,6 +351,7 @@ True True False + start True True reloadradiobutton @@ -398,6 +410,7 @@ True True False + start True True True @@ -435,12 +448,13 @@ - + True False 6 + vertical - + True False 6 @@ -453,6 +467,9 @@ True True + + + @@ -463,9 +480,10 @@ - + True False + vertical 6 @@ -526,10 +544,11 @@ - + True False 6 + vertical 12 @@ -548,6 +567,7 @@ True True False + start True True @@ -584,15 +604,17 @@ 6 12 - + True False + vertical Pure assembly True True False + start True True @@ -608,6 +630,7 @@ True True False + start True True pureasmradio @@ -693,34 +716,34 @@ 6 12 - + True False - 2 - 6 - 6 - + True False - Choose a File + start + True + Path to the GDB binary used - 1 - 2 - GTK_FILL + True + True + 0 - + True False - 0 - Path to the GDB binary used + True + Choose a File - GTK_FILL - + True + True + 1 @@ -757,39 +780,36 @@ 6 12 - + True False - 2 - 6 - 6 - + True - True - False - False - True - True - 1 - True + False + start + True + Number of instructions to disassemble by default - 1 - 2 - + True + True + 0 - + True - False - 0 - Number of instructions to disassemble by default + True + False + False + 1 + True - GTK_FILL - + False + True + 1 @@ -831,6 +851,7 @@ True True False + start True True @@ -867,15 +888,17 @@ 6 12 - + True False + vertical Follow parent True True False + start True True @@ -891,6 +914,7 @@ True True False + start True True followparentradio @@ -939,10 +963,11 @@ - + True False 6 + vertical 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 @@ - + + - - + True + False 6 Attach to a Running Program 500 500 dialog - + True + False vertical + + + True + False + end + + + gtk-cancel + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + True + True + True + False + True + + + False + False + 1 + + + + + False + False + end + 0 + + - + True + False 6 vertical 6 True - 0 + False + start Choose a Process to Debug @@ -30,6 +77,7 @@ False + True 0 @@ -43,20 +91,28 @@ True True True + True + + + + True + True 1 - + True + False 6 True + False _Filter list: True entry_filter @@ -72,62 +128,26 @@ True True True - ● + ● + True + True 1 False + True 2 - 1 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - False - True - - - False - False - 1 - - - - False - end - 0 + True + 1 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 @@ - + + - - + True + False Connect to Remote Target False True @@ -11,20 +12,67 @@ 300 dialog - + True + False vertical 6 + + + True + False + end + + + gtk-cancel + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + True + True + True + False + True + + + False + False + 1 + + + + + False + False + 6 + end + 0 + + - + True + False 6 vertical 6 True - 0 + False + start Executable to Load True @@ -40,23 +88,27 @@ True + False 6 True + False Choose a File False + True 1 True - 0 + False + start Shared Libraries Location True @@ -72,10 +124,12 @@ True + False 6 True + False select-folder Choose a Directory @@ -83,13 +137,15 @@ False + True 3 True - 0 + False + start Remote Debugging Server @@ -104,10 +160,12 @@ True + False 6 - + True + False vertical @@ -115,6 +173,7 @@ True True False + start True True @@ -127,64 +186,67 @@ True + False 6 - + True - 4 - 6 - 6 + False + 6 - + True - True + False + start + Address: - 3 - 4 - - + True + True + 0 - + True - 0 - Port: + True - 2 - 3 - - + False + True + 1 - + True - 0 - Address: + False + start + Port: - - + True + True + 2 - + True True - 1 - 2 - + False + True + 3 + True + True 1 @@ -194,6 +256,7 @@ True True False + start True True tcpradiobutton @@ -207,14 +270,18 @@ True + False 6 True + False + True + True 3 @@ -222,53 +289,16 @@ + True + True 5 - 1 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - False - True - - - False - False - 1 - - - - False - end - 0 + True + 1 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 @@ - + + - - + 300 + False Choose a Program to Execute 350 400 dialog - + True + False vertical + + + True + False + end + + + gtk-cancel + True + False + False + True + + + False + False + 0 + + + + + gtk-execute + True + False + True + True + False + True + + + False + False + 1 + + + + + False + False + end + 0 + + - + True + False 6 vertical 6 True + False 0 none True + False 12 True + False Choose an Executable @@ -38,6 +87,7 @@ True + False Program: @@ -47,21 +97,25 @@ False + True 0 True + False 0 none True + False 12 True + False @@ -69,6 +123,7 @@ True + False Arguments: @@ -78,21 +133,25 @@ False + True 1 True + False 0 none True + False 12 True + False select-folder Choose a Working Directory @@ -102,6 +161,7 @@ True + False Working Directory: @@ -111,42 +171,52 @@ False + True 2 True + False 0 none True + False 12 - + True + False 6 True False - automatic - automatic out True + False + + + + True + True 0 - + True + False + vertical 6 start @@ -158,15 +228,18 @@ True + False 0 0 - + True + False 2 True + False gtk-add @@ -178,6 +251,7 @@ True + False _Add True @@ -208,15 +282,18 @@ True + False 0 0 - + True + False 2 True + False gtk-remove @@ -228,6 +305,7 @@ True + False _Remove True @@ -262,6 +340,7 @@ True + False Environment Variables: @@ -270,53 +349,16 @@ + True + True 3 - 1 - - - - - True - end - - - gtk-cancel - True - False - False - True - - - False - False - 0 - - - - - gtk-execute - True - False - True - True - False - True - - - False - False - 1 - - - - False - end - 0 + True + 1 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 @@ + - + 300 300 @@ -29,7 +30,6 @@ True True False - False True @@ -45,7 +45,6 @@ True True False - False True @@ -53,7 +52,7 @@ 0 0 - + True False 2 @@ -105,7 +104,7 @@ True False - 0 + start Choose a Session to Debug 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 @@ - + + - - + + True + False Set Breakpoint True center-on-parent 300 dialog - + True + False vertical 6 + + + True + False + end + + + gtk-cancel + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + True + True + True + True + False + True + + + False + False + 1 + + + + + False + False + end + 0 + + - + True + False 6 vertical 6 True - 0 + False + start Set a Breakpoint: @@ -38,18 +87,35 @@ True + False True + False 11 2 6 6 + + + + + + + + + + + + + + + True True - ● + ● True @@ -57,14 +123,14 @@ 2 4 5 - + True True - ● + ● True @@ -72,14 +138,14 @@ 2 3 4 - + True True - ● + ● True @@ -87,13 +153,14 @@ 2 1 2 - + True - 0 + False + start Condition: conditionentry @@ -101,21 +168,21 @@ 10 11 GTK_FILL - + True True - ● + ● 1 2 10 11 - + @@ -139,6 +206,7 @@ True True False + start True True @@ -146,29 +214,33 @@ 7 8 GTK_FILL - + True True - ● + ● 1 2 6 7 - + + + + _Binary Location: True True False + start True True eventradio @@ -177,7 +249,7 @@ 5 6 GTK_FILL - + @@ -186,6 +258,7 @@ True True False + start True True eventradio @@ -194,7 +267,7 @@ 2 3 GTK_FILL - + @@ -203,19 +276,21 @@ True True False + start True True eventradio GTK_FILL - + True - 1 + False + end Address: addressentry @@ -223,13 +298,14 @@ 6 7 GTK_FILL - + True - 1 + False + end File name: filenameentry @@ -237,13 +313,14 @@ 3 4 GTK_FILL - + True - 1 + False + end Function: functionentry @@ -251,13 +328,14 @@ 1 2 GTK_FILL - + True - 1 + False + end Line: lineentry @@ -265,7 +343,7 @@ 4 5 GTK_FILL - + @@ -281,24 +359,6 @@ 10 - - - - - - - - - - - - - - - - - - @@ -310,49 +370,9 @@ - 1 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - True - False - True - - - False - False - 1 - - - - False - end - 0 + True + 1 @@ -362,5 +382,4 @@ okbutton - 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 @@ - + + - - + + False 5 Set Location to Jump To center-on-parent @@ -10,19 +11,64 @@ dialog center - + True + False vertical 2 + + + True + False + end + + + gtk-cancel + True + True + True + True + + + False + False + 0 + + + + + gtk-ok + True + True + True + True + True + + + False + False + 1 + + + + + False + False + end + 0 + + - + True + False vertical 6 True - 0 + False + start Jump to location: @@ -37,19 +83,31 @@ True + False True + False 8 2 6 6 + + + + + + + + + F_unction Name: True True False + start True True True @@ -65,6 +123,7 @@ True True False + start True True True @@ -83,6 +142,7 @@ True True False + start True True True @@ -96,7 +156,8 @@ True - 1 + False + end Function: @@ -107,7 +168,8 @@ True - 1 + False + end File name: @@ -118,7 +180,8 @@ True - 1 + False + end Line: @@ -129,7 +192,8 @@ True - 1 + False + end Address: @@ -141,7 +205,7 @@ True True - ● + ● 1 @@ -156,7 +220,7 @@ True True - ● + ● 1 @@ -171,7 +235,7 @@ True True - ● + ● 1 @@ -184,7 +248,7 @@ True True - ● + ● 1 @@ -196,11 +260,15 @@ + + + Break at Destination True True False + start True @@ -208,68 +276,20 @@ 8 - - - - - - - - - - - - - 1 - - - - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - True - True - - - False - False + True + True 1 False - end - 0 + True + 1 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 @@ - + + - - + True True @@ -10,48 +10,102 @@ 300 dialog - + True + False vertical 2 + + + True + False + end + + + gtk-cancel + True + True + True + True + + + False + False + 0 + + + + + gtk-ok + True + True + True + True + True + True + + + False + False + 1 + + + + + False + False + end + 0 + + - + True + False vertical 6 True - 0 + False + start Set a watchpoint: + True + True 0 True + False 1 - + True + False vertical 6 - + True + False 6 True - 0 + False + start Expression: + True + True 0 @@ -62,6 +116,8 @@ True + True + True 1 @@ -74,6 +130,8 @@ True + True + True 2 @@ -85,16 +143,20 @@ - + True + False 6 True - 0 + False + start Triggers on: + True + True 0 @@ -104,9 +166,12 @@ True True False + start True + True + True 1 @@ -116,10 +181,13 @@ True True False + start True True + True + True 2 @@ -131,7 +199,7 @@ - + True True vertical @@ -141,6 +209,8 @@ + True + True 2 @@ -148,6 +218,8 @@ + True + True 1 @@ -158,47 +230,6 @@ 1 - - - True - end - - - gtk-cancel - True - True - True - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - True - True - True - - - False - False - 1 - - - - - False - end - 0 - - 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 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 b; @@ -798,7 +798,8 @@ SourceEditor::init () SourceEditor::SourceEditor (Gtk::Window &a_parent_window, const UString &a_root_dir, Glib::RefPtr &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 box (Gtk::manage (new Gtk::VBox)); + SafePtr box (Gtk::manage (new Gtk::Box(Gtk::ORIENTATION_VERTICAL))); list::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 @@ - + + - - + 300 + False Select File Location 350 dialog - + True + False vertical - - + + True - 6 - vertical - 6 + False + end - + + gtk-cancel True - 0 - Locate File - - - + False + False + True False @@ -33,10 +33,12 @@ - + + gtk-ok True - 0 - Nemiver cannot locate the following file: + False + False + True False @@ -44,32 +46,30 @@ 1 - - - True - Select File Location: - - - 2 - - False - 1 + False + end + 0 - - + + True - end + False + 6 + vertical + 6 - - gtk-cancel + True False - False - True + Locate File + 0 + + + False @@ -78,12 +78,11 @@ - - gtk-ok + True False - False - True + Nemiver cannot locate the following file: + 0 False @@ -91,11 +90,23 @@ 1 + + + True + False + Select File Location: + + + True + True + 2 + + False - end - 0 + True + 1 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 @@ - + + - - + True + False Nemiver 800 600 True - + True + False vertical - + True + False vertical @@ -27,18 +30,20 @@ - + True + False vertical True + False False False True - vertical + False @@ -47,6 +52,7 @@ True + False label1 @@ -55,27 +61,32 @@ + True + True 0 False + True 1 - + True + False vertical True + False False - + True - vertical + False @@ -84,6 +95,7 @@ True + False label2 @@ -92,11 +104,15 @@ + True + True 0 + True + True 2