From 6bcee4e9c83f8b48e75058a61cae0ff351800b67 Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Wed, 26 Mar 2014 11:37:09 -0500 Subject: [PATCH] rename ArdourMenu to ArdourDropdown --- .../{ardour_menu.cc => ardour_dropdown.cc} | 12 +++++------ .../{ardour_menu.h => ardour_dropdown.h} | 10 ++++----- gtk2_ardour/editor.h | 21 ++++++++++--------- gtk2_ardour/wscript | 2 +- 4 files changed, 23 insertions(+), 22 deletions(-) rename gtk2_ardour/{ardour_menu.cc => ardour_dropdown.cc} (86%) rename gtk2_ardour/{ardour_menu.h => ardour_dropdown.h} (84%) diff --git a/gtk2_ardour/ardour_menu.cc b/gtk2_ardour/ardour_dropdown.cc similarity index 86% rename from gtk2_ardour/ardour_menu.cc rename to gtk2_ardour/ardour_dropdown.cc index 30f0670313..3e214ef9e8 100644 --- a/gtk2_ardour/ardour_menu.cc +++ b/gtk2_ardour/ardour_dropdown.cc @@ -33,7 +33,7 @@ #include "ardour/rc_configuration.h" // for widget prelight preference -#include "ardour_menu.h" +#include "ardour_dropdown.h" #include "ardour_ui.h" #include "global_signals.h" @@ -50,20 +50,20 @@ using std::min; using namespace std; -ArdourMenu::ArdourMenu (Element e) +ArdourDropdown::ArdourDropdown (Element e) { - signal_button_press_event().connect (sigc::mem_fun(*this, &ArdourMenu::on_mouse_pressed)); + signal_button_press_event().connect (sigc::mem_fun(*this, &ArdourDropdown::on_mouse_pressed)); add_elements(e); add_elements(ArdourButton::Menu); } -ArdourMenu::~ArdourMenu () +ArdourDropdown::~ArdourDropdown () { } bool -ArdourMenu::on_mouse_pressed (GdkEventButton*) +ArdourDropdown::on_mouse_pressed (GdkEventButton*) { _menu.popup (1, gtk_get_current_event_time()); return true; @@ -71,7 +71,7 @@ ArdourMenu::on_mouse_pressed (GdkEventButton*) void -ArdourMenu::AddMenuElem (Menu_Helpers::MenuElem e) +ArdourDropdown::AddMenuElem (Menu_Helpers::MenuElem e) { using namespace Menu_Helpers; diff --git a/gtk2_ardour/ardour_menu.h b/gtk2_ardour/ardour_dropdown.h similarity index 84% rename from gtk2_ardour/ardour_menu.h rename to gtk2_ardour/ardour_dropdown.h index 92f55f0bee..b9144c97f7 100644 --- a/gtk2_ardour/ardour_menu.h +++ b/gtk2_ardour/ardour_dropdown.h @@ -16,8 +16,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef __gtk2_ardour_ardour_menu_h__ -#define __gtk2_ardour_ardour_menu_h__ +#ifndef __gtk2_ardour_ardour_dropdown_h__ +#define __gtk2_ardour_ardour_dropdown_h__ #include #include @@ -29,12 +29,12 @@ #include "ardour_button.h" -class ArdourMenu : public ArdourButton +class ArdourDropdown : public ArdourButton { public: - ArdourMenu (Element e = default_elements); - virtual ~ArdourMenu (); + ArdourDropdown (Element e = default_elements); + virtual ~ArdourDropdown (); bool on_mouse_pressed (GdkEventButton*); diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 38045f2574..0159476d72 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -51,7 +51,7 @@ #include "gtk-custom-ruler.h" #include "ardour_button.h" #include "ardour_dialog.h" -#include "ardour_menu.h" +#include "ardour_dropdown.h" #include "public_editor.h" #include "editing.h" #include "enums.h" @@ -1565,10 +1565,11 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD ArdourButton tav_expand_button; ArdourButton tav_shrink_button; - ArdourMenu visible_tracks_selector; - int32_t _visible_track_count; - void build_track_count_menu (); - void set_visible_track_count (int32_t); + ArdourDropdown visible_tracks_selector; + + int32_t _visible_track_count; + void build_track_count_menu (); + void set_visible_track_count (int32_t); Gtk::VBox toolbar_clock_vbox; Gtk::VBox toolbar_selection_clock_vbox; @@ -1600,7 +1601,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD Gtk::Button automation_mode_button; //edit mode menu stuff - ArdourMenu edit_mode_selector; + ArdourDropdown edit_mode_selector; void edit_mode_selection_done ( ARDOUR::EditMode m ); void build_edit_mode_menu (); Gtk::VBox edit_mode_box; @@ -1609,10 +1610,10 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void set_edit_mode (ARDOUR::EditMode); void cycle_edit_mode (); - ArdourMenu snap_type_selector; + ArdourDropdown snap_type_selector; void build_snap_type_menu (); - ArdourMenu snap_mode_selector; + ArdourDropdown snap_mode_selector; void build_snap_mode_menu (); Gtk::HBox snap_box; @@ -1628,7 +1629,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD Glib::RefPtr snap_mode_action (Editing::SnapMode); //zoom focus meu stuff - ArdourMenu zoom_focus_selector; + ArdourDropdown zoom_focus_selector; void zoom_focus_selection_done ( Editing::ZoomFocus f ); void build_zoom_focus_menu (); std::vector zoom_focus_strings; @@ -1954,7 +1955,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD Editing::EditPoint _edit_point; - ArdourMenu edit_point_selector; + ArdourDropdown edit_point_selector; void build_edit_point_menu(); void set_edit_point_preference (Editing::EditPoint ep, bool force = false); diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 1340c46fcf..623d537bea 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -25,7 +25,7 @@ gtk2_ardour_sources = [ 'analysis_window.cc', 'ardour_button.cc', 'ardour_dialog.cc', - 'ardour_menu.cc', + 'ardour_dropdown.cc', 'ardour_ui.cc', 'ardour_ui2.cc', 'ardour_ui_dependents.cc',