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

Move more Gtkmm2ext widgets into libwidget

Browse source
This commit is contained in:
Robin Gareus 2017-07-17 04:55:52 +02:00
parent b5e9451bc7
commit f9e5e4360e
78 changed files with 428 additions and 443 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gtk2_ardour/ardour_ui.cc
View file

@ -74,7 +74,6 @@
#include "gtkmm2ext/bindings.h" #include "gtkmm2ext/bindings.h"
#include "gtkmm2ext/gtk_ui.h" #include "gtkmm2ext/gtk_ui.h"
#include "gtkmm2ext/utils.h" #include "gtkmm2ext/utils.h"
#include "gtkmm2ext/popup.h"
#include "gtkmm2ext/window_title.h" #include "gtkmm2ext/window_title.h"
#include "widgets/fastmeter.h" #include "widgets/fastmeter.h"

18
gtk2_ardour/ardour_ui.h
View file

@ -47,6 +47,8 @@
#include <gtkmm/eventbox.h> #include <gtkmm/eventbox.h>
#include <gtkmm/menu.h> #include <gtkmm/menu.h>
#include <gtkmm/menuitem.h> #include <gtkmm/menuitem.h>
#include <gtkmm/messagedialog.h>
#include <gtkmm/notebook.h>
#include <gtkmm/button.h> #include <gtkmm/button.h>
#include <gtkmm/togglebutton.h> #include <gtkmm/togglebutton.h>
#include <gtkmm/treeview.h> #include <gtkmm/treeview.h>
@ -151,7 +153,7 @@ namespace Gtk {
class ProgressBar; class ProgressBar;
} }
namespace Gtkmm2ext { namespace ArdourWidgets {
class Tabbable; class Tabbable;
} }
@ -414,15 +416,15 @@ private:
bool _initial_verbose_plugin_scan; bool _initial_verbose_plugin_scan;
bool first_time_engine_run; bool first_time_engine_run;
void show_tabbable (Gtkmm2ext::Tabbable*); void show_tabbable (ArdourWidgets::Tabbable*);
void hide_tabbable (Gtkmm2ext::Tabbable*); void hide_tabbable (ArdourWidgets::Tabbable*);
void detach_tabbable (Gtkmm2ext::Tabbable*); void detach_tabbable (ArdourWidgets::Tabbable*);
void attach_tabbable (Gtkmm2ext::Tabbable*); void attach_tabbable (ArdourWidgets::Tabbable*);
void button_change_tabbable_visibility (Gtkmm2ext::Tabbable*); void button_change_tabbable_visibility (ArdourWidgets::Tabbable*);
void key_change_tabbable_visibility (Gtkmm2ext::Tabbable*); void key_change_tabbable_visibility (ArdourWidgets::Tabbable*);
void toggle_editor_and_mixer (); void toggle_editor_and_mixer ();
void tabbable_state_change (Gtkmm2ext::Tabbable&); void tabbable_state_change (ArdourWidgets::Tabbable&);
void toggle_meterbridge (); void toggle_meterbridge ();
void toggle_luawindow (); void toggle_luawindow ();

2
gtk2_ardour/ardour_ui_dependents.cc
View file

@ -153,7 +153,7 @@ ARDOUR_UI::tab_window_root_drop (GtkNotebook* src,
using namespace std; using namespace std;
Gtk::Notebook* nb = 0; Gtk::Notebook* nb = 0;
Gtk::Window* win = 0; Gtk::Window* win = 0;
Gtkmm2ext::Tabbable* tabbable = 0; ArdourWidgets::Tabbable* tabbable = 0;
if (w == GTK_WIDGET(editor->contents().gobj())) { if (w == GTK_WIDGET(editor->contents().gobj())) {

11
gtk2_ardour/ardour_ui_ed.cc
View file

@ -33,15 +33,16 @@
#include <gtkmm/accelmap.h> #include <gtkmm/accelmap.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "gtkmm2ext/cairo_packer.h"
#include "gtkmm2ext/tearoff.h"
#include "gtkmm2ext/utils.h"
#include "gtkmm2ext/window_title.h"
#include "pbd/file_utils.h" #include "pbd/file_utils.h"
#include "pbd/fpu.h" #include "pbd/fpu.h"
#include "pbd/convert.h" #include "pbd/convert.h"
#include "gtkmm2ext/cairo_packer.h"
#include "gtkmm2ext/utils.h"
#include "gtkmm2ext/window_title.h"
#include "widgets/tearoff.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "public_editor.h" #include "public_editor.h"
#include "audio_clock.h" #include "audio_clock.h"

7
gtk2_ardour/editor.cc
View file

@ -57,12 +57,10 @@
#include <gtkmm/menuitem.h> #include <gtkmm/menuitem.h>
#include "gtkmm2ext/bindings.h" #include "gtkmm2ext/bindings.h"
#include "gtkmm2ext/eventboxext.h"
#include "gtkmm2ext/gtk_ui.h" #include "gtkmm2ext/gtk_ui.h"
#include "gtkmm2ext/keyboard.h" #include "gtkmm2ext/keyboard.h"
#include "gtkmm2ext/utils.h" #include "gtkmm2ext/utils.h"
#include "gtkmm2ext/window_title.h" #include "gtkmm2ext/window_title.h"
#include "gtkmm2ext/choice.h"
#include "gtkmm2ext/cell_renderer_pixbuf_toggle.h" #include "gtkmm2ext/cell_renderer_pixbuf_toggle.h"
#include "ardour/analysis_graph.h" #include "ardour/analysis_graph.h"
@ -84,6 +82,7 @@
#include "canvas/text.h" #include "canvas/text.h"
#include "widgets/ardour_spacer.h" #include "widgets/ardour_spacer.h"
#include "widgets/eventboxext.h"
#include "widgets/tooltips.h" #include "widgets/tooltips.h"
#include "control_protocol/control_protocol.h" #include "control_protocol/control_protocol.h"
@ -761,11 +760,11 @@ Editor::Editor ()
ebox->set_name("EditorWindow"); ebox->set_name("EditorWindow");
ebox->add (toolbar_hbox); ebox->add (toolbar_hbox);
Gtk::EventBox* epane_box = manage (new Gtkmm2ext::EventBoxExt); //a themeable box Gtk::EventBox* epane_box = manage (new EventBoxExt); //a themeable box
epane_box->set_name("EditorWindow"); epane_box->set_name("EditorWindow");
epane_box->add (edit_pane); epane_box->add (edit_pane);
Gtk::EventBox* epane_box2 = manage (new Gtkmm2ext::EventBoxExt); //a themeable box Gtk::EventBox* epane_box2 = manage (new EventBoxExt); //a themeable box
epane_box2->set_name("EditorWindow"); epane_box2->set_name("EditorWindow");
epane_box2->add (global_vpacker); epane_box2->add (global_vpacker);

6
gtk2_ardour/editor.h
View file

@ -36,7 +36,6 @@
#include "gtkmm2ext/bindings.h" #include "gtkmm2ext/bindings.h"
#include "gtkmm2ext/dndtreeview.h" #include "gtkmm2ext/dndtreeview.h"
#include "gtkmm2ext/pane.h"
#include "pbd/stateful.h" #include "pbd/stateful.h"
#include "pbd/signals.h" #include "pbd/signals.h"
@ -51,6 +50,7 @@
#include "widgets/ardour_button.h" #include "widgets/ardour_button.h"
#include "widgets/ardour_dropdown.h" #include "widgets/ardour_dropdown.h"
#include "widgets/pane.h"
#include "ardour_dialog.h" #include "ardour_dialog.h"
#include "public_editor.h" #include "public_editor.h"
@ -635,8 +635,8 @@ private:
void add_notebook_page (std::string const &, Gtk::Widget &); void add_notebook_page (std::string const &, Gtk::Widget &);
bool notebook_tab_clicked (GdkEventButton *, Gtk::Widget *); bool notebook_tab_clicked (GdkEventButton *, Gtk::Widget *);
Gtkmm2ext::HPane edit_pane; ArdourWidgets::HPane edit_pane;
Gtkmm2ext::VPane editor_summary_pane; ArdourWidgets::VPane editor_summary_pane;
Gtk::EventBox meter_base; Gtk::EventBox meter_base;
Gtk::HBox meter_box; Gtk::HBox meter_box;

14
gtk2_ardour/editor_actions.cc
View file

@ -483,38 +483,38 @@ Editor::register_actions ()
act = myactions.register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-object", _("Object Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseObject)); act = myactions.register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-object", _("Object Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseObject));
mouse_move_button.set_related_action (act); mouse_move_button.set_related_action (act);
mouse_move_button.set_icon (Gtkmm2ext::ArdourIcon::ToolGrab); mouse_move_button.set_icon (ArdourWidgets::ArdourIcon::ToolGrab);
mouse_move_button.set_name ("mouse mode button"); mouse_move_button.set_name ("mouse mode button");
act = myactions.register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-range", _("Range Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseRange)); act = myactions.register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-range", _("Range Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseRange));
mouse_select_button.set_related_action (act); mouse_select_button.set_related_action (act);
mouse_select_button.set_icon (Gtkmm2ext::ArdourIcon::ToolRange); mouse_select_button.set_icon (ArdourWidgets::ArdourIcon::ToolRange);
mouse_select_button.set_name ("mouse mode button"); mouse_select_button.set_name ("mouse mode button");
act = myactions.register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-draw", _("Note Drawing Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseDraw)); act = myactions.register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-draw", _("Note Drawing Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseDraw));
mouse_draw_button.set_related_action (act); mouse_draw_button.set_related_action (act);
mouse_draw_button.set_icon (Gtkmm2ext::ArdourIcon::ToolDraw); mouse_draw_button.set_icon (ArdourWidgets::ArdourIcon::ToolDraw);
mouse_draw_button.set_name ("mouse mode button"); mouse_draw_button.set_name ("mouse mode button");
act = myactions.register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-audition", _("Audition Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseAudition)); act = myactions.register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-audition", _("Audition Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseAudition));
mouse_audition_button.set_related_action (act); mouse_audition_button.set_related_action (act);
mouse_audition_button.set_icon (Gtkmm2ext::ArdourIcon::ToolAudition); mouse_audition_button.set_icon (ArdourWidgets::ArdourIcon::ToolAudition);
mouse_audition_button.set_name ("mouse mode button"); mouse_audition_button.set_name ("mouse mode button");
act = myactions.register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-timefx", _("Time FX Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseTimeFX)); act = myactions.register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-timefx", _("Time FX Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseTimeFX));
mouse_timefx_button.set_related_action (act); mouse_timefx_button.set_related_action (act);
mouse_timefx_button.set_icon (Gtkmm2ext::ArdourIcon::ToolStretch); mouse_timefx_button.set_icon (ArdourWidgets::ArdourIcon::ToolStretch);
mouse_timefx_button.set_name ("mouse mode button"); mouse_timefx_button.set_name ("mouse mode button");
act = myactions.register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-content", _("Content Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseContent)); act = myactions.register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-content", _("Content Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseContent));
mouse_content_button.set_related_action (act); mouse_content_button.set_related_action (act);
mouse_content_button.set_icon (Gtkmm2ext::ArdourIcon::ToolContent); mouse_content_button.set_icon (ArdourWidgets::ArdourIcon::ToolContent);
mouse_content_button.set_name ("mouse mode button"); mouse_content_button.set_name ("mouse mode button");
if(!Profile->get_mixbus()) { if(!Profile->get_mixbus()) {
act = myactions.register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-cut", _("Cut Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseCut)); act = myactions.register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-cut", _("Cut Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseCut));
mouse_cut_button.set_related_action (act); mouse_cut_button.set_related_action (act);
mouse_cut_button.set_icon (Gtkmm2ext::ArdourIcon::ToolCut); mouse_cut_button.set_icon (ArdourWidgets::ArdourIcon::ToolCut);
mouse_cut_button.set_name ("mouse mode button"); mouse_cut_button.set_name ("mouse mode button");
} }

6
gtk2_ardour/editor_audio_import.cc
View file

@ -31,7 +31,7 @@
#include "pbd/shortpath.h" #include "pbd/shortpath.h"
#include "pbd/stateful_diff_command.h" #include "pbd/stateful_diff_command.h"
#include <gtkmm2ext/choice.h> #include "widgets/choice.h"
#include "ardour/audio_track.h" #include "ardour/audio_track.h"
#include "ardour/audiofilesource.h" #include "ardour/audiofilesource.h"
@ -651,7 +651,7 @@ Editor::embed_sndfiles (vector<string> paths,
choices.push_back (_("Don't embed it")); choices.push_back (_("Don't embed it"));
choices.push_back (_("Embed all without questions")); choices.push_back (_("Embed all without questions"));
Gtkmm2ext::Choice rate_choice ( ArdourWidgets::Choice rate_choice (
_("Sample rate"), _("Sample rate"),
string_compose (_("%1\nThis audiofile's sample rate doesn't match the session sample rate!"), string_compose (_("%1\nThis audiofile's sample rate doesn't match the session sample rate!"),
short_path (path, 40)), short_path (path, 40)),
@ -677,7 +677,7 @@ Editor::embed_sndfiles (vector<string> paths,
choices.push_back (_("Cancel")); choices.push_back (_("Cancel"));
choices.push_back (_("Embed it anyway")); choices.push_back (_("Embed it anyway"));
Gtkmm2ext::Choice rate_choice ( ArdourWidgets::Choice rate_choice (
_("Sample rate"), _("Sample rate"),
string_compose (_("%1\nThis audiofile's sample rate doesn't match the session sample rate!"), path), string_compose (_("%1\nThis audiofile's sample rate doesn't match the session sample rate!"), path),
choices, false choices, false

2
gtk2_ardour/editor_export_audio.cc
View file

@ -27,8 +27,6 @@
#include "pbd/gstdio_compat.h" #include "pbd/gstdio_compat.h"
#include "gtkmm2ext/choice.h"
#include "pbd/pthread_utils.h" #include "pbd/pthread_utils.h"
#include "ardour/audio_track.h" #include "ardour/audio_track.h"

9
gtk2_ardour/editor_ops.cc
View file

@ -36,9 +36,10 @@
#include "pbd/whitespace.h" #include "pbd/whitespace.h"
#include "pbd/stateful_diff_command.h" #include "pbd/stateful_diff_command.h"
#include <gtkmm2ext/utils.h> #include "gtkmm2ext/utils.h"
#include <gtkmm2ext/choice.h>
#include <gtkmm2ext/popup.h> #include "widgets/choice.h"
#include "widgets/popup.h"
#include "ardour/audio_track.h" #include "ardour/audio_track.h"
#include "ardour/audioregion.h" #include "ardour/audioregion.h"
@ -5047,7 +5048,7 @@ Editor::remove_last_capture ()
choices.push_back (_("No, do nothing.")); choices.push_back (_("No, do nothing."));
choices.push_back (_("Yes, destroy it.")); choices.push_back (_("Yes, destroy it."));
Gtkmm2ext::Choice prompter (_("Destroy last capture"), prompt, choices); Choice prompter (_("Destroy last capture"), prompt, choices);
if (prompter.run () == 1) { if (prompter.run () == 1) {
_session->remove_last_capture (); _session->remove_last_capture ();

2
gtk2_ardour/editor_pt_import.cc
View file

@ -29,8 +29,6 @@
#include "pbd/shortpath.h" #include "pbd/shortpath.h"
#include "pbd/stateful_diff_command.h" #include "pbd/stateful_diff_command.h"
#include <gtkmm2ext/choice.h>
#include "ardour/audio_track.h" #include "ardour/audio_track.h"
#include "ardour/audiofilesource.h" #include "ardour/audiofilesource.h"
#include "ardour/audioregion.h" #include "ardour/audioregion.h"

4
gtk2_ardour/editor_regions.cc
View file

@ -33,10 +33,10 @@
#include "ardour/session.h" #include "ardour/session.h"
#include "ardour/profile.h" #include "ardour/profile.h"
#include "gtkmm2ext/choice.h"
#include "gtkmm2ext/treeutils.h" #include "gtkmm2ext/treeutils.h"
#include "gtkmm2ext/utils.h" #include "gtkmm2ext/utils.h"
#include "widgets/choice.h"
#include "widgets/tooltips.h" #include "widgets/tooltips.h"
#include "audio_clock.h" #include "audio_clock.h"
@ -503,7 +503,7 @@ EditorRegions::remove_unused_regions ()
choices.push_back (_("No, do nothing.")); choices.push_back (_("No, do nothing."));
choices.push_back (_("Yes, remove.")); choices.push_back (_("Yes, remove."));
Gtkmm2ext::Choice prompter (_("Remove unused regions"), prompt, choices); ArdourWidgets::Choice prompter (_("Remove unused regions"), prompt, choices);
if (prompter.run () == 1) { if (prompter.run () == 1) {
_no_redisplay = true; _no_redisplay = true;

6
gtk2_ardour/editor_snapshots.cc
View file

@ -26,13 +26,13 @@
#include <gtkmm/liststore.h> #include <gtkmm/liststore.h>
#include "gtkmm2ext/choice.h"
#include "ardour/filename_extensions.h" #include "ardour/filename_extensions.h"
#include "ardour/session.h" #include "ardour/session.h"
#include "ardour/session_state_utils.h" #include "ardour/session_state_utils.h"
#include "ardour/session_directory.h" #include "ardour/session_directory.h"
#include "widgets/choice.h"
#include "editor_snapshots.h" #include "editor_snapshots.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "pbd/i18n.h" #include "pbd/i18n.h"
@ -173,7 +173,7 @@ EditorSnapshots::remove (std::string name)
choices.push_back (_("No, do nothing.")); choices.push_back (_("No, do nothing."));
choices.push_back (_("Yes, remove it.")); choices.push_back (_("Yes, remove it."));
Gtkmm2ext::Choice prompter (_("Remove snapshot"), prompt, choices); ArdourWidgets::Choice prompter (_("Remove snapshot"), prompt, choices);
if (prompter.run () == 1) { if (prompter.run () == 1) {
_session->remove_state (name); _session->remove_state (name);

13
gtk2_ardour/engine_dialog.h
View file

@ -24,14 +24,15 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include <gtkmm/checkbutton.h>
#include <gtkmm/spinbutton.h>
#include <gtkmm/comboboxtext.h>
#include <gtkmm/table.h>
#include <gtkmm/expander.h>
#include <gtkmm/box.h> #include <gtkmm/box.h>
#include <gtkmm/buttonbox.h>
#include <gtkmm/button.h> #include <gtkmm/button.h>
#include <gtkmm/buttonbox.h>
#include <gtkmm/comboboxtext.h>
#include <gtkmm/checkbutton.h>
#include <gtkmm/expander.h>
#include <gtkmm/notebook.h>
#include <gtkmm/spinbutton.h>
#include <gtkmm/table.h>
#include "pbd/signals.h" #include "pbd/signals.h"

4
gtk2_ardour/enums.cc
View file

@ -19,7 +19,7 @@
#include "pbd/enumwriter.h" #include "pbd/enumwriter.h"
#include "gtkmm2ext/ardour_icon.h" #include "widgets/ardour_icon.h"
#include "audio_clock.h" #include "audio_clock.h"
#include "editing.h" #include "editing.h"
@ -30,7 +30,7 @@ using namespace std;
using namespace PBD; using namespace PBD;
using namespace ARDOUR; using namespace ARDOUR;
using namespace Editing; using namespace Editing;
using namespace Gtkmm2ext; using namespace ArdourWidgets;
void void
setup_gtk_ardour_enums () setup_gtk_ardour_enums ()

4
gtk2_ardour/location_ui.h
View file

@ -33,8 +33,8 @@
#include "ardour/location.h" #include "ardour/location.h"
#include "ardour/session_handle.h" #include "ardour/session_handle.h"
#include "gtkmm2ext/pane.h"
#include "widgets/ardour_button.h" #include "widgets/ardour_button.h"
#include "widgets/pane.h"
#include "ardour_window.h" #include "ardour_window.h"
#include "audio_clock.h" #include "audio_clock.h"
@ -180,7 +180,7 @@ private:
LocationEditRow punch_edit_row; LocationEditRow punch_edit_row;
Gtk::VBox loop_punch_box; Gtk::VBox loop_punch_box;
Gtkmm2ext::VPane loc_range_panes; ArdourWidgets::VPane loc_range_panes;
Gtk::VBox loc_frame_box; Gtk::VBox loc_frame_box;
Gtk::Button add_location_button; Gtk::Button add_location_button;

4
gtk2_ardour/luawindow.cc
View file

@ -34,10 +34,10 @@
#include "pbd/md5.h" #include "pbd/md5.h"
#include "gtkmm2ext/gtk_ui.h" #include "gtkmm2ext/gtk_ui.h"
#include "gtkmm2ext/pane.h"
#include "gtkmm2ext/utils.h" #include "gtkmm2ext/utils.h"
#include "gtkmm2ext/window_title.h" #include "gtkmm2ext/window_title.h"
#include "widgets/pane.h"
#include "widgets/tooltips.h" #include "widgets/tooltips.h"
#include "ardour/filesystem_paths.h" #include "ardour/filesystem_paths.h"
@ -156,7 +156,7 @@ LuaWindow::LuaWindow ()
vbox->pack_start (*scrollin, true, true, 0); vbox->pack_start (*scrollin, true, true, 0);
vbox->pack_start (*hbox, false, false, 2); vbox->pack_start (*hbox, false, false, 2);
Gtkmm2ext::VPane *vpane = manage (new Gtkmm2ext::VPane ()); ArdourWidgets::VPane *vpane = manage (new ArdourWidgets::VPane ());
vpane->add (*vbox); vpane->add (*vbox);
vpane->add (scrollout); vpane->add (scrollout);
vpane->set_divider (0, 0.75); vpane->set_divider (0, 0.75);

1
gtk2_ardour/luawindow.h
View file

@ -24,6 +24,7 @@
#include <gtkmm/box.h> #include <gtkmm/box.h>
#include <gtkmm/scrolledwindow.h> #include <gtkmm/scrolledwindow.h>
#include <gtkmm/label.h> #include <gtkmm/label.h>
#include <gtkmm/textview.h>
#include <gtkmm/window.h> #include <gtkmm/window.h>
#include "pbd/signals.h" #include "pbd/signals.h"

3
gtk2_ardour/main.cc
View file

@ -48,8 +48,9 @@
#include "ardour/filesystem_paths.h" #include "ardour/filesystem_paths.h"
#include <gtkmm/main.h> #include <gtkmm/main.h>
#include <gtkmm/stock.h>
#include <gtkmm2ext/application.h> #include <gtkmm2ext/application.h>
#include <gtkmm2ext/popup.h>
#include <gtkmm2ext/utils.h> #include <gtkmm2ext/utils.h>
#include "ardour_ui.h" #include "ardour_ui.h"

4
gtk2_ardour/midi_channel_selector.h
View file

@ -30,7 +30,7 @@
#include "gtkmm/radiobutton.h" #include "gtkmm/radiobutton.h"
#include "gtkmm/label.h" #include "gtkmm/label.h"
#include "gtkmm2ext/stateful_button.h" #include "widgets/stateful_button.h"
#include "ardour/types.h" #include "ardour/types.h"
@ -54,7 +54,7 @@ public:
protected: protected:
virtual void button_toggled(Gtk::ToggleButton* button, uint8_t button_nr) = 0; virtual void button_toggled(Gtk::ToggleButton* button, uint8_t button_nr) = 0;
Gtk::Label _button_labels[4][4]; Gtk::Label _button_labels[4][4];
Gtkmm2ext::StatefulToggleButton _buttons[4][4]; ArdourWidgets::StatefulToggleButton _buttons[4][4];
int _recursion_counter; int _recursion_counter;
bool was_clicked (GdkEventButton*); bool was_clicked (GdkEventButton*);

3
gtk2_ardour/midi_scroomer.cc
View file

@ -22,14 +22,13 @@
#include "midi_scroomer.h" #include "midi_scroomer.h"
#include "ui_config.h" #include "ui_config.h"
using namespace Gtkmm2ext;
using namespace Gtk; using namespace Gtk;
using namespace std; using namespace std;
//std::map<int, Glib::RefPtr<Gdk::Pixmap> > MidiScroomer::piano_pixmaps; //std::map<int, Glib::RefPtr<Gdk::Pixmap> > MidiScroomer::piano_pixmaps;
MidiScroomer::MidiScroomer(Adjustment& adj) MidiScroomer::MidiScroomer(Adjustment& adj)
: Gtkmm2ext::Scroomer(adj) : ArdourWidgets::Scroomer(adj)
{ {
adj.set_lower(0); adj.set_lower(0);

5
gtk2_ardour/midi_scroomer.h
View file

@ -20,10 +20,9 @@
#ifndef __ardour_midi_scroomer_h__ #ifndef __ardour_midi_scroomer_h__
#define __ardour_midi_scroomer_h__ #define __ardour_midi_scroomer_h__
#include <gtkmm2ext/scroomer.h> #include "widgets/scroomer.h"
#include <gdkmm/pixbuf.h>
class MidiScroomer : public Gtkmm2ext::Scroomer class MidiScroomer : public ArdourWidgets::Scroomer
{ {
public: public:
MidiScroomer(Gtk::Adjustment&); MidiScroomer(Gtk::Adjustment&);

1
gtk2_ardour/mixer_strip.cc
View file

@ -30,7 +30,6 @@
#include "gtkmm2ext/gtk_ui.h" #include "gtkmm2ext/gtk_ui.h"
#include "gtkmm2ext/menu_elems.h" #include "gtkmm2ext/menu_elems.h"
#include "gtkmm2ext/utils.h" #include "gtkmm2ext/utils.h"
#include "gtkmm2ext/choice.h"
#include "gtkmm2ext/doi.h" #include "gtkmm2ext/doi.h"
#include "widgets/tooltips.h" #include "widgets/tooltips.h"

17
gtk2_ardour/mixer_ui.cc
View file

@ -33,15 +33,6 @@
#include "pbd/stacktrace.h" #include "pbd/stacktrace.h"
#include "pbd/unwind.h" #include "pbd/unwind.h"
#include <glibmm/threads.h>
#include <gtkmm2ext/gtk_ui.h>
#include <gtkmm2ext/keyboard.h>
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/tearoff.h>
#include <gtkmm2ext/window_title.h>
#include <gtkmm2ext/doi.h>
#include "ardour/amp.h" #include "ardour/amp.h"
#include "ardour/debug.h" #include "ardour/debug.h"
#include "ardour/audio_track.h" #include "ardour/audio_track.h"
@ -53,6 +44,14 @@
#include "ardour/vca.h" #include "ardour/vca.h"
#include "ardour/vca_manager.h" #include "ardour/vca_manager.h"
#include "gtkmm2ext/gtk_ui.h"
#include "gtkmm2ext/keyboard.h"
#include "gtkmm2ext/utils.h"
#include "gtkmm2ext/window_title.h"
#include "gtkmm2ext/doi.h"
#include "widgets/tearoff.h"
#include "keyboard.h" #include "keyboard.h"
#include "mixer_ui.h" #include "mixer_ui.h"
#include "mixer_strip.h" #include "mixer_strip.h"

16
gtk2_ardour/mixer_ui.h
View file

@ -30,6 +30,7 @@
#include <gtkmm/frame.h> #include <gtkmm/frame.h>
#include <gtkmm/menu.h> #include <gtkmm/menu.h>
#include <gtkmm/treeview.h> #include <gtkmm/treeview.h>
#include <gtkmm/treestore.h>
#include <gtkmm/liststore.h> #include <gtkmm/liststore.h>
#include "pbd/stateful.h" #include "pbd/stateful.h"
@ -43,10 +44,11 @@
#include <gtkmm2ext/bindings.h> #include <gtkmm2ext/bindings.h>
#include "gtkmm2ext/dndtreeview.h" #include "gtkmm2ext/dndtreeview.h"
#include <gtkmm2ext/pane.h>
#include "gtkmm2ext/tabbable.h"
#include "gtkmm2ext/treeutils.h" #include "gtkmm2ext/treeutils.h"
#include "widgets/pane.h"
#include "widgets/tabbable.h"
#include "axis_provider.h" #include "axis_provider.h"
#include "enums.h" #include "enums.h"
#include "route_processor_selection.h" #include "route_processor_selection.h"
@ -77,7 +79,7 @@ protected:
virtual bool row_drop_possible_vfunc (const Gtk::TreeModel::Path&, const Gtk::SelectionData&) const; virtual bool row_drop_possible_vfunc (const Gtk::TreeModel::Path&, const Gtk::SelectionData&) const;
}; };
class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr, public AxisViewProvider class Mixer_UI : public ArdourWidgets::Tabbable, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr, public AxisViewProvider
{ {
public: public:
static Mixer_UI* instance(); static Mixer_UI* instance();
@ -152,9 +154,9 @@ private:
Gtk::Frame track_display_frame; Gtk::Frame track_display_frame;
Gtk::Frame group_display_frame; Gtk::Frame group_display_frame;
Gtk::Frame favorite_plugins_frame; Gtk::Frame favorite_plugins_frame;
Gtkmm2ext::VPane rhs_pane1; ArdourWidgets::VPane rhs_pane1;
Gtkmm2ext::VPane rhs_pane2; ArdourWidgets::VPane rhs_pane2;
Gtkmm2ext::HPane inner_pane; ArdourWidgets::HPane inner_pane;
Gtk::HBox strip_packer; Gtk::HBox strip_packer;
Gtk::ScrolledWindow vca_scroller; Gtk::ScrolledWindow vca_scroller;
Gtk::HBox vca_hpacker; Gtk::HBox vca_hpacker;
@ -163,7 +165,7 @@ private:
Gtk::Label vca_label; Gtk::Label vca_label;
Gtk::EventBox vca_scroller_base; Gtk::EventBox vca_scroller_base;
Gtk::HBox out_packer; Gtk::HBox out_packer;
Gtkmm2ext::HPane list_hpane; ArdourWidgets::HPane list_hpane;
MixerGroupTabs* _group_tabs; MixerGroupTabs* _group_tabs;

2
gtk2_ardour/monitor_section.cc
View file

@ -23,13 +23,13 @@
#include "pbd/error.h" #include "pbd/error.h"
#include "pbd/replace_all.h" #include "pbd/replace_all.h"
#include "gtkmm2ext/tearoff.h"
#include "gtkmm2ext/actions.h" #include "gtkmm2ext/actions.h"
#include "gtkmm2ext/utils.h" #include "gtkmm2ext/utils.h"
#include <gtkmm/menu.h> #include <gtkmm/menu.h>
#include <gtkmm/menuitem.h> #include <gtkmm/menuitem.h>
#include "widgets/tearoff.h"
#include "widgets/tooltips.h" #include "widgets/tooltips.h"
#include "ardour/amp.h" #include "ardour/amp.h"

6
gtk2_ardour/monitor_section.h
View file

@ -35,7 +35,7 @@
#include "processor_box.h" #include "processor_box.h"
#include "processor_selection.h" #include "processor_selection.h"
namespace Gtkmm2ext { namespace ArdourWidgets {
class TearOff; class TearOff;
} }
@ -47,7 +47,7 @@ public:
void set_session (ARDOUR::Session*); void set_session (ARDOUR::Session*);
Gtkmm2ext::TearOff& tearoff() const { return *_tearoff; } ArdourWidgets::TearOff& tearoff() const { return *_tearoff; }
std::string state_id() const; std::string state_id() const;
@ -56,7 +56,7 @@ public:
private: private:
Gtk::HBox hpacker; Gtk::HBox hpacker;
Gtk::VBox vpacker; Gtk::VBox vpacker;
Gtkmm2ext::TearOff* _tearoff; ArdourWidgets::TearOff* _tearoff;
Gtk::HBox channel_table_packer; Gtk::HBox channel_table_packer;
Gtk::HBox table_hpacker; Gtk::HBox table_hpacker;

4
gtk2_ardour/mono_panner.h
View file

@ -24,7 +24,7 @@
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include "gtkmm2ext/binding_proxy.h" #include "widgets/binding_proxy.h"
#include "panner_interface.h" #include "panner_interface.h"
@ -72,7 +72,7 @@ private:
double accumulated_delta; double accumulated_delta;
bool detented; bool detented;
BindingProxy position_binder; ArdourWidgets::BindingProxy position_binder;
void set_tooltip (); void set_tooltip ();

7
gtk2_ardour/plugin_selector.cc
View file

@ -25,10 +25,13 @@
#include <algorithm> #include <algorithm>
#include <gtkmm/table.h>
#include <gtkmm/stock.h>
#include <gtkmm/button.h> #include <gtkmm/button.h>
#include <gtkmm/comboboxtext.h>
#include <gtkmm/frame.h>
#include <gtkmm/messagedialog.h>
#include <gtkmm/notebook.h> #include <gtkmm/notebook.h>
#include <gtkmm/stock.h>
#include <gtkmm/table.h>
#include "gtkmm2ext/utils.h" #include "gtkmm2ext/utils.h"
#include "pbd/convert.h" #include "pbd/convert.h"

3
gtk2_ardour/plugin_selector.h
View file

@ -23,6 +23,9 @@
#include <gtkmm/dialog.h> #include <gtkmm/dialog.h>
#include <gtkmm/notebook.h> #include <gtkmm/notebook.h>
#include <gtkmm/treeview.h> #include <gtkmm/treeview.h>
#include <gtkmm/scrolledwindow.h>
#include <gtkmm/liststore.h>
#include "gtkmm2ext/dndtreeview.h" #include "gtkmm2ext/dndtreeview.h"
#include "ardour/plugin.h" #include "ardour/plugin.h"

2
gtk2_ardour/plugin_setup_dialog.cc
View file

@ -19,6 +19,8 @@
#include <gtkmm/frame.h> #include <gtkmm/frame.h>
#include <gtkmm/label.h> #include <gtkmm/label.h>
#include <gtkmm/stock.h>
#include <gtkmm/table.h>
#include "plugin_setup_dialog.h" #include "plugin_setup_dialog.h"
#include "pbd/i18n.h" #include "pbd/i18n.h"

4
gtk2_ardour/port_insert_ui.h
View file

@ -20,7 +20,7 @@
#ifndef __gtkardour_port_insert_ui_h__ #ifndef __gtkardour_port_insert_ui_h__
#define __gtkardour_port_insert_ui_h__ #define __gtkardour_port_insert_ui_h__
#include "gtkmm2ext/stateful_button.h" #include "widgets/stateful_button.h"
#include "ardour_dialog.h" #include "ardour_dialog.h"
#include "io_selector.h" #include "io_selector.h"
@ -40,7 +40,7 @@ private:
boost::shared_ptr<ARDOUR::PortInsert> _pi; boost::shared_ptr<ARDOUR::PortInsert> _pi;
Gtk::Notebook notebook; Gtk::Notebook notebook;
Gtkmm2ext::StatefulToggleButton latency_button; ArdourWidgets::StatefulToggleButton latency_button;
IOSelector input_selector; IOSelector input_selector;
IOSelector output_selector; IOSelector output_selector;
Gtk::Label latency_display; Gtk::Label latency_display;

7
gtk2_ardour/processor_box.cc
View file

@ -37,11 +37,10 @@
#include "gtkmm2ext/gtk_ui.h" #include "gtkmm2ext/gtk_ui.h"
#include "gtkmm2ext/menu_elems.h" #include "gtkmm2ext/menu_elems.h"
#include "gtkmm2ext/utils.h" #include "gtkmm2ext/utils.h"
#include "gtkmm2ext/choice.h"
#include "gtkmm2ext/utils.h"
#include "gtkmm2ext/doi.h" #include "gtkmm2ext/doi.h"
#include "gtkmm2ext/rgb_macros.h" #include "gtkmm2ext/rgb_macros.h"
#include "widgets/choice.h"
#include "widgets/tooltips.h" #include "widgets/tooltips.h"
#include "ardour/amp.h" #include "ardour/amp.h"
@ -3470,7 +3469,7 @@ ProcessorBox::clear_processors ()
choices.push_back (_("Cancel")); choices.push_back (_("Cancel"));
choices.push_back (_("Yes, remove them all")); choices.push_back (_("Yes, remove them all"));
Gtkmm2ext::Choice prompter (_("Remove processors"), prompt, choices); ArdourWidgets::Choice prompter (_("Remove processors"), prompt, choices);
if (prompter.run () == 1) { if (prompter.run () == 1) {
_route->clear_processors (PreFader); _route->clear_processors (PreFader);
@ -3495,7 +3494,7 @@ ProcessorBox::clear_processors (Placement p)
choices.push_back (_("Cancel")); choices.push_back (_("Cancel"));
choices.push_back (_("Yes, remove them all")); choices.push_back (_("Yes, remove them all"));
Gtkmm2ext::Choice prompter (_("Remove processors"), prompt, choices); ArdourWidgets::Choice prompter (_("Remove processors"), prompt, choices);
if (prompter.run () == 1) { if (prompter.run () == 1) {
_route->clear_processors (p); _route->clear_processors (p);

2
gtk2_ardour/prompter.cc
View file

@ -20,7 +20,7 @@
#include "prompter.h" #include "prompter.h"
ArdourPrompter::ArdourPrompter (bool modal) ArdourPrompter::ArdourPrompter (bool modal)
: Gtkmm2ext::Prompter (modal) : ArdourWidgets::Prompter (modal)
{ {
} }

4
gtk2_ardour/prompter.h
View file

@ -20,9 +20,9 @@
#ifndef __ardour_gtk_prompter_h__ #ifndef __ardour_gtk_prompter_h__
#define __ardour_gtk_prompter_h__ #define __ardour_gtk_prompter_h__
#include <gtkmm2ext/prompter.h> #include "widgets/prompter.h"
class ArdourPrompter : public Gtkmm2ext::Prompter class ArdourPrompter : public ArdourWidgets::Prompter
{ {
public: public:
ArdourPrompter (bool modal = false); ArdourPrompter (bool modal = false);

5
gtk2_ardour/public_editor.h
View file

@ -46,9 +46,10 @@
#include "gtkmm2ext/actions.h" #include "gtkmm2ext/actions.h"
#include "gtkmm2ext/bindings.h" #include "gtkmm2ext/bindings.h"
#include "gtkmm2ext/tabbable.h"
#include "gtkmm2ext/visibility_tracker.h" #include "gtkmm2ext/visibility_tracker.h"
#include "widgets/tabbable.h"
#include "axis_provider.h" #include "axis_provider.h"
#include "editing.h" #include "editing.h"
#include "selection.h" #include "selection.h"
@ -108,7 +109,7 @@ using ARDOUR::framecnt_t;
* of PublicEditor need not be recompiled if private methods or member variables * of PublicEditor need not be recompiled if private methods or member variables
* change. * change.
*/ */
class PublicEditor : public Gtkmm2ext::Tabbable, public ARDOUR::SessionHandlePtr, public AxisViewProvider class PublicEditor : public ArdourWidgets::Tabbable, public ARDOUR::SessionHandlePtr, public AxisViewProvider
{ {
public: public:
PublicEditor (Gtk::Widget& content); PublicEditor (Gtk::Widget& content);

7
gtk2_ardour/rc_option_editor.cc
View file

@ -35,7 +35,6 @@
#include "gtkmm2ext/utils.h" #include "gtkmm2ext/utils.h"
#include "gtkmm2ext/gtk_ui.h" #include "gtkmm2ext/gtk_ui.h"
#include "gtkmm2ext/paths_dialog.h"
#include "gtkmm2ext/window_title.h" #include "gtkmm2ext/window_title.h"
#include "pbd/fpu.h" #include "pbd/fpu.h"
@ -53,6 +52,8 @@
#include "control_protocol/control_protocol.h" #include "control_protocol/control_protocol.h"
#include "canvas/wave_view.h" #include "canvas/wave_view.h"
#include "widgets/paths_dialog.h"
#include "widgets/tooltips.h" #include "widgets/tooltips.h"
#include "ardour_dialog.h" #include "ardour_dialog.h"
@ -3995,7 +3996,7 @@ void RCOptionEditor::clear_au_blacklist () {
void RCOptionEditor::edit_lxvst_path () { void RCOptionEditor::edit_lxvst_path () {
Glib::RefPtr<Gdk::Window> win = get_parent_window (); Glib::RefPtr<Gdk::Window> win = get_parent_window ();
Gtkmm2ext::PathsDialog *pd = new Gtkmm2ext::PathsDialog ( PathsDialog *pd = new PathsDialog (
*current_toplevel(), _("Set Linux VST Search Path"), *current_toplevel(), _("Set Linux VST Search Path"),
_rc_config->get_plugin_path_lxvst(), _rc_config->get_plugin_path_lxvst(),
PluginManager::instance().get_default_lxvst_path() PluginManager::instance().get_default_lxvst_path()
@ -4017,7 +4018,7 @@ void RCOptionEditor::edit_lxvst_path () {
} }
void RCOptionEditor::edit_vst_path () { void RCOptionEditor::edit_vst_path () {
Gtkmm2ext::PathsDialog *pd = new Gtkmm2ext::PathsDialog ( PathsDialog *pd = new PathsDialog (
*current_toplevel(), _("Set Windows VST Search Path"), *current_toplevel(), _("Set Windows VST Search Path"),
_rc_config->get_plugin_path_vst(), _rc_config->get_plugin_path_vst(),
PluginManager::instance().get_default_windows_vst_path() PluginManager::instance().get_default_windows_vst_path()

4
gtk2_ardour/rc_option_editor.h
View file

@ -20,7 +20,7 @@
#ifndef __gtk_ardour_rc_option_editor_h__ #ifndef __gtk_ardour_rc_option_editor_h__
#define __gtk_ardour_rc_option_editor_h__ #define __gtk_ardour_rc_option_editor_h__
#include "gtkmm2ext/tabbable.h" #include "widgets/tabbable.h"
#include "option_editor.h" #include "option_editor.h"
#include "visibility_group.h" #include "visibility_group.h"
@ -34,7 +34,7 @@
*/ */
/** Editor for options which are obtained from and written back to one of the .rc files. */ /** Editor for options which are obtained from and written back to one of the .rc files. */
class RCOptionEditor : public OptionEditorContainer, public ARDOUR::SessionHandlePtr, public Gtkmm2ext::Tabbable class RCOptionEditor : public OptionEditorContainer, public ARDOUR::SessionHandlePtr, public ArdourWidgets::Tabbable
{ {
public: public:
RCOptionEditor (); RCOptionEditor ();

8
gtk2_ardour/route_params_ui.h
View file

@ -36,7 +36,7 @@
#include "ardour/ardour.h" #include "ardour/ardour.h"
#include <gtkmm2ext/pane.h> #include <widgets/pane.h>
#include "ardour_window.h" #include "ardour_window.h"
#include "processor_box.h" #include "processor_box.h"
@ -73,7 +73,7 @@ private:
Gtk::Notebook notebook; Gtk::Notebook notebook;
Gtk::Frame input_frame; Gtk::Frame input_frame;
Gtk::Frame output_frame; Gtk::Frame output_frame;
Gtkmm2ext::HPane redir_hpane; ArdourWidgets::HPane redir_hpane;
Gtk::Frame route_select_frame; Gtk::Frame route_select_frame;
@ -82,9 +82,9 @@ private:
ProcessorBox* insert_box; ProcessorBox* insert_box;
Gtkmm2ext::HPane list_hpane; ArdourWidgets::HPane list_hpane;
Gtkmm2ext::HPane right_hpane; ArdourWidgets::HPane right_hpane;
Gtk::Frame route_param_frame; Gtk::Frame route_param_frame;

2
gtk2_ardour/route_ui.cc
View file

@ -21,12 +21,12 @@
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include "gtkmm2ext/gtk_ui.h" #include "gtkmm2ext/gtk_ui.h"
#include "gtkmm2ext/choice.h"
#include "gtkmm2ext/doi.h" #include "gtkmm2ext/doi.h"
#include "gtkmm2ext/gtk_ui.h" #include "gtkmm2ext/gtk_ui.h"
#include "gtkmm2ext/utils.h" #include "gtkmm2ext/utils.h"
#include "widgets/ardour_button.h" #include "widgets/ardour_button.h"
#include "widgets/binding_proxy.h"
#include "pbd/memento_command.h" #include "pbd/memento_command.h"
#include "pbd/stacktrace.h" #include "pbd/stacktrace.h"

1
gtk2_ardour/session_dialog.cc
View file

@ -30,6 +30,7 @@
#include <glibmm/datetime.h> #include <glibmm/datetime.h>
#include <gtkmm/filechooser.h> #include <gtkmm/filechooser.h>
#include <gtkmm/stock.h>
#include "pbd/basename.h" #include "pbd/basename.h"
#include "pbd/failed_constructor.h" #include "pbd/failed_constructor.h"

8
gtk2_ardour/shuttle_control.h
View file

@ -21,15 +21,15 @@
#include <gtkmm/drawingarea.h> #include <gtkmm/drawingarea.h>
#include "gtkmm2ext/binding_proxy.h"
#include "gtkmm2ext/cairo_widget.h"
#include "pbd/controllable.h" #include "pbd/controllable.h"
#include "ardour/session_handle.h" #include "ardour/session_handle.h"
#include "ardour/types.h" #include "ardour/types.h"
#include "gtkmm2ext/cairo_widget.h"
#include "widgets/ardour_button.h" #include "widgets/ardour_button.h"
#include "widgets/binding_proxy.h"
namespace Gtk { namespace Gtk {
class Menu; class Menu;
@ -79,7 +79,7 @@ protected:
Gtk::Menu* shuttle_unit_menu; Gtk::Menu* shuttle_unit_menu;
Gtk::Menu* shuttle_style_menu; Gtk::Menu* shuttle_style_menu;
Gtk::Menu* shuttle_context_menu; Gtk::Menu* shuttle_context_menu;
BindingProxy binding_proxy; ArdourWidgets::BindingProxy binding_proxy;
float bg_r, bg_g, bg_b; float bg_r, bg_g, bg_b;
void build_shuttle_context_menu (); void build_shuttle_context_menu ();
void shuttle_style_changed(); void shuttle_style_changed();

6
gtk2_ardour/stereo_panner.h
View file

@ -21,7 +21,7 @@
#define __gtk_ardour_stereo_panner_h__ #define __gtk_ardour_stereo_panner_h__
#include "pbd/signals.h" #include "pbd/signals.h"
#include "gtkmm2ext/binding_proxy.h" #include "widgets/binding_proxy.h"
#include "panner_interface.h" #include "panner_interface.h"
namespace ARDOUR { namespace ARDOUR {
@ -79,8 +79,8 @@ private:
double accumulated_delta; double accumulated_delta;
bool detented; bool detented;
BindingProxy position_binder; ArdourWidgets::BindingProxy position_binder;
BindingProxy width_binder; ArdourWidgets::BindingProxy width_binder;
void set_tooltip (); void set_tooltip ();

1
gtk2_ardour/strip_silence_dialog.cc
View file

@ -21,6 +21,7 @@
#include <gtkmm/table.h> #include <gtkmm/table.h>
#include <gtkmm/label.h> #include <gtkmm/label.h>
#include <gtkmm/progressbar.h>
#include <gtkmm/stock.h> #include <gtkmm/stock.h>
#include "ardour/audioregion.h" #include "ardour/audioregion.h"

6
gtk2_ardour/toolbar_test.cc
View file

@ -100,7 +100,7 @@ LogReceiver::receive (Transmitter::Channel chn, const char * str)
/* ***************************************************************************/ /* ***************************************************************************/
void void
setup_action_button (ArdourButton& button, std::string const & action, Gtkmm2ext::ArdourIcon::Icon icon, std::string const & button_theme_name) setup_action_button (ArdourButton& button, std::string const & action, ArdourWidgets::ArdourIcon::Icon icon, std::string const & button_theme_name)
{ {
button.set_name (button_theme_name + string (" button")); button.set_name (button_theme_name + string (" button"));
Glib::RefPtr<Gtk::Action> act; Glib::RefPtr<Gtk::Action> act;
@ -110,7 +110,7 @@ setup_action_button (ArdourButton& button, std::string const & action, Gtkmm2ext
} }
ArdourButton* ArdourButton*
make_action_button (std::string const & action, Gtkmm2ext::ArdourIcon::Icon icon, std::string const & button_theme_name) make_action_button (std::string const & action, ArdourWidgets::ArdourIcon::Icon icon, std::string const & button_theme_name)
{ {
ArdourButton* button = new ArdourButton; ArdourButton* button = new ArdourButton;
setup_action_button (*button, action, icon, button_theme_name); setup_action_button (*button, action, icon, button_theme_name);
@ -227,7 +227,7 @@ CANVAS_UI::build_toolbar (ArdourCanvas::Item* parent, std::string const & spec_p
break; break;
} }
Gtkmm2ext::ArdourIcon::Icon i = (ArdourIcon::Icon) string_2_enum (string ("ArdourIcon::") + icon, i); ArdourWidgets::ArdourIcon::Icon i = (ArdourWidgets::ArdourIcon::Icon) string_2_enum (string ("ArdourIcon::") + icon, i);
ArdourCanvas::Widget* w = new ArdourCanvas::Widget (canvas, *make_action_button (action, i, theme_name)); ArdourCanvas::Widget* w = new ArdourCanvas::Widget (canvas, *make_action_button (action, i, theme_name));
grid->place (w, col, row); grid->place (w, col, row);

28
libs/gtkmm2ext/gtk_ui.cc
View file

@ -38,7 +38,6 @@
#include "gtkmm2ext/bindings.h" #include "gtkmm2ext/bindings.h"
#include "gtkmm2ext/gtk_ui.h" #include "gtkmm2ext/gtk_ui.h"
#include "gtkmm2ext/textviewer.h" #include "gtkmm2ext/textviewer.h"
#include "gtkmm2ext/popup.h"
#include "gtkmm2ext/utils.h" #include "gtkmm2ext/utils.h"
#include "gtkmm2ext/window_title.h" #include "gtkmm2ext/window_title.h"
#include "gtkmm2ext/actions.h" #include "gtkmm2ext/actions.h"
@ -549,8 +548,6 @@ UI::receive (Transmitter::Channel chn, const char *str)
} }
} }
#define OLD_STYLE_ERRORS 1
void void
UI::process_error_message (Transmitter::Channel chn, const char *str) UI::process_error_message (Transmitter::Channel chn, const char *str)
{ {
@ -560,9 +557,6 @@ UI::process_error_message (Transmitter::Channel chn, const char *str)
const char *prefix; const char *prefix;
size_t prefix_len; size_t prefix_len;
bool fatal_received = false; bool fatal_received = false;
#ifndef OLD_STYLE_ERRORS
PopUp* popup = new PopUp (WIN_POS_CENTER, 0, true);
#endif
switch (chn) { switch (chn) {
case Transmitter::Fatal: case Transmitter::Fatal:
@ -573,44 +567,22 @@ UI::process_error_message (Transmitter::Channel chn, const char *str)
fatal_received = true; fatal_received = true;
break; break;
case Transmitter::Error: case Transmitter::Error:
#if OLD_STYLE_ERRORS
prefix = "[ERROR]: "; prefix = "[ERROR]: ";
ptag = error_ptag; ptag = error_ptag;
mtag = error_mtag; mtag = error_mtag;
prefix_len = 9; prefix_len = 9;
#else
popup->set_name ("ErrorMessage");
popup->set_text (str);
popup->touch ();
return;
#endif
break; break;
case Transmitter::Info: case Transmitter::Info:
#if OLD_STYLE_ERRORS
prefix = "[INFO]: "; prefix = "[INFO]: ";
ptag = info_ptag; ptag = info_ptag;
mtag = info_mtag; mtag = info_mtag;
prefix_len = 8; prefix_len = 8;
#else
popup->set_name ("InfoMessage");
popup->set_text (str);
popup->touch ();
return;
#endif
break; break;
case Transmitter::Warning: case Transmitter::Warning:
#if OLD_STYLE_ERRORS
prefix = "[WARNING]: "; prefix = "[WARNING]: ";
ptag = warning_ptag; ptag = warning_ptag;
mtag = warning_mtag; mtag = warning_mtag;
prefix_len = 11; prefix_len = 11;
#else
popup->set_name ("WarningMessage");
popup->set_text (str);
popup->touch ();
return;
#endif
break; break;
default: default:
/* no choice but to use text/console output here */ /* no choice but to use text/console output here */

14
libs/gtkmm2ext/wscript
View file

@ -25,33 +25,21 @@ I18N_PACKAGE = 'gtkmm2ext3'
gtkmm2ext_sources = [ gtkmm2ext_sources = [
'actions.cc', 'actions.cc',
'application.cc', 'application.cc',
'ardour_icon.cc',
'binding_proxy.cc',
'bindings.cc', 'bindings.cc',
'cairo_packer.cc', 'cairo_packer.cc',
'cairo_widget.cc', 'cairo_widget.cc',
'cell_renderer_color_selector.cc', 'cell_renderer_color_selector.cc',
'cell_renderer_pixbuf_multi.cc', 'cell_renderer_pixbuf_multi.cc',
'cell_renderer_pixbuf_toggle.cc', 'cell_renderer_pixbuf_toggle.cc',
'choice.cc',
'cursors.cc', 'cursors.cc',
'debug.cc', 'debug.cc',
'dndtreeview.cc', 'dndtreeview.cc',
'emscale.cc', 'emscale.cc',
'eventboxext.cc',
'gtk_ui.cc', 'gtk_ui.cc',
'gtkapplication.c', 'gtkapplication.c',
'keyboard.cc', 'keyboard.cc',
'menu_elems.cc', 'menu_elems.cc',
'pane.cc',
'paths_dialog.cc',
'persistent_tooltip.cc', 'persistent_tooltip.cc',
'popup.cc',
'prompter.cc',
'scroomer.cc',
'stateful_button.cc',
'tabbable.cc',
'tearoff.cc',
'textviewer.cc', 'textviewer.cc',
'treeutils.cc', 'treeutils.cc',
'utils.cc', 'utils.cc',
@ -94,7 +82,7 @@ def build(bld):
obj.name = 'libgtkmm2ext' obj.name = 'libgtkmm2ext'
obj.target = 'gtkmm2ext' obj.target = 'gtkmm2ext'
obj.uselib = 'GTKMM GTK XML' obj.uselib = 'GTKMM GTK XML'
obj.use = [ 'libpbd', 'libardour' ] obj.use = [ 'libpbd' ]
obj.vnum = GTKMM2EXT_LIB_VERSION obj.vnum = GTKMM2EXT_LIB_VERSION
obj.install_path = bld.env['LIBDIR'] obj.install_path = bld.env['LIBDIR']
obj.defines += [ obj.defines += [

9
libs/widgets/ardour_button.cc
View file

@ -22,6 +22,7 @@
#include <algorithm> #include <algorithm>
#include <pangomm/layout.h> #include <pangomm/layout.h>
#include <gtkmm/toggleaction.h>
#include "pbd/compose.h" #include "pbd/compose.h"
#include "pbd/controllable.h" #include "pbd/controllable.h"
@ -60,7 +61,7 @@ ArdourButton::ArdourButton (Element e)
: _sizing_text("") : _sizing_text("")
, _markup (false) , _markup (false)
, _elements (e) , _elements (e)
, _icon (Gtkmm2ext::ArdourIcon::NoIcon) , _icon (ArdourIcon::NoIcon)
, _icon_render_cb (0) , _icon_render_cb (0)
, _icon_render_cb_data (0) , _icon_render_cb_data (0)
, _tweaks (Tweaks (0)) , _tweaks (Tweaks (0))
@ -108,7 +109,7 @@ ArdourButton::ArdourButton (const std::string& str, Element e)
: _sizing_text("") : _sizing_text("")
, _markup (false) , _markup (false)
, _elements (e) , _elements (e)
, _icon (Gtkmm2ext::ArdourIcon::NoIcon) , _icon (ArdourIcon::NoIcon)
, _tweaks (Tweaks (0)) , _tweaks (Tweaks (0))
, _char_pixel_width (0) , _char_pixel_width (0)
, _char_pixel_height (0) , _char_pixel_height (0)
@ -379,7 +380,7 @@ ArdourButton::render (Cairo::RefPtr<Cairo::Context> const& ctx, cairo_rectangle_
vw -= _diameter + 4; vw -= _diameter + 4;
} }
if (_elements & VectorIcon) { if (_elements & VectorIcon) {
Gtkmm2ext::ArdourIcon::render (cr, _icon, vw, vh, active_state(), text_color); ArdourIcon::render (cr, _icon, vw, vh, active_state(), text_color);
} else { } else {
cairo_save (cr); cairo_save (cr);
rounded_function (cr, 0, 0, get_width(), get_height(), corner_radius + 1.5); rounded_function (cr, 0, 0, get_width(), get_height(), corner_radius + 1.5);
@ -1303,7 +1304,7 @@ ArdourButton::add_elements (Element e)
} }
void void
ArdourButton::set_icon (Gtkmm2ext::ArdourIcon::Icon i) ArdourButton::set_icon (ArdourIcon::Icon i)
{ {
_icon = i; _icon = i;
_icon_render_cb = 0; _icon_render_cb = 0;

13
libs/gtkmm2ext/ardour_icon.cc → libs/widgets/ardour_icon.cc
View file

@ -21,9 +21,10 @@
#include <math.h> // M_PI #include <math.h> // M_PI
#include <assert.h> #include <assert.h>
#include <algorithm> // std:min #include <algorithm> // std:min
#include "gtkmm2ext/ardour_icon.h"
using namespace Gtkmm2ext::ArdourIcon; #include "widgets/ardour_icon.h"
using namespace ArdourWidgets::ArdourIcon;
/* general style info: /* general style info:
* *
@ -654,7 +655,7 @@ static void icon_transport_panic (cairo_t *cr, const int width, const int height
/** various combinations of lines and triangles "|>|", ">|" "|>" */ /** various combinations of lines and triangles "|>|", ">|" "|>" */
static void icon_transport_ck (cairo_t *cr, static void icon_transport_ck (cairo_t *cr,
const enum Gtkmm2ext::ArdourIcon::Icon icon, const enum ArdourWidgets::ArdourIcon::Icon icon,
const int width, const int height) const int width, const int height)
{ {
// small play triangle // small play triangle
@ -780,7 +781,7 @@ static void icon_transport_metronom (cairo_t *cr, const int width, const int hei
/***************************************************************************** /*****************************************************************************
* Zoom: In "+", Out "-" and Full "[]" * Zoom: In "+", Out "-" and Full "[]"
*/ */
static void icon_zoom (cairo_t *cr, const enum Gtkmm2ext::ArdourIcon::Icon icon, const int width, const int height, const uint32_t fg_color) static void icon_zoom (cairo_t *cr, const enum ArdourWidgets::ArdourIcon::Icon icon, const int width, const int height, const uint32_t fg_color)
{ {
const double x = width * .5; const double x = width * .5;
const double y = height * .5; const double y = height * .5;
@ -1018,8 +1019,8 @@ static void icon_din_midi (cairo_t *cr, const int width, const int height, const
/*****************************************************************************/ /*****************************************************************************/
bool bool
Gtkmm2ext::ArdourIcon::render (cairo_t *cr, ArdourWidgets::ArdourIcon::render (cairo_t *cr,
const enum Gtkmm2ext::ArdourIcon::Icon icon, const enum ArdourWidgets::ArdourIcon::Icon icon,
const int width, const int height, const int width, const int height,
const Gtkmm2ext::ActiveState state, const Gtkmm2ext::ActiveState state,
const uint32_t fg_color) const uint32_t fg_color)

16
libs/gtkmm2ext/binding_proxy.cc → libs/widgets/binding_proxy.cc
View file

@ -13,24 +13,23 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id$
*/ */
#include <string> #include <string>
#include <climits> #include <climits>
#include <iostream> #include <iostream>
#include <pbd/controllable.h> #include "pbd/controllable.h"
#include "gtkmm2ext/keyboard.h"
#include <gtkmm2ext/binding_proxy.h> #include "widgets/binding_proxy.h"
#include <gtkmm2ext/keyboard.h> #include "widgets/popup.h"
#include "pbd/i18n.h" #include "pbd/i18n.h"
using namespace Gtkmm2ext;
using namespace std; using namespace std;
using namespace PBD; using namespace PBD;
using namespace Gtkmm2ext;
using namespace ArdourWidgets;
guint BindingProxy::bind_button = 2; guint BindingProxy::bind_button = 2;
guint BindingProxy::bind_statemask = Gdk::CONTROL_MASK; guint BindingProxy::bind_statemask = Gdk::CONTROL_MASK;
@ -73,7 +72,6 @@ BindingProxy::is_bind_action (GdkEventButton *ev)
return (Keyboard::modifier_state_equals (ev->state, bind_statemask) && ev->button == bind_button ); return (Keyboard::modifier_state_equals (ev->state, bind_statemask) && ev->button == bind_button );
} }
bool bool
BindingProxy::button_press_handler (GdkEventButton *ev) BindingProxy::button_press_handler (GdkEventButton *ev)
{ {
@ -103,7 +101,6 @@ BindingProxy::learning_finished ()
} }
} }
bool bool
BindingProxy::prompter_hiding (GdkEventAny* /*ev*/) BindingProxy::prompter_hiding (GdkEventAny* /*ev*/)
{ {
@ -113,4 +110,3 @@ BindingProxy::prompter_hiding (GdkEventAny* /*ev*/)
} }
return false; return false;
} }

4
libs/gtkmm2ext/choice.cc → libs/widgets/choice.cc
View file

@ -19,12 +19,12 @@
*/ */
#include <gtkmm/label.h> #include <gtkmm/label.h>
#include <gtkmm2ext/choice.h> #include <widgets/choice.h>
using namespace std; using namespace std;
using namespace Gtkmm2ext;
using namespace sigc; using namespace sigc;
using namespace Gtk; using namespace Gtk;
using namespace ArdourWidgets;
Choice::Choice (string title, string prompt, vector<string> choices, bool center) Choice::Choice (string title, string prompt, vector<string> choices, bool center)
: Dialog (title) : Dialog (title)

4
libs/gtkmm2ext/eventboxext.cc → libs/widgets/eventboxext.cc
View file

@ -16,9 +16,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#include "gtkmm2ext/eventboxext.h" #include "widgets/eventboxext.h"
using namespace Gtkmm2ext; using namespace ArdourWidgets;
EventBoxExt::EventBoxExt () EventBoxExt::EventBoxExt ()
{ {

9
libs/gtkmm2ext/pane.cc → libs/widgets/pane.cc
View file

@ -19,14 +19,15 @@
#include <assert.h> #include <assert.h>
#include <gdkmm/cursor.h> #include <gdkmm/cursor.h>
#include "gtkmm2ext/pane.h"
#include "widgets/pane.h"
#include "pbd/i18n.h" #include "pbd/i18n.h"
using namespace PBD;
using namespace Gtk;
using namespace Gtkmm2ext;
using namespace std; using namespace std;
using namespace Gtk;
using namespace PBD;
using namespace ArdourWidgets;
Pane::Pane (bool h) Pane::Pane (bool h)
: horizontal (h) : horizontal (h)

4
libs/gtkmm2ext/paths_dialog.cc → libs/widgets/paths_dialog.cc
View file

@ -20,11 +20,11 @@
#include "pbd/i18n.h" #include "pbd/i18n.h"
#include "pbd/pathexpand.h" #include "pbd/pathexpand.h"
#include "gtkmm2ext/paths_dialog.h" #include "widgets/paths_dialog.h"
using namespace Gtk; using namespace Gtk;
using namespace std; using namespace std;
using namespace Gtkmm2ext; using namespace ArdourWidgets;
PathsDialog::PathsDialog (Gtk::Window& parent, std::string title, std::string current_paths, std::string default_paths) PathsDialog::PathsDialog (Gtk::Window& parent, std::string title, std::string current_paths, std::string default_paths)
: Dialog (title, parent, true) : Dialog (title, parent, true)

9
libs/gtkmm2ext/popup.cc → libs/widgets/popup.cc
View file

@ -20,13 +20,14 @@
#include <iostream> #include <iostream>
#include <gtkmm2ext/popup.h>
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/gtk_ui.h> #include <gtkmm2ext/gtk_ui.h>
#include <gtkmm2ext/utils.h>
#include <widgets/popup.h>
using namespace std; using namespace std;
using namespace Gtk; using namespace Gtk;
using namespace Gtkmm2ext; using namespace ArdourWidgets;
PopUp::PopUp (Gtk::WindowPosition pos, unsigned int showfor_msecs, bool doh) PopUp::PopUp (Gtk::WindowPosition pos, unsigned int showfor_msecs, bool doh)
: Window (WINDOW_POPUP) : Window (WINDOW_POPUP)
@ -98,7 +99,7 @@ PopUp::touch ()
if (is_visible ()) { if (is_visible ()) {
remove (); remove ();
} else { } else {
set_size_request_to_display_given_text (label, my_text.c_str(), 25, 10); Gtkmm2ext::set_size_request_to_display_given_text (label, my_text.c_str(), 25, 10);
label.set_text (my_text); label.set_text (my_text);
show_all (); show_all ();

9
libs/gtkmm2ext/prompter.cc → libs/widgets/prompter.cc
View file

@ -19,16 +19,15 @@
*/ */
#include <string> #include <string>
#include <pbd/whitespace.h>
#include <gtkmm/stock.h> #include <gtkmm/stock.h>
#include <gtkmm2ext/prompter.h>
#include "pbd/whitespace.h"
#include "widgets/prompter.h"
#include "pbd/i18n.h" #include "pbd/i18n.h"
using namespace std; using namespace std;
using namespace Gtkmm2ext; using namespace ArdourWidgets;
Prompter::Prompter (Gtk::Window& parent, bool modal) Prompter::Prompter (Gtk::Window& parent, bool modal)
: Gtk::Dialog ("", parent, modal) : Gtk::Dialog ("", parent, modal)

12
libs/gtkmm2ext/scroomer.cc → libs/widgets/scroomer.cc
View file

@ -19,13 +19,13 @@
#include <iostream> #include <iostream>
#include "gtkmm2ext/scroomer.h"
#include "gtkmm2ext/keyboard.h" #include "gtkmm2ext/keyboard.h"
#include "widgets/scroomer.h"
using namespace Gtkmm2ext;
using namespace Gtk;
using namespace Gdk;
using namespace std; using namespace std;
using namespace Gdk;
using namespace Gtk;
using namespace ArdourWidgets;
Scroomer::Scroomer(Gtk::Adjustment& adjustment) Scroomer::Scroomer(Gtk::Adjustment& adjustment)
: adj(adjustment) : adj(adjustment)
@ -80,8 +80,8 @@ Scroomer::on_motion_notify_event (GdkEventMotion* ev)
grab_y = ev->y; grab_y = ev->y;
if (ev->state & Keyboard::PrimaryModifier) { if (ev->state & Gtkmm2ext::Keyboard::PrimaryModifier) {
if (ev->state & Keyboard::SecondaryModifier) { if (ev->state & Gtkmm2ext::Keyboard::SecondaryModifier) {
scale = 0.05; scale = 0.05;
} else { } else {
scale = 0.1; scale = 0.1;

4
libs/gtkmm2ext/stateful_button.cc → libs/widgets/stateful_button.cc
View file

@ -23,11 +23,11 @@
#include <gtkmm/main.h> #include <gtkmm/main.h>
#include <gtkmm2ext/stateful_button.h> #include "widgets/stateful_button.h"
using namespace Gtk; using namespace Gtk;
using namespace Glib; using namespace Glib;
using namespace Gtkmm2ext; using namespace ArdourWidgets;
using namespace std; using namespace std;
StateButton::StateButton () StateButton::StateButton ()

10
libs/gtkmm2ext/tabbable.cc → libs/widgets/tabbable.cc
View file

@ -22,18 +22,20 @@
#include <gtkmm/window.h> #include <gtkmm/window.h>
#include <gtkmm/stock.h> #include <gtkmm/stock.h>
#include "gtkmm2ext/tabbable.h" #include "pbd/stacktrace.h"
#include "gtkmm2ext/gtk_ui.h" #include "gtkmm2ext/gtk_ui.h"
#include "gtkmm2ext/utils.h" #include "gtkmm2ext/utils.h"
#include "gtkmm2ext/visibility_tracker.h" #include "gtkmm2ext/visibility_tracker.h"
#include "pbd/stacktrace.h" #include "widgets/tabbable.h"
#include "pbd/i18n.h" #include "pbd/i18n.h"
using namespace Gtkmm2ext;
using namespace Gtk;
using std::string; using std::string;
using namespace Gtk;
using namespace Gtkmm2ext;
using namespace ArdourWidgets;
Tabbable::Tabbable (Widget& w, const string& name, bool tabbed_by_default) Tabbable::Tabbable (Widget& w, const string& name, bool tabbed_by_default)
: WindowProxy (name) : WindowProxy (name)

14
libs/gtkmm2ext/tearoff.cc → libs/widgets/tearoff.cc
View file

@ -15,7 +15,6 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id$
*/ */
#include <cmath> #include <cmath>
@ -23,16 +22,17 @@
#include "pbd/xml++.h" #include "pbd/xml++.h"
#include "gtkmm2ext/tearoff.h"
#include "gtkmm2ext/utils.h" #include "gtkmm2ext/utils.h"
#include "widgets/tearoff.h"
#include "pbd/i18n.h" #include "pbd/i18n.h"
using namespace Gtkmm2ext;
using namespace Gtk;
using namespace Gdk;
using namespace Glib;
using namespace std; using namespace std;
using namespace Glib;
using namespace Gdk;
using namespace Gtk;
using namespace ArdourWidgets;
TearOff::TearOff (Widget& c, bool allow_resize) TearOff::TearOff (Widget& c, bool allow_resize)
: contents (c) : contents (c)
@ -339,5 +339,3 @@ TearOff::hide_visible ()
hide (); hide ();
} }

10
libs/widgets/widgets/ardour_button.h
View file

@ -25,11 +25,11 @@
#include <gtkmm/action.h> #include <gtkmm/action.h>
#include "pbd/signals.h" #include "pbd/signals.h"
#include "gtkmm2ext/ardour_icon.h"
#include "gtkmm2ext/binding_proxy.h"
#include "gtkmm2ext/activatable.h" #include "gtkmm2ext/activatable.h"
#include "gtkmm2ext/cairo_widget.h" #include "gtkmm2ext/cairo_widget.h"
#include "widgets/ardour_icon.h"
#include "widgets/binding_proxy.h"
#include "widgets/visibility.h" #include "widgets/visibility.h"
namespace ArdourWidgets { namespace ArdourWidgets {
@ -80,8 +80,8 @@ class LIBWIDGETS_API ArdourButton : public CairoWidget , public Gtkmm2ext::Activ
void set_elements (Element); void set_elements (Element);
void add_elements (Element); void add_elements (Element);
Gtkmm2ext::ArdourIcon::Icon icon() const { return _icon; } ArdourIcon::Icon icon() const { return _icon; }
void set_icon (Gtkmm2ext::ArdourIcon::Icon); void set_icon (ArdourIcon::Icon);
void set_icon (rendercallback_t, void*); void set_icon (rendercallback_t, void*);
void set_corner_radius (float); void set_corner_radius (float);
@ -155,7 +155,7 @@ class LIBWIDGETS_API ArdourButton : public CairoWidget , public Gtkmm2ext::Activ
std::string _sizing_text; std::string _sizing_text;
bool _markup; bool _markup;
Element _elements; Element _elements;
Gtkmm2ext::ArdourIcon::Icon _icon; ArdourIcon::Icon _icon;
rendercallback_t _icon_render_cb; rendercallback_t _icon_render_cb;
void* _icon_render_cb_data; void* _icon_render_cb_data;
Tweaks _tweaks; Tweaks _tweaks;

14
libs/gtkmm2ext/gtkmm2ext/ardour_icon.h → libs/widgets/widgets/ardour_icon.h
View file

@ -1,11 +1,13 @@
#ifndef _gtkmm2ext_ardour_icon_h_ #ifndef _WIDGETS_ARDOUR_ICON_H_
#define _gtkmm2ext_ardour_icon_h_ #define _WIDGETS_ARDOUR_ICON_H_
#include <stdint.h> #include <stdint.h>
#include <cairo.h> #include <cairo.h>
#include "gtkmm2ext/widget_state.h"
namespace Gtkmm2ext { namespace ArdourIcon { #include "gtkmm2ext/widget_state.h"
#include "widgets/visibility.h"
namespace ArdourWidgets { namespace ArdourIcon {
enum Icon { enum Icon {
NoIcon, NoIcon,
RecButton, RecButton,
@ -38,11 +40,11 @@ namespace Gtkmm2ext { namespace ArdourIcon {
ToolContent, ToolContent,
}; };
LIBGTKMM2EXT_API bool render (cairo_t *cr, LIBWIDGETS_API bool render (cairo_t *cr,
const enum Icon icon, const enum Icon icon,
const int width, const int height, const int width, const int height,
const Gtkmm2ext::ActiveState state, const Gtkmm2ext::ActiveState state,
const uint32_t fg_color); const uint32_t fg_color);
}; }; }; } /* end namespace */
#endif #endif

2
libs/widgets/widgets/ardour_knob.h
View file

@ -26,11 +26,11 @@
#include "pbd/signals.h" #include "pbd/signals.h"
#include "gtkmm2ext/binding_proxy.h"
#include "gtkmm2ext/activatable.h" #include "gtkmm2ext/activatable.h"
#include "gtkmm2ext/cairo_widget.h" #include "gtkmm2ext/cairo_widget.h"
#include "gtkmm2ext/persistent_tooltip.h" #include "gtkmm2ext/persistent_tooltip.h"
#include "widgets/binding_proxy.h"
#include "widgets/visibility.h" #include "widgets/visibility.h"
namespace ArdourWidgets { namespace ArdourWidgets {

2
libs/widgets/widgets/barcontroller.h
View file

@ -22,7 +22,7 @@
#include <gtkmm/alignment.h> #include <gtkmm/alignment.h>
#include <cairo.h> #include <cairo.h>
#include "gtkmm2ext/binding_proxy.h" #include "widgets/binding_proxy.h"
#include "widgets/slider_controller.h" #include "widgets/slider_controller.h"
#include "widgets/visibility.h" #include "widgets/visibility.h"

21
libs/gtkmm2ext/gtkmm2ext/binding_proxy.h → libs/widgets/widgets/binding_proxy.h
View file

@ -14,26 +14,29 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id$
*/ */
#ifndef __binding_proxy__ #ifndef _WIDGETS_BINDING_PROXY_
#define __binding_proxy__ #define _WIDGETS_BINDING_PROXY_
#include <string> #include <string>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include "pbd/signals.h" #include "pbd/signals.h"
#include "gtkmm2ext/visibility.h" #include "widgets/visibility.h"
#include "gtkmm2ext/popup.h"
namespace PBD { namespace PBD {
class Controllable; class Controllable;
} }
class LIBGTKMM2EXT_API BindingProxy : public sigc::trackable namespace ArdourWidgets {
class PopUp;
}
namespace ArdourWidgets {
class LIBWIDGETS_API BindingProxy : public sigc::trackable
{ {
public: public:
BindingProxy (boost::shared_ptr<PBD::Controllable>); BindingProxy (boost::shared_ptr<PBD::Controllable>);
@ -49,7 +52,7 @@ class LIBGTKMM2EXT_API BindingProxy : public sigc::trackable
void set_controllable (boost::shared_ptr<PBD::Controllable>); void set_controllable (boost::shared_ptr<PBD::Controllable>);
protected: protected:
Gtkmm2ext::PopUp* prompter; ArdourWidgets::PopUp* prompter;
boost::shared_ptr<PBD::Controllable> controllable; boost::shared_ptr<PBD::Controllable> controllable;
static guint bind_button; static guint bind_button;
@ -60,4 +63,6 @@ class LIBGTKMM2EXT_API BindingProxy : public sigc::trackable
bool prompter_hiding (GdkEventAny *); bool prompter_hiding (GdkEventAny *);
}; };
}
#endif #endif

17
libs/gtkmm2ext/gtkmm2ext/choice.h → libs/widgets/widgets/choice.h
View file

@ -17,21 +17,22 @@
*/ */
#ifndef __pbd_gtkmm_choice_h__ #ifndef _WIDGETS_CHOICE_H_
#define __pbd_gtkmm_choice_h__ #define _WIDGETS_CHOICE_H_
#include <string>
#include <vector>
#include <gtkmm/dialog.h> #include <gtkmm/dialog.h>
#include <gtkmm/image.h> #include <gtkmm/image.h>
#include <gtkmm/stock.h> #include <gtkmm/stock.h>
#include <gtkmm/box.h> #include <gtkmm/box.h>
#include <string>
#include <vector>
#include "gtkmm2ext/visibility.h" #include "widgets/visibility.h"
namespace Gtkmm2ext { namespace ArdourWidgets {
class LIBGTKMM2EXT_API Choice : public Gtk::Dialog class LIBWIDGETS_API Choice : public Gtk::Dialog
{ {
public: public:
Choice (std::string title, std::string prompt, std::vector<std::string> choices, bool center = true); Choice (std::string title, std::string prompt, std::vector<std::string> choices, bool center = true);
@ -43,4 +44,4 @@ class LIBGTKMM2EXT_API Choice : public Gtk::Dialog
} /* namespace */ } /* namespace */
#endif // __pbd_gtkmm_choice_h__ #endif

3
libs/widgets/widgets/click_box.h
View file

@ -27,9 +27,8 @@
#include <string> #include <string>
#include <gtkmm.h> #include <gtkmm.h>
#include "gtkmm2ext/binding_proxy.h"
#include "widgets/auto_spin.h" #include "widgets/auto_spin.h"
#include "widgets/binding_proxy.h"
#include "widgets/visibility.h" #include "widgets/visibility.h"
namespace PBD { namespace PBD {

10
libs/gtkmm2ext/gtkmm2ext/eventboxext.h → libs/widgets/widgets/eventboxext.h
View file

@ -16,16 +16,16 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#ifndef __gtkmm2ext_eventbox_ext_h__ #ifndef _WIDGETS_EVENTBOX_EXT_H_
#define __gtkmm2ext_eventbox_ext_h__ #define _WIDGETS_EVENTBOX_EXT_H_
#include <gtkmm/eventbox.h> #include <gtkmm/eventbox.h>
#include "gtkmm2ext/visibility.h" #include "widgets/visibility.h"
namespace Gtkmm2ext { namespace ArdourWidgets {
class LIBGTKMM2EXT_API EventBoxExt : public Gtk::EventBox class LIBWIDGETS_API EventBoxExt : public Gtk::EventBox
{ {
public: public:
EventBoxExt (); EventBoxExt ();

17
libs/gtkmm2ext/gtkmm2ext/pane.h → libs/widgets/widgets/pane.h
View file

@ -17,8 +17,8 @@
*/ */
#ifndef __libgtkmm2ext_pane_h__ #ifndef _WIDGETS_PANE_H_
#define __libgtkmm2ext_pane_h__ #define _WIDGETS_PANE_H_
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
@ -30,20 +30,19 @@
#include <gtkmm/container.h> #include <gtkmm/container.h>
#include <gtkmm/eventbox.h> #include <gtkmm/eventbox.h>
#include "gtkmm2ext/visibility.h" #include "widgets/visibility.h"
namespace Gtk { namespace Gtk {
class Widget; class Widget;
} }
namespace Gtkmm2ext { namespace ArdourWidgets {
class LIBGTKMM2EXT_API Pane : public Gtk::Container class LIBWIDGETS_API Pane : public Gtk::Container
{ {
private: private:
class Divider; class Divider;
public: public:
struct Child struct Child
{ {
@ -117,13 +116,13 @@ class LIBGTKMM2EXT_API Pane : public Gtk::Container
void* child_destroyed (Gtk::Widget*); void* child_destroyed (Gtk::Widget*);
}; };
class LIBGTKMM2EXT_API HPane : public Pane class LIBWIDGETS_API HPane : public Pane
{ {
public: public:
HPane () : Pane (true) {} HPane () : Pane (true) {}
}; };
class LIBGTKMM2EXT_API VPane : public Pane class LIBWIDGETS_API VPane : public Pane
{ {
public: public:
VPane () : Pane (false) {} VPane () : Pane (false) {}
@ -131,4 +130,4 @@ class LIBGTKMM2EXT_API VPane : public Pane
} /* namespace */ } /* namespace */
#endif /* __libgtkmm2ext_pane_h__ */ #endif

12
libs/gtkmm2ext/gtkmm2ext/paths_dialog.h → libs/widgets/widgets/paths_dialog.h
View file

@ -16,18 +16,18 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#ifndef __gtkmmext_paths_dialog_h__ #ifndef _WIDGETS_PATHS_DIALOG_H_
#define __gtkmmext_paths_dialog_h__ #define _WIDGETS_PATHS_DIALOG_H_
#include <string> #include <string>
#include <vector> #include <vector>
#include <gtkmm.h> #include <gtkmm.h>
#include "gtkmm2ext/visibility.h" #include "widgets/visibility.h"
namespace Gtkmm2ext { namespace ArdourWidgets {
class LIBGTKMM2EXT_API PathsDialog : public Gtk::Dialog class LIBWIDGETS_API PathsDialog : public Gtk::Dialog
{ {
public: public:
PathsDialog (Gtk::Window& parent, std::string, std::string current_paths = "", std::string default_paths = ""); PathsDialog (Gtk::Window& parent, std::string, std::string current_paths = "", std::string default_paths = "");
@ -54,4 +54,4 @@ class LIBGTKMM2EXT_API PathsDialog : public Gtk::Dialog
} /* namespace */ } /* namespace */
#endif /* __gtkmmext_paths_dialog_h__ */ #endif

13
libs/gtkmm2ext/gtkmm2ext/popup.h → libs/widgets/widgets/popup.h
View file

@ -17,8 +17,8 @@
*/ */
#ifndef __qui_popup_h__ #ifndef _WIDGETS_POPUP_H_
#define __qui_popup_h__ #define _WIDGETS_POPUP_H_
#ifdef interface #ifdef interface
#undef interface #undef interface
@ -29,11 +29,11 @@
#include <pbd/touchable.h> #include <pbd/touchable.h>
#include "gtkmm2ext/visibility.h" #include "widgets/visibility.h"
namespace Gtkmm2ext { namespace ArdourWidgets {
class LIBGTKMM2EXT_API PopUp : public Gtk::Window, public Touchable class LIBWIDGETS_API PopUp : public Gtk::Window, public Touchable
{ {
public: public:
PopUp (Gtk::WindowPosition pos, unsigned int show_for_msecs = 0, PopUp (Gtk::WindowPosition pos, unsigned int show_for_msecs = 0,
@ -57,9 +57,8 @@ class LIBGTKMM2EXT_API PopUp : public Gtk::Window, public Touchable
static gint remove_prompt_timeout (void *); static gint remove_prompt_timeout (void *);
bool delete_on_hide; bool delete_on_hide;
unsigned int popdown_time; unsigned int popdown_time;
}; };
} /* namespace */ } /* namespace */
#endif // __qui_popup_h__ #endif

13
libs/gtkmm2ext/gtkmm2ext/prompter.h → libs/widgets/widgets/prompter.h
View file

@ -17,8 +17,8 @@
*/ */
#ifndef __gtkmm2ext_prompter_h__ #ifndef _WIDGETS_PROMPTER_H_
#define __gtkmm2ext_prompter_h__ #define _WIDGETS_PROMPTER_H_
#include <string> #include <string>
#include <gtkmm/box.h> #include <gtkmm/box.h>
@ -27,16 +27,15 @@
#include <gtkmm/dialog.h> #include <gtkmm/dialog.h>
#include <sigc++/sigc++.h> #include <sigc++/sigc++.h>
#include "gtkmm2ext/visibility.h" #include "widgets/visibility.h"
namespace Gtk { namespace Gtk {
class Window; class Window;
} }
namespace Gtkmm2ext { namespace ArdourWidgets {
class LIBGTKMM2EXT_API Prompter : public Gtk::Dialog
class LIBWIDGETS_API Prompter : public Gtk::Dialog
{ {
public: public:
Prompter (bool modal = false); Prompter (bool modal = false);
@ -75,4 +74,4 @@ class LIBGTKMM2EXT_API Prompter : public Gtk::Dialog
} /* namespace */ } /* namespace */
#endif /* __gtkmm2ext_prompter_h__ */ #endif

16
libs/gtkmm2ext/gtkmm2ext/scroomer.h → libs/widgets/widgets/scroomer.h
View file

@ -17,18 +17,18 @@
*/ */
#ifndef __gtkmm2ext_scroomer_h__ #ifndef _WIDGETS_SCROOMER_H_
#define __gtkmm2ext_scroomer_h__ #define _WIDGETS_SCROOMER_H_
#include <gdkmm.h>
#include <gtkmm/drawingarea.h> #include <gtkmm/drawingarea.h>
#include <gtkmm/adjustment.h> #include <gtkmm/adjustment.h>
#include <gdkmm.h>
#include "gtkmm2ext/visibility.h" #include "widgets/visibility.h"
namespace Gtkmm2ext { namespace ArdourWidgets {
class LIBGTKMM2EXT_API Scroomer : public Gtk::DrawingArea class LIBWIDGETS_API Scroomer : public Gtk::DrawingArea
{ {
public: public:
enum Component { enum Component {
@ -88,6 +88,6 @@ private:
bool pinch; bool pinch;
}; };
} // namespace } /* end namespace */
#endif /* __gtkmm2ext_scroomer_h__ */ #endif

4
libs/widgets/widgets/slider_controller.h
View file

@ -26,10 +26,8 @@
#include <gtkmm.h> #include <gtkmm.h>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include "gtkmm2ext/popup.h"
#include "gtkmm2ext/binding_proxy.h"
#include "widgets/ardour_fader.h" #include "widgets/ardour_fader.h"
#include "widgets/binding_proxy.h"
#include "widgets/visibility.h" #include "widgets/visibility.h"
namespace PBD { namespace PBD {

16
libs/gtkmm2ext/gtkmm2ext/stateful_button.h → libs/widgets/widgets/stateful_button.h
View file

@ -17,18 +17,18 @@
*/ */
#ifndef __pbd_gtkmm_abutton_h__ #ifndef _WIDGETS_STATEFUL_BUTTON_H_
#define __pbd_gtkmm_abutton_h__ #define _WIDGETS_STATEFUL_BUTTON_H_
#include <vector> #include <vector>
#include <gtkmm/togglebutton.h> #include <gtkmm/togglebutton.h>
#include "gtkmm2ext/visibility.h" #include "widgets/visibility.h"
namespace Gtkmm2ext { namespace ArdourWidgets {
class LIBGTKMM2EXT_API StateButton class LIBWIDGETS_API StateButton
{ {
public: public:
StateButton(); StateButton();
@ -55,7 +55,7 @@ class LIBGTKMM2EXT_API StateButton
}; };
class LIBGTKMM2EXT_API StatefulToggleButton : public StateButton, public Gtk::ToggleButton class LIBWIDGETS_API StatefulToggleButton : public StateButton, public Gtk::ToggleButton
{ {
public: public:
StatefulToggleButton(); StatefulToggleButton();
@ -73,7 +73,7 @@ class LIBGTKMM2EXT_API StatefulToggleButton : public StateButton, public Gtk::To
std::string get_widget_name() const { return get_name(); } std::string get_widget_name() const { return get_name(); }
}; };
class LIBGTKMM2EXT_API StatefulButton : public StateButton, public Gtk::Button class LIBWIDGETS_API StatefulButton : public StateButton, public Gtk::Button
{ {
public: public:
StatefulButton(); StatefulButton();
@ -90,6 +90,6 @@ class LIBGTKMM2EXT_API StatefulButton : public StateButton, public Gtk::Button
std::string get_widget_name() const { return get_name(); } std::string get_widget_name() const { return get_name(); }
}; };
}; } /* end namespace */
#endif #endif

16
libs/gtkmm2ext/gtkmm2ext/tabbable.h → libs/widgets/widgets/tabbable.h
View file

@ -17,8 +17,8 @@
*/ */
#ifndef __gtkmm2ext_tabbable_h__ #ifndef _WIDGETS_TABBABLE_H_
#define __gtkmm2ext_tabbable_h__ #define _WIDGETS_TABBABLE_H_
#include <gtkmm/bin.h> #include <gtkmm/bin.h>
#include <gtkmm/box.h> #include <gtkmm/box.h>
@ -28,7 +28,7 @@
#include <gtkmm/notebook.h> #include <gtkmm/notebook.h>
#include "gtkmm2ext/window_proxy.h" #include "gtkmm2ext/window_proxy.h"
#include "gtkmm2ext/visibility.h" #include "widgets/visibility.h"
namespace Gtk { namespace Gtk {
class Window; class Window;
@ -36,10 +36,13 @@ namespace Gtk {
} }
namespace Gtkmm2ext { namespace Gtkmm2ext {
class VisibilityTracker; class VisibilityTracker;
}
class LIBGTKMM2EXT_API Tabbable : public WindowProxy { namespace ArdourWidgets {
class LIBWIDGETS_API Tabbable : public Gtkmm2ext::WindowProxy
{
public: public:
Tabbable (Gtk::Widget&, const std::string&, bool tabbed_by_default = true); Tabbable (Gtk::Widget&, const std::string&, bool tabbed_by_default = true);
~Tabbable (); ~Tabbable ();
@ -94,7 +97,6 @@ class LIBGTKMM2EXT_API Tabbable : public WindowProxy {
void window_unmapped (); void window_unmapped ();
}; };
} /* end namespace */
}
#endif #endif

14
libs/gtkmm2ext/gtkmm2ext/tearoff.h → libs/widgets/widgets/tearoff.h
View file

@ -17,21 +17,21 @@
*/ */
#ifndef __gtkmm2ext_tearoff_h__ #ifndef _WIDGETS_TEAROFF_H_
#define __gtkmm2ext_tearoff_h__ #define _WIDGETS_TEAROFF_H_
#include <gtkmm/window.h>
#include <gtkmm/arrow.h> #include <gtkmm/arrow.h>
#include <gtkmm/box.h> #include <gtkmm/box.h>
#include <gtkmm/eventbox.h> #include <gtkmm/eventbox.h>
#include <gtkmm/window.h>
#include "gtkmm2ext/visibility.h" #include "widgets/visibility.h"
class XMLNode; class XMLNode;
namespace Gtkmm2ext { namespace ArdourWidgets {
class LIBGTKMM2EXT_API TearOff : public Gtk::HBox class LIBWIDGETS_API TearOff : public Gtk::HBox
{ {
public: public:
TearOff (Gtk::Widget& contents, bool allow_resize = false); TearOff (Gtk::Widget& contents, bool allow_resize = false);
@ -89,4 +89,4 @@ class LIBGTKMM2EXT_API TearOff : public Gtk::HBox
} /* namespace */ } /* namespace */
#endif // __gtkmm2ext_tearoff_h__ #endif

12
libs/widgets/wscript
View file

@ -30,16 +30,28 @@ widgets_sources = [
'ardour_display.cc', 'ardour_display.cc',
'ardour_dropdown.cc', 'ardour_dropdown.cc',
'ardour_fader.cc', 'ardour_fader.cc',
'ardour_icon.cc',
'ardour_knob.cc', 'ardour_knob.cc',
'ardour_spacer.cc', 'ardour_spacer.cc',
'ardour_spinner.cc', 'ardour_spinner.cc',
'auto_spin.cc', 'auto_spin.cc',
'barcontroller.cc', 'barcontroller.cc',
'binding_proxy.cc',
'eventboxext.cc',
'choice.cc',
'click_box.cc', 'click_box.cc',
'fastmeter.cc', 'fastmeter.cc',
'focus_entry.cc', 'focus_entry.cc',
'pane.cc',
'paths_dialog.cc',
'popup.cc',
'prompter.cc',
'scroomer.cc',
'searchbar.cc', 'searchbar.cc',
'slider_controller.cc', 'slider_controller.cc',
'stateful_button.cc',
'tabbable.cc',
'tearoff.cc',
'tooltips.cc', 'tooltips.cc',
'ui_config.cc', 'ui_config.cc',
] ]