smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 23:05:04 +01:00
Code Issues Projects Releases Wiki Activity

Only use ArdourDialog (and thus Gtk::Dialog) for actual dialogs.

Browse source 
Fixes #4364.

I havn't fully tested every single dialog and window (heck, I don't even know
how to get at half of them), and there may be some packing niggles, but this is
the bulk of the work.  The Gnome 3 kiddies can close their dialogs now, anyway
:)


git-svn-id: svn://localhost/ardour2/branches/3.0@10699 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2011-11-19 00:56:35 +00:00
parent a9fb657a47
commit 05283a6339
36 changed files with 120 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

3
gtk2_ardour/bundle_manager.cc
View file

@ -310,6 +310,9 @@ BundleManager::BundleManager (Session* session)
sigc::mem_fun (*this, &BundleManager::row_activated) sigc::mem_fun (*this, &BundleManager::row_activated)
); );
Gtk::Button* close_but = add_button (Gtk::Stock::CLOSE, Gtk::RESPONSE_ACCEPT);
close_but->signal_clicked ().connect (sigc::mem_fun (*this, &Gtk::Window::hide));
set_button_sensitivity (); set_button_sensitivity ();
show_all (); show_all ();

4
gtk2_ardour/configinfo.cc
View file

@ -17,6 +17,8 @@
*/ */
#include <gtkmm.h>
#include "ardour/ardour.h" #include "ardour/ardour.h"
#include "configinfo.h" #include "configinfo.h"
@ -32,4 +34,6 @@ ConfigInfoDialog::ConfigInfoDialog ()
text.set_size_request (300, 800); text.set_size_request (300, 800);
get_vbox()->pack_start (text, true, true); get_vbox()->pack_start (text, true, true);
add_button (Gtk::Stock::CLOSE, Gtk::RESPONSE_ACCEPT);
} }

6
gtk2_ardour/global_port_matrix.cc
View file

@ -148,8 +148,8 @@ GlobalPortMatrix::get_state (BundleChannel c[2]) const
} }
GlobalPortMatrixWindow::GlobalPortMatrixWindow (Session* s, DataType t) GlobalPortMatrixWindow::GlobalPortMatrixWindow (Session* s, DataType t)
: ArdourDialog (X_("reset me soon")) : ArdourWindow (X_("reset me soon"))
, _port_matrix (this, s, t) , _port_matrix (this, s, t)
{ {
switch (t) { switch (t) {
case DataType::AUDIO: case DataType::AUDIO:
@ -160,7 +160,7 @@ GlobalPortMatrixWindow::GlobalPortMatrixWindow (Session* s, DataType t)
break; break;
} }
get_vbox()->pack_start (_port_matrix, true, true); add (_port_matrix);
_port_matrix.show (); _port_matrix.show ();
} }

4
gtk2_ardour/global_port_matrix.h
View file

@ -23,7 +23,7 @@
#include <gtkmm/button.h> #include <gtkmm/button.h>
#include "port_matrix.h" #include "port_matrix.h"
#include "port_group.h" #include "port_group.h"
#include "ardour_dialog.h" #include "ardour_window.h"
class GlobalPortMatrix : public PortMatrix class GlobalPortMatrix : public PortMatrix
{ {
@ -50,7 +50,7 @@ private:
}; };
}; };
class GlobalPortMatrixWindow : public ArdourDialog class GlobalPortMatrixWindow : public ArdourWindow
{ {
public: public:
GlobalPortMatrixWindow (ARDOUR::Session *, ARDOUR::DataType); GlobalPortMatrixWindow (ARDOUR::Session *, ARDOUR::DataType);

14
gtk2_ardour/keyeditor.cc
View file

@ -53,7 +53,7 @@ using namespace PBD;
using Gtkmm2ext::Keyboard; using Gtkmm2ext::Keyboard;
KeyEditor::KeyEditor () KeyEditor::KeyEditor ()
: ArdourDialog (_("Key Bindings"), false) : ArdourWindow (_("Key Bindings"))
, unbind_button (_("Remove shortcut")) , unbind_button (_("Remove shortcut"))
, unbind_box (BUTTONBOX_END) , unbind_box (BUTTONBOX_END)
@ -79,9 +79,7 @@ KeyEditor::KeyEditor ()
scroller.add (view); scroller.add (view);
scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
add (scroller);
get_vbox()->set_spacing (6);
get_vbox()->pack_start (scroller);
if (!ARDOUR::Profile->get_sae()) { if (!ARDOUR::Profile->get_sae()) {
@ -92,14 +90,12 @@ KeyEditor::KeyEditor ()
unbind_box.pack_start (unbind_button, false, false); unbind_box.pack_start (unbind_button, false, false);
unbind_button.signal_clicked().connect (sigc::mem_fun (*this, &KeyEditor::unbind)); unbind_button.signal_clicked().connect (sigc::mem_fun (*this, &KeyEditor::unbind));
get_vbox()->pack_start (unbind_box, false, false); add (unbind_box);
unbind_box.show (); unbind_box.show ();
unbind_button.show (); unbind_button.show ();
} }
get_vbox()->set_border_width (12);
view.show (); view.show ();
scroller.show (); scroller.show ();
@ -137,13 +133,13 @@ KeyEditor::on_show ()
{ {
populate (); populate ();
view.get_selection()->unselect_all (); view.get_selection()->unselect_all ();
ArdourDialog::on_show (); ArdourWindow::on_show ();
} }
void void
KeyEditor::on_unmap () KeyEditor::on_unmap ()
{ {
ArdourDialog::on_unmap (); ArdourWindow::on_unmap ();
} }
void void

4
gtk2_ardour/keyeditor.h
View file

@ -8,9 +8,9 @@
#include <gtkmm/treestore.h> #include <gtkmm/treestore.h>
#include <gtkmm/scrolledwindow.h> #include <gtkmm/scrolledwindow.h>
#include "ardour_dialog.h" #include "ardour_window.h"
class KeyEditor : public ArdourDialog class KeyEditor : public ArdourWindow
{ {
public: public:
KeyEditor (); KeyEditor ();

10
gtk2_ardour/location_ui.cc
View file

@ -1110,12 +1110,12 @@ LocationUI::session_going_away()
/*------------------------*/ /*------------------------*/
LocationUIWindow::LocationUIWindow () LocationUIWindow::LocationUIWindow ()
: ArdourDialog (_("Locations")) : ArdourWindow (_("Locations"))
{ {
set_wmclass(X_("ardour_locations"), PROGRAM_NAME); set_wmclass(X_("ardour_locations"), PROGRAM_NAME);
set_name ("LocationWindow"); set_name ("LocationWindow");
get_vbox()->pack_start (_ui); add (_ui);
} }
LocationUIWindow::~LocationUIWindow() LocationUIWindow::~LocationUIWindow()
@ -1125,7 +1125,7 @@ LocationUIWindow::~LocationUIWindow()
void void
LocationUIWindow::on_map () LocationUIWindow::on_map ()
{ {
ArdourDialog::on_map (); ArdourWindow::on_map ();
_ui.refresh_location_list(); _ui.refresh_location_list();
} }
@ -1139,13 +1139,13 @@ LocationUIWindow::on_delete_event (GdkEventAny*)
void void
LocationUIWindow::set_session (Session *s) LocationUIWindow::set_session (Session *s)
{ {
ArdourDialog::set_session (s); ArdourWindow::set_session (s);
_ui.set_session (s); _ui.set_session (s);
} }
void void
LocationUIWindow::session_going_away () LocationUIWindow::session_going_away ()
{ {
ArdourDialog::session_going_away (); ArdourWindow::session_going_away ();
hide_all(); hide_all();
} }

4
gtk2_ardour/location_ui.h
View file

@ -34,7 +34,7 @@
#include "ardour/location.h" #include "ardour/location.h"
#include "ardour/session_handle.h" #include "ardour/session_handle.h"
#include "ardour_dialog.h" #include "ardour_window.h"
#include "audio_clock.h" #include "audio_clock.h"
namespace ARDOUR { namespace ARDOUR {
@ -199,7 +199,7 @@ class LocationUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
ClockGroup* _clock_group; ClockGroup* _clock_group;
}; };
class LocationUIWindow : public ArdourDialog class LocationUIWindow : public ArdourWindow
{ {
public: public:
LocationUIWindow (); LocationUIWindow ();

4
gtk2_ardour/midi_list_editor.cc
View file

@ -38,7 +38,7 @@ using namespace Glib;
using namespace ARDOUR; using namespace ARDOUR;
MidiListEditor::MidiListEditor (Session* s, boost::shared_ptr<MidiRegion> r) MidiListEditor::MidiListEditor (Session* s, boost::shared_ptr<MidiRegion> r)
: ArdourDialog (r->name(), false, false) : ArdourWindow (r->name())
, region (r) , region (r)
{ {
/* We do not handle nested sources/regions. Caller should have tackled this */ /* We do not handle nested sources/regions. Caller should have tackled this */
@ -83,7 +83,7 @@ MidiListEditor::MidiListEditor (Session* s, boost::shared_ptr<MidiRegion> r)
view.show (); view.show ();
scroller.show (); scroller.show ();
get_vbox()->pack_start (scroller); add (scroller);
set_size_request (400, 400); set_size_request (400, 400);
} }

4
gtk2_ardour/midi_list_editor.h
View file

@ -27,7 +27,7 @@
#include "ardour/session_handle.h" #include "ardour/session_handle.h"
#include "ardour_dialog.h" #include "ardour_window.h"
namespace Evoral { namespace Evoral {
template<typename Time> class Note; template<typename Time> class Note;
@ -39,7 +39,7 @@ namespace ARDOUR {
class Session; class Session;
}; };
class MidiListEditor : public ArdourDialog class MidiListEditor : public ArdourWindow
{ {
public: public:
typedef Evoral::Note<Evoral::MusicalTime> NoteType; typedef Evoral::Note<Evoral::MusicalTime> NoteType;

20
gtk2_ardour/midi_tracer.cc
View file

@ -36,7 +36,7 @@ using namespace MIDI;
using namespace Glib; using namespace Glib;
MidiTracer::MidiTracer () MidiTracer::MidiTracer ()
: ArdourDialog (_("MIDI Tracer")) : ArdourWindow (_("MIDI Tracer"))
, parser (0) , parser (0)
, line_count_adjustment (200, 1, 2000, 1, 10) , line_count_adjustment (200, 1, 2000, 1, 10)
, line_count_spinner (line_count_adjustment) , line_count_spinner (line_count_adjustment)
@ -51,10 +51,11 @@ MidiTracer::MidiTracer ()
, base_button (_("Decimal")) , base_button (_("Decimal"))
, collect_button (_("Enabled")) , collect_button (_("Enabled"))
{ {
get_vbox()->set_spacing (4);
Manager::instance()->PortsChanged.connect (_manager_connection, invalidator (*this), boost::bind (&MidiTracer::ports_changed, this), gui_context()); Manager::instance()->PortsChanged.connect (_manager_connection, invalidator (*this), boost::bind (&MidiTracer::ports_changed, this), gui_context());
VBox* vbox = manage (new VBox);
vbox->set_spacing (4);
HBox* pbox = manage (new HBox); HBox* pbox = manage (new HBox);
pbox->set_spacing (6); pbox->set_spacing (6);
pbox->pack_start (*manage (new Label (_("Port:"))), false, false); pbox->pack_start (*manage (new Label (_("Port:"))), false, false);
@ -62,11 +63,11 @@ MidiTracer::MidiTracer ()
_port_combo.signal_changed().connect (sigc::mem_fun (*this, &MidiTracer::port_changed)); _port_combo.signal_changed().connect (sigc::mem_fun (*this, &MidiTracer::port_changed));
pbox->pack_start (_port_combo); pbox->pack_start (_port_combo);
pbox->show_all (); pbox->show_all ();
get_vbox()->pack_start (*pbox, false, false); vbox->pack_start (*pbox, false, false);
scroller.add (text); scroller.add (text);
get_vbox()->set_border_width (12); vbox->set_border_width (12);
get_vbox()->pack_start (scroller, true, true); vbox->pack_start (scroller, true, true);
text.show (); text.show ();
text.set_name ("MidiTracerTextView"); text.set_name ("MidiTracerTextView");
@ -85,15 +86,16 @@ MidiTracer::MidiTracer ()
line_count_label.show (); line_count_label.show ();
line_count_box.show (); line_count_box.show ();
get_action_area()->add (line_count_box);
HBox* bbox = manage (new HBox); HBox* bbox = manage (new HBox);
bbox->add (line_count_box);
bbox->add (base_button); bbox->add (base_button);
bbox->add (collect_button); bbox->add (collect_button);
bbox->add (autoscroll_button); bbox->add (autoscroll_button);
bbox->show (); bbox->show ();
get_action_area()->add (*bbox); vbox->pack_start (*bbox, false, false);
add (*vbox);
base_button.signal_toggled().connect (sigc::mem_fun (*this, &MidiTracer::base_toggle)); base_button.signal_toggled().connect (sigc::mem_fun (*this, &MidiTracer::base_toggle));
collect_button.signal_toggled().connect (sigc::mem_fun (*this, &MidiTracer::collect_toggle)); collect_button.signal_toggled().connect (sigc::mem_fun (*this, &MidiTracer::collect_toggle));

5
gtk2_ardour/midi_tracer.h
View file

@ -8,18 +8,19 @@
#include <gtkmm/spinbutton.h> #include <gtkmm/spinbutton.h>
#include <gtkmm/label.h> #include <gtkmm/label.h>
#include <gtkmm/comboboxtext.h> #include <gtkmm/comboboxtext.h>
#include <gtkmm/box.h>
#include "pbd/signals.h" #include "pbd/signals.h"
#include "pbd/ringbuffer.h" #include "pbd/ringbuffer.h"
#include "pbd/pool.h" #include "pbd/pool.h"
#include "midi++/types.h" #include "midi++/types.h"
#include "ardour_dialog.h" #include "ardour_window.h"
namespace MIDI { namespace MIDI {
class Parser; class Parser;
} }
class MidiTracer : public ArdourDialog class MidiTracer : public ArdourWindow
{ {
public: public:
MidiTracer (); MidiTracer ();

7
gtk2_ardour/mixer_strip.cc
View file

@ -54,7 +54,7 @@
#include "ardour/port.h" #include "ardour/port.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "ardour_dialog.h" #include "ardour_window.h"
#include "mixer_strip.h" #include "mixer_strip.h"
#include "mixer_ui.h" #include "mixer_ui.h"
#include "keyboard.h" #include "keyboard.h"
@ -1351,7 +1351,7 @@ MixerStrip::open_comment_editor ()
void void
MixerStrip::setup_comment_editor () MixerStrip::setup_comment_editor ()
{ {
comment_window = new ArdourDialog ("", false); // title will be reset to show route comment_window = new ArdourWindow (""); // title will be reset to show route
comment_window->set_position (Gtk::WIN_POS_MOUSE); comment_window->set_position (Gtk::WIN_POS_MOUSE);
comment_window->set_skip_taskbar_hint (true); comment_window->set_skip_taskbar_hint (true);
comment_window->signal_hide().connect (sigc::mem_fun(*this, &MixerStrip::comment_editor_done_editing)); comment_window->signal_hide().connect (sigc::mem_fun(*this, &MixerStrip::comment_editor_done_editing));
@ -1364,8 +1364,7 @@ MixerStrip::setup_comment_editor ()
comment_area->get_buffer()->set_text (_route->comment()); comment_area->get_buffer()->set_text (_route->comment());
comment_area->show (); comment_area->show ();
comment_window->get_vbox()->pack_start (*comment_area); comment_window->add (*comment_area);
comment_window->get_action_area()->hide();
} }
void void

4
gtk2_ardour/mixer_strip.h
View file

@ -52,7 +52,6 @@
#include "panner_ui.h" #include "panner_ui.h"
#include "enums.h" #include "enums.h"
#include "processor_box.h" #include "processor_box.h"
#include "ardour_dialog.h"
#include "visibility_group.h" #include "visibility_group.h"
namespace ARDOUR { namespace ARDOUR {
@ -73,6 +72,7 @@ class Mixer_UI;
class IOSelectorWindow; class IOSelectorWindow;
class MotionController; class MotionController;
class RouteGroupMenu; class RouteGroupMenu;
class ArdourWindow;
class MixerStrip : public RouteUI, public Gtk::EventBox class MixerStrip : public RouteUI, public Gtk::EventBox
{ {
@ -202,7 +202,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
Gtk::Button name_button; Gtk::Button name_button;
ArdourDialog* comment_window; ArdourWindow* comment_window;
Gtk::TextView* comment_area; Gtk::TextView* comment_area;
Gtk::Button _comment_button; Gtk::Button _comment_button;

5
gtk2_ardour/option_editor.cc
View file

@ -237,7 +237,7 @@ OptionEditorPage::OptionEditorPage (Gtk::Notebook& n, std::string const & t)
* @param t Title for the dialog. * @param t Title for the dialog.
*/ */
OptionEditor::OptionEditor (Configuration* c, std::string const & t) OptionEditor::OptionEditor (Configuration* c, std::string const & t)
: ArdourDialog (t, false), _config (c) : ArdourWindow (t), _config (c)
{ {
using namespace Notebook_Helpers; using namespace Notebook_Helpers;
@ -249,8 +249,7 @@ OptionEditor::OptionEditor (Configuration* c, std::string const & t)
set_border_width (4); set_border_width (4);
get_vbox()->set_spacing (4); add (_notebook);
get_vbox()->pack_start (_notebook);
_notebook.set_show_tabs (true); _notebook.set_show_tabs (true);
_notebook.set_show_border (true); _notebook.set_show_border (true);

4
gtk2_ardour/option_editor.h
View file

@ -26,7 +26,7 @@
#include <gtkmm/spinbutton.h> #include <gtkmm/spinbutton.h>
#include <gtkmm/table.h> #include <gtkmm/table.h>
#include "gtkmm2ext/slider_controller.h" #include "gtkmm2ext/slider_controller.h"
#include "ardour_dialog.h" #include "ardour_window.h"
#include "audio_clock.h" #include "audio_clock.h"
#include "ardour/types.h" #include "ardour/types.h"
@ -408,7 +408,7 @@ public:
}; };
/** The OptionEditor dialog base class */ /** The OptionEditor dialog base class */
class OptionEditor : public ArdourDialog class OptionEditor : public ArdourWindow
{ {
public: public:
OptionEditor (ARDOUR::Configuration *, std::string const &); OptionEditor (ARDOUR::Configuration *, std::string const &);

4
gtk2_ardour/panner2d.cc
View file

@ -778,7 +778,7 @@ Panner2d::toggle_bypass ()
} }
Panner2dWindow::Panner2dWindow (boost::shared_ptr<PannerShell> p, int32_t h, uint32_t inputs) Panner2dWindow::Panner2dWindow (boost::shared_ptr<PannerShell> p, int32_t h, uint32_t inputs)
: ArdourDialog (_("Panner (2D)")) : ArdourWindow (_("Panner (2D)"))
, widget (p, h) , widget (p, h)
, bypass_button (_("Bypass")) , bypass_button (_("Bypass"))
{ {
@ -809,7 +809,7 @@ Panner2dWindow::Panner2dWindow (boost::shared_ptr<PannerShell> p, int32_t h, uin
hpacker.pack_start (left_side, false, false); hpacker.pack_start (left_side, false, false);
hpacker.show (); hpacker.show ();
get_vbox()->pack_start (hpacker); add (hpacker);
reset (inputs); reset (inputs);
widget.show (); widget.show ();
} }

4
gtk2_ardour/panner2d.h
View file

@ -34,7 +34,7 @@
#include "pbd/cartesian.h" #include "pbd/cartesian.h"
#include "ardour_dialog.h" #include "ardour_window.h"
namespace ARDOUR { namespace ARDOUR {
class PannerShell; class PannerShell;
@ -143,7 +143,7 @@ class Panner2d : public Gtk::DrawingArea
void clamp_to_circle (double& x, double& y); void clamp_to_circle (double& x, double& y);
}; };
class Panner2dWindow : public ArdourDialog class Panner2dWindow : public ArdourWindow
{ {
public: public:
Panner2dWindow (boost::shared_ptr<ARDOUR::PannerShell>, int32_t height, uint32_t inputs); Panner2dWindow (boost::shared_ptr<ARDOUR::PannerShell>, int32_t height, uint32_t inputs);

6
gtk2_ardour/plugin_ui.cc
View file

@ -61,7 +61,7 @@
#include <lrdf.h> #include <lrdf.h>
#include "ardour_dialog.h" #include "ardour_window.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "prompter.h" #include "prompter.h"
#include "plugin_ui.h" #include "plugin_ui.h"
@ -561,8 +561,8 @@ PlugUIBase::latency_button_clicked ()
{ {
if (!latency_gui) { if (!latency_gui) {
latency_gui = new LatencyGUI (*(insert.get()), insert->session().frame_rate(), insert->session().get_block_size()); latency_gui = new LatencyGUI (*(insert.get()), insert->session().frame_rate(), insert->session().get_block_size());
latency_dialog = new ArdourDialog (_("Edit Latency"), false, false); latency_dialog = new ArdourWindow (_("Edit Latency"));
latency_dialog->get_vbox()->pack_start (*latency_gui); latency_dialog->add (*latency_gui);
latency_dialog->signal_hide().connect (sigc::mem_fun (*this, &PlugUIBase::set_latency_label)); latency_dialog->signal_hide().connect (sigc::mem_fun (*this, &PlugUIBase::set_latency_label));
} }

4
gtk2_ardour/plugin_ui.h
View file

@ -72,7 +72,7 @@ namespace Gtkmm2ext {
} }
class LatencyGUI; class LatencyGUI;
class ArdourDialog; class ArdourWindow;
class PluginEqGui; class PluginEqGui;
class PlugUIBase : public virtual sigc::trackable, public PBD::ScopedConnectionList class PlugUIBase : public virtual sigc::trackable, public PBD::ScopedConnectionList
@ -119,7 +119,7 @@ class PlugUIBase : public virtual sigc::trackable, public PBD::ScopedConnectionL
void set_latency_label (); void set_latency_label ();
LatencyGUI* latency_gui; LatencyGUI* latency_gui;
ArdourDialog* latency_dialog; ArdourWindow* latency_dialog;
Gtk::Expander plugin_analysis_expander; Gtk::Expander plugin_analysis_expander;
PluginEqGui* eqgui; PluginEqGui* eqgui;

6
gtk2_ardour/port_insert_ui.cc
View file

@ -176,6 +176,12 @@ PortInsertWindow::PortInsertWindow (ARDOUR::Session* sess, boost::shared_ptr<ARD
get_vbox()->pack_start (_portinsertui); get_vbox()->pack_start (_portinsertui);
Gtk::Button* cancel_but = add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
Gtk::Button* ok_but = add_button (Gtk::Stock::OK, Gtk::RESPONSE_OK);
cancel_but->signal_clicked().connect (sigc::mem_fun (*this, &PortInsertWindow::cancel));
ok_but->signal_clicked().connect (sigc::mem_fun (*this, &PortInsertWindow::accept));
signal_delete_event().connect (sigc::mem_fun (*this, &PortInsertWindow::wm_delete), false); signal_delete_event().connect (sigc::mem_fun (*this, &PortInsertWindow::wm_delete), false);
pi->DropReferences.connect (going_away_connection, invalidator (*this), boost::bind (&PortInsertWindow::plugin_going_away, this), gui_context()); pi->DropReferences.connect (going_away_connection, invalidator (*this), boost::bind (&PortInsertWindow::plugin_going_away, this), gui_context());

12
gtk2_ardour/rc_option_editor.cc
View file

@ -38,6 +38,8 @@
#include "ardour/control_protocol_manager.h" #include "ardour/control_protocol_manager.h"
#include "control_protocol/control_protocol.h" #include "control_protocol/control_protocol.h"
#include "ardour_window.h"
#include "ardour_dialog.h"
#include "gui_thread.h" #include "gui_thread.h"
#include "midi_tracer.h" #include "midi_tracer.h"
#include "rc_option_editor.h" #include "rc_option_editor.h"
@ -56,7 +58,7 @@ using namespace ARDOUR;
class ClickOptions : public OptionEditorBox class ClickOptions : public OptionEditorBox
{ {
public: public:
ClickOptions (RCConfiguration* c, ArdourDialog* p) ClickOptions (RCConfiguration* c, Gtk::Window* p)
: _rc_config (c), : _rc_config (c),
_parent (p) _parent (p)
{ {
@ -149,7 +151,7 @@ private:
} }
RCConfiguration* _rc_config; RCConfiguration* _rc_config;
ArdourDialog* _parent; Gtk::Window* _parent;
Entry _click_path_entry; Entry _click_path_entry;
Entry _click_emphasis_path_entry; Entry _click_emphasis_path_entry;
}; };
@ -657,7 +659,7 @@ private:
class ControlSurfacesOptions : public OptionEditorBox class ControlSurfacesOptions : public OptionEditorBox
{ {
public: public:
ControlSurfacesOptions (ArdourDialog& parent) ControlSurfacesOptions (Gtk::Window& parent)
: _parent (parent) : _parent (parent)
{ {
_store = ListStore::create (_model); _store = ListStore::create (_model);
@ -754,8 +756,8 @@ private:
Box* box = (Box*) cpi->protocol->get_gui (); Box* box = (Box*) cpi->protocol->get_gui ();
if (box) { if (box) {
string title = row[_model.name]; string title = row[_model.name];
ArdourDialog* win = new ArdourDialog (_parent, title); ArdourWindow* win = new ArdourWindow (_parent, title);
win->get_vbox()->pack_start (*box, false, false); win->add (*box);
box->show (); box->show ();
win->present (); win->present ();
row[_model.editor] = win; row[_model.editor] = win;

14
gtk2_ardour/region_layering_order_editor.cc
View file

@ -15,7 +15,7 @@ using namespace Gtk;
using namespace ARDOUR; using namespace ARDOUR;
RegionLayeringOrderEditor::RegionLayeringOrderEditor (PublicEditor& pe) RegionLayeringOrderEditor::RegionLayeringOrderEditor (PublicEditor& pe)
: ArdourDialog (pe, _("RegionLayeringOrderEditor"), false, false) : ArdourWindow (pe, _("RegionLayeringOrderEditor"))
, playlist () , playlist ()
, position () , position ()
, in_row_change (false) , in_row_change (false)
@ -65,9 +65,11 @@ RegionLayeringOrderEditor::RegionLayeringOrderEditor (PublicEditor& pe)
info_table->attach (clock_label, 0, 1, 1, 2, FILL, FILL); info_table->attach (clock_label, 0, 1, 1, 2, FILL, FILL);
info_table->attach (clock, 1, 2, 1, 2, FILL, FILL); info_table->attach (clock, 1, 2, 1, 2, FILL, FILL);
get_vbox()->set_spacing (12); Gtk::VBox* vbox = Gtk::manage (new Gtk::VBox ());
get_vbox()->pack_start (*info_table, false, false); vbox->set_spacing (12);
get_vbox()->pack_start (*scroller_table, true, true); vbox->pack_start (*info_table, false, false);
vbox->pack_start (*scroller_table, true, true);
add (*vbox);
info_table->set_name ("RegionLayeringOrderTable"); info_table->set_name ("RegionLayeringOrderTable");
scroller_table->set_name ("RegionLayeringOrderTable"); scroller_table->set_name ("RegionLayeringOrderTable");
@ -185,7 +187,7 @@ RegionLayeringOrderEditor::on_key_press_event (GdkEventKey* ev)
*/ */
if (ev->keyval == GDK_Return) { if (ev->keyval == GDK_Return) {
handled = ArdourDialog::on_key_press_event (ev); handled = ArdourWindow::on_key_press_event (ev);
} }
if (!handled) { if (!handled) {
@ -193,7 +195,7 @@ RegionLayeringOrderEditor::on_key_press_event (GdkEventKey* ev)
} }
if (!handled) { if (!handled) {
handled = ArdourDialog::on_key_press_event (ev); handled = ArdourWindow::on_key_press_event (ev);
} }
return handled; return handled;

4
gtk2_ardour/region_layering_order_editor.h
View file

@ -9,7 +9,7 @@
#include "ardour/region.h" #include "ardour/region.h"
#include "ardour/playlist.h" #include "ardour/playlist.h"
#include "ardour_dialog.h" #include "ardour_window.h"
#include "audio_clock.h" #include "audio_clock.h"
class PublicEditor; class PublicEditor;
@ -18,7 +18,7 @@ namespace ARDOUR {
class Session; class Session;
} }
class RegionLayeringOrderEditor : public ArdourDialog class RegionLayeringOrderEditor : public ArdourWindow
{ {
public: public:
RegionLayeringOrderEditor (PublicEditor&); RegionLayeringOrderEditor (PublicEditor&);

5
gtk2_ardour/return_ui.cc
View file

@ -101,14 +101,13 @@ ReturnUI::fast_update ()
} }
ReturnUIWindow::ReturnUIWindow (boost::shared_ptr<Return> r, ARDOUR::Session* s) ReturnUIWindow::ReturnUIWindow (boost::shared_ptr<Return> r, ARDOUR::Session* s)
: ArdourDialog (string(_("Return ")) + r->name()) : ArdourWindow (string(_("Return ")) + r->name())
{ {
ui = new ReturnUI (this, r, s); ui = new ReturnUI (this, r, s);
hpacker.pack_start (*ui, true, true); hpacker.pack_start (*ui, true, true);
get_vbox()->set_border_width (5); add (hpacker);
get_vbox()->pack_start (hpacker);
set_name ("ReturnUIWindow"); set_name ("ReturnUIWindow");

4
gtk2_ardour/return_ui.h
View file

@ -22,7 +22,7 @@
#include "gain_meter.h" #include "gain_meter.h"
#include "panner_ui.h" #include "panner_ui.h"
#include "ardour_dialog.h" #include "ardour_window.h"
namespace ARDOUR { namespace ARDOUR {
class Return; class Return;
@ -57,7 +57,7 @@ class ReturnUI : public Gtk::HBox
void ins_changed (ARDOUR::IOChange, void*); void ins_changed (ARDOUR::IOChange, void*);
}; };
class ReturnUIWindow : public ArdourDialog class ReturnUIWindow : public ArdourWindow
{ {
public: public:
ReturnUIWindow(boost::shared_ptr<ARDOUR::Return>, ARDOUR::Session*); ReturnUIWindow(boost::shared_ptr<ARDOUR::Return>, ARDOUR::Session*);

6
gtk2_ardour/route_params_ui.cc
View file

@ -59,7 +59,7 @@ using namespace Gtk;
using namespace Gtkmm2ext; using namespace Gtkmm2ext;
RouteParams_UI::RouteParams_UI () RouteParams_UI::RouteParams_UI ()
: ArdourDialog (_("Tracks and Busses")), : ArdourWindow (_("Tracks and Busses")),
latency_apply_button (Stock::APPLY), latency_apply_button (Stock::APPLY),
track_menu(0) track_menu(0)
{ {
@ -137,7 +137,7 @@ RouteParams_UI::RouteParams_UI ()
//global_vpacker.pack_start (list_hpane, true, true); //global_vpacker.pack_start (list_hpane, true, true);
//get_vbox()->pack_start (global_vpacker); //get_vbox()->pack_start (global_vpacker);
get_vbox()->pack_start (list_hpane); add (list_hpane);
set_name ("RouteParamsWindow"); set_name ("RouteParamsWindow");
@ -394,7 +394,7 @@ RouteParams_UI::route_removed (boost::weak_ptr<Route> wr)
void void
RouteParams_UI::set_session (Session *sess) RouteParams_UI::set_session (Session *sess)
{ {
ArdourDialog::set_session (sess); ArdourWindow::set_session (sess);
route_display_model->clear(); route_display_model->clear();
_plugin_selector->set_session (_session); _plugin_selector->set_session (_session);

4
gtk2_ardour/route_params_ui.h
View file

@ -37,7 +37,7 @@
#include "ardour/ardour.h" #include "ardour/ardour.h"
#include "ardour_dialog.h" #include "ardour_window.h"
#include "processor_box.h" #include "processor_box.h"
#include "route_processor_selection.h" #include "route_processor_selection.h"
#include "latency_gui.h" #include "latency_gui.h"
@ -55,7 +55,7 @@ namespace ARDOUR {
class PluginSelector; class PluginSelector;
class IOSelector; class IOSelector;
class RouteParams_UI : public ArdourDialog, public PBD::ScopedConnectionList class RouteParams_UI : public ArdourWindow, public PBD::ScopedConnectionList
{ {
public: public:
RouteParams_UI (); RouteParams_UI ();

5
gtk2_ardour/send_ui.cc
View file

@ -117,14 +117,13 @@ SendUI::fast_update ()
} }
SendUIWindow::SendUIWindow (boost::shared_ptr<Send> s, Session* session) SendUIWindow::SendUIWindow (boost::shared_ptr<Send> s, Session* session)
: ArdourDialog (string (_("Send ")) + s->name()) : ArdourWindow (string (_("Send ")) + s->name())
{ {
ui = new SendUI (this, s, session); ui = new SendUI (this, s, session);
hpacker.pack_start (*ui, true, true); hpacker.pack_start (*ui, true, true);
get_vbox()->set_border_width (5); add (hpacker);
get_vbox()->pack_start (hpacker);
set_name ("SendUIWindow"); set_name ("SendUIWindow");

4
gtk2_ardour/send_ui.h
View file

@ -22,7 +22,7 @@
#include "gain_meter.h" #include "gain_meter.h"
#include "panner_ui.h" #include "panner_ui.h"
#include "ardour_dialog.h" #include "ardour_window.h"
namespace ARDOUR { namespace ARDOUR {
class Send; class Send;
@ -58,7 +58,7 @@ class SendUI : public Gtk::HBox
PBD::ScopedConnectionList connections; PBD::ScopedConnectionList connections;
}; };
class SendUIWindow : public ArdourDialog class SendUIWindow : public ArdourWindow
{ {
public: public:
SendUIWindow(boost::shared_ptr<ARDOUR::Send>, ARDOUR::Session*); SendUIWindow(boost::shared_ptr<ARDOUR::Send>, ARDOUR::Session*);

10
gtk2_ardour/speaker_dialog.cc
View file

@ -33,7 +33,7 @@ using namespace Gtk;
using namespace Gtkmm2ext; using namespace Gtkmm2ext;
SpeakerDialog::SpeakerDialog () SpeakerDialog::SpeakerDialog ()
: ArdourDialog (_("Speaker Configuration")) : ArdourWindow (_("Speaker Configuration"))
, aspect_frame ("", 0.5, 0.5, 1.0, false) , aspect_frame ("", 0.5, 0.5, 1.0, false)
, azimuth_adjustment (0, 0.0, 360.0, 10.0, 1.0) , azimuth_adjustment (0, 0.0, 360.0, 10.0, 1.0)
, azimuth_spinner (azimuth_adjustment) , azimuth_spinner (azimuth_adjustment)
@ -64,9 +64,11 @@ SpeakerDialog::SpeakerDialog ()
current_speaker_hbox->pack_start (azimuth_spinner, true, true); current_speaker_hbox->pack_start (azimuth_spinner, true, true);
current_speaker_hbox->pack_start (remove_speaker_button, true, true); current_speaker_hbox->pack_start (remove_speaker_button, true, true);
get_vbox()->pack_start (hbox); VBox* vbox = manage (new VBox);
get_vbox()->pack_start (*current_speaker_hbox, true, true); vbox->pack_start (hbox);
get_vbox()->show_all (); vbox->pack_start (*current_speaker_hbox, true, true);
vbox->show_all ();
add (*vbox);
darea.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::POINTER_MOTION_MASK); darea.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::POINTER_MOTION_MASK);

4
gtk2_ardour/speaker_dialog.h
View file

@ -28,9 +28,9 @@
#include "ardour/speakers.h" #include "ardour/speakers.h"
#include "ardour_dialog.h" #include "ardour_window.h"
class SpeakerDialog : public ArdourDialog class SpeakerDialog : public ArdourWindow
{ {
public: public:
SpeakerDialog (); SpeakerDialog ();

6
gtk2_ardour/step_entry.cc
View file

@ -57,7 +57,7 @@ _rest_event_handler (GtkWidget* /*widget*/, gpointer arg)
} }
StepEntry::StepEntry (StepEditor& seditor) StepEntry::StepEntry (StepEditor& seditor)
: ArdourDialog (string_compose (_("Step Entry: %1"), seditor.name())) : ArdourWindow (string_compose (_("Step Entry: %1"), seditor.name()))
, _current_note_length (1.0) , _current_note_length (1.0)
, _current_note_velocity (64) , _current_note_velocity (64)
, triplet_button ("3") , triplet_button ("3")
@ -458,7 +458,7 @@ StepEntry::StepEntry (StepEditor& seditor)
packer.pack_start (*piano, false, false); packer.pack_start (*piano, false, false);
packer.show_all (); packer.show_all ();
get_vbox()->add (packer); add (packer);
/* initial settings: quarter note and mezzo forte */ /* initial settings: quarter note and mezzo forte */
@ -574,7 +574,7 @@ StepEntry::note_off_event_handler (int note)
void void
StepEntry::on_show () StepEntry::on_show ()
{ {
ArdourDialog::on_show (); ArdourWindow::on_show ();
//piano->grab_focus (); //piano->grab_focus ();
} }

4
gtk2_ardour/step_entry.h
View file

@ -27,12 +27,12 @@
#include <gtkmm/adjustment.h> #include <gtkmm/adjustment.h>
#include <gtkmm2ext/bindings.h> #include <gtkmm2ext/bindings.h>
#include "ardour_dialog.h" #include "ardour_window.h"
#include "gtk_pianokeyboard.h" #include "gtk_pianokeyboard.h"
class StepEditor; class StepEditor;
class StepEntry : public ArdourDialog class StepEntry : public ArdourWindow
{ {
public: public:
StepEntry (StepEditor&); StepEntry (StepEditor&);

12
gtk2_ardour/theme_manager.cc
View file

@ -49,7 +49,7 @@ sigc::signal<void> ColorsChanged;
sigc::signal<void,uint32_t> ColorChanged; sigc::signal<void,uint32_t> ColorChanged;
ThemeManager::ThemeManager() ThemeManager::ThemeManager()
: ArdourDialog (_("Theme Manager")), : ArdourWindow (_("Theme Manager")),
dark_button (_("Dark Theme")), dark_button (_("Dark Theme")),
light_button (_("Light Theme")), light_button (_("Light Theme")),
reset_button (_("Restore Defaults")) reset_button (_("Restore Defaults"))
@ -79,10 +79,12 @@ ThemeManager::ThemeManager()
theme_selection_hbox.pack_start (dark_button); theme_selection_hbox.pack_start (dark_button);
theme_selection_hbox.pack_start (light_button); theme_selection_hbox.pack_start (light_button);
get_vbox()->set_homogeneous(false); Gtk::VBox* vbox = Gtk::manage (new Gtk::VBox ());
get_vbox()->pack_start (theme_selection_hbox, PACK_SHRINK); vbox->set_homogeneous (false);
get_vbox()->pack_start (reset_button, PACK_SHRINK); vbox->pack_start (theme_selection_hbox, PACK_SHRINK);
get_vbox()->pack_start (scroller); vbox->pack_start (reset_button, PACK_SHRINK);
vbox->pack_start (scroller);
add (*vbox);
color_display.signal_button_press_event().connect (sigc::mem_fun (*this, &ThemeManager::button_press_event), false); color_display.signal_button_press_event().connect (sigc::mem_fun (*this, &ThemeManager::button_press_event), false);

4
gtk2_ardour/theme_manager.h
View file

@ -27,10 +27,10 @@
#include <gtkmm/radiobutton.h> #include <gtkmm/radiobutton.h>
#include <gtkmm/button.h> #include <gtkmm/button.h>
#include <gtkmm/rc.h> #include <gtkmm/rc.h>
#include "ardour_dialog.h" #include "ardour_window.h"
#include "ui_config.h" #include "ui_config.h"
class ThemeManager : public ArdourDialog class ThemeManager : public ArdourWindow
{ {
public: public:
ThemeManager(); ThemeManager();