diff options
-rw-r--r-- | gtk2_ardour/ardour_ui.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/ardour_ui2.cc | 40 | ||||
-rw-r--r-- | gtk2_ardour/ardour_ui_ed.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/editor.cc | 112 | ||||
-rw-r--r-- | gtk2_ardour/editor.h | 4 | ||||
-rw-r--r-- | gtk2_ardour/editor_mixer.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/pixmaps/tool_object.xpm | 31 | ||||
-rw-r--r-- | gtk2_ardour/pixmaps/tool_stretch.xpm | 8 | ||||
-rw-r--r-- | gtk2_ardour/pixmaps/zoom_full.xpm | 37 | ||||
-rw-r--r-- | libs/gtkmm2ext/tearoff.cc | 4 |
10 files changed, 94 insertions, 148 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index a558f004db..4219005d96 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -123,7 +123,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], string rcfile) auto_play_button (_("Autuo Play")), auto_input_button (_("Auto Input")), click_button (_("Click")), - auditioning_alert_button (_("AUDITIONING")), + auditioning_alert_button (_("AUDITION")), solo_alert_button (_("SOLO")), shown_flag (false) diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 663f78301b..44287fe61e 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -362,7 +362,7 @@ ARDOUR_UI::setup_transport () alert_box.pack_start (solo_alert_button, false, false); alert_box.pack_start (auditioning_alert_button, false, false); - transport_tearoff_hbox.set_border_width (4); + transport_tearoff_hbox.set_border_width (3); transport_tearoff_hbox.pack_start (goto_start_button, false, false); transport_tearoff_hbox.pack_start (goto_end_button, false, false); @@ -398,6 +398,7 @@ ARDOUR_UI::setup_transport () mtc_port_changed (); sync_option_combo.set_active_text (positional_sync_strings.front()); sync_option_combo.signal_changed().connect (mem_fun (*this, &ARDOUR_UI::sync_option_changed)); + Gtkmm2ext::set_size_request_to_display_given_text (sync_option_combo, "Internal", 22, 10); shbox->pack_start (*sdframe, false, false); shbox->pack_start (shuttle_units_button, true, true); @@ -406,13 +407,13 @@ ARDOUR_UI::setup_transport () svbox->pack_start (*sframe, false, false); svbox->pack_start (*shbox, false, false); - transport_tearoff_hbox.pack_start (*svbox, false, false, 5); + transport_tearoff_hbox.pack_start (*svbox, false, false, 3); transport_tearoff_hbox.pack_start (auto_loop_button, false, false); transport_tearoff_hbox.pack_start (play_selection_button, false, false); transport_tearoff_hbox.pack_start (roll_button, false, false); transport_tearoff_hbox.pack_start (stop_button, false, false); - transport_tearoff_hbox.pack_start (rec_button, false, false, 8); + transport_tearoff_hbox.pack_start (rec_button, false, false, 6); HBox* clock_box = manage (new HBox); clock_box->pack_start (primary_clock, false, false); @@ -420,35 +421,38 @@ ARDOUR_UI::setup_transport () VBox* time_controls_box = manage (new VBox); time_controls_box->pack_start (sync_option_combo, false, false); time_controls_box->pack_start (time_master_button, false, false); - clock_box->pack_start (*time_controls_box, false, false, 2); - transport_tearoff_hbox.pack_start (*clock_box, false, false, 4); + clock_box->pack_start (*time_controls_box, false, false, 1); + transport_tearoff_hbox.pack_start (*clock_box, false, false, 0); + + HBox* toggle_box = manage(new HBox); VBox* punch_box = manage (new VBox); punch_box->pack_start (punch_in_button, false, false); punch_box->pack_start (punch_out_button, false, false); - transport_tearoff_hbox.pack_start (*punch_box, false, false); + toggle_box->pack_start (*punch_box, false, false); VBox* auto_box = manage (new VBox); auto_box->pack_start (auto_play_button, false, false); auto_box->pack_start (auto_return_button, false, false); - transport_tearoff_hbox.pack_start (*auto_box, false, false); + toggle_box->pack_start (*auto_box, false, false); VBox* io_box = manage (new VBox); io_box->pack_start (auto_input_button, false, false); io_box->pack_start (click_button, false, false); - transport_tearoff_hbox.pack_start (*io_box, false, false); + toggle_box->pack_start (*io_box, false, false); /* desensitize */ set_transport_sensitivity (false); -// transport_tearoff_hbox.pack_start (preroll_button, false, false); -// transport_tearoff_hbox.pack_start (preroll_clock, false, false); +// toggle_box->pack_start (preroll_button, false, false); +// toggle_box->pack_start (preroll_clock, false, false); -// transport_tearoff_hbox.pack_start (postroll_button, false, false); -// transport_tearoff_hbox.pack_start (postroll_clock, false, false); +// toggle_box->pack_start (postroll_button, false, false); +// toggle_box->pack_start (postroll_clock, false, false); - transport_tearoff_hbox.pack_start (alert_box, false, false, 5); + transport_tearoff_hbox.pack_start (*toggle_box, false, false, 4); + transport_tearoff_hbox.pack_start (alert_box, false, false); } void @@ -832,7 +836,7 @@ ARDOUR_UI::set_shuttle_units (ShuttleUnits u) shuttle_units_button.set_label("% "); break; case Semitones: - shuttle_units_button.set_label(_("st")); + shuttle_units_button.set_label(_("ST")); break; } } @@ -876,7 +880,7 @@ ARDOUR_UI::update_speed_display () { if (!session) { if (last_speed_displayed != 0) { - speed_display_label.set_text (_("stopped")); + speed_display_label.set_text (_("stop")); last_speed_displayed = 0; } return; @@ -889,7 +893,7 @@ ARDOUR_UI::update_speed_display () if (x != 0) { if (shuttle_units == Percentage) { - snprintf (buf, sizeof (buf), "%.4f", x); + snprintf (buf, sizeof (buf), "%.2f", x); } else { if (x < 0) { snprintf (buf, sizeof (buf), "< %.1f", 12.0 * fast_log2 (-x)); @@ -899,7 +903,7 @@ ARDOUR_UI::update_speed_display () } speed_display_label.set_text (buf); } else { - speed_display_label.set_text (_("stopped")); + speed_display_label.set_text (_("stop")); } last_speed_displayed = x; @@ -916,7 +920,7 @@ ARDOUR_UI::set_transport_sensitivity (bool yn) void ARDOUR_UI::editor_realized () { - set_size_request_to_display_given_text (speed_display_box, _("stopped"), 2, 2); + set_size_request_to_display_given_text (speed_display_box, _("-0.55"), 2, 2); /* XXX: this should really be saved in instant.xml or something similar and restored from there */ shuttle_style_button.set_active_text (_("sprung")); const guint32 FUDGE = 20; // Combo's are stupid - they steal space from the entry for the button diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index feea76a178..d3e96f0bcc 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -292,7 +292,7 @@ ARDOUR_UI::install_actions () ActionManager::session_sensitive_actions.push_back (act); ActionManager::transport_sensitive_actions.push_back (act); - act = ActionManager::register_toggle_action (transport_actions, X_("ToggleTimeMaster"), _("Time Master"), mem_fun(*this, &ARDOUR_UI::toggle_time_master)); + act = ActionManager::register_toggle_action (transport_actions, X_("ToggleTimeMaster"), _("Master"), mem_fun(*this, &ARDOUR_UI::toggle_time_master)); ActionManager::session_sensitive_actions.push_back (act); act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack1"), _("Toggle Record Enable Track1"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 0U)); diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 733ae3a3ce..55358d2632 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -101,8 +101,8 @@ static const int32_t slide_index = 0; static const int32_t splice_index = 1; static const gchar *edit_mode_strings[] = { - N_("Slide"), - N_("Splice"), + N_("Slide Edit"), + N_("Splice Edit"), 0 }; @@ -204,8 +204,6 @@ Editor::Editor (AudioEngine& eng) /* tool bar related */ - selection_start_clock (X_("SelectionStartClock"), true), - selection_end_clock (X_("SelectionEndClock"), true), edit_cursor_clock (X_("EditCursorClock"), true), zoom_range_clock (X_("ZoomRangeClock"), true, true), @@ -339,6 +337,7 @@ Editor::Editor (AudioEngine& eng) reset_hscrollbar_stepping (); zoom_focus = ZoomFocusLeft; + set_zoom_focus (ZoomFocusLeft); zoom_range_clock.ValueChanged.connect (mem_fun(*this, &Editor::zoom_adjustment_changed)); initialize_rulers (); @@ -1207,8 +1206,6 @@ Editor::connect_to_session (Session *t) edit_groups_changed (); edit_cursor_clock.set_session (session); - selection_start_clock.set_session (session); - selection_end_clock.set_session (session); zoom_range_clock.set_session (session); _playlist_selector->set_session (session); nudge_clock.set_session (session); @@ -2553,42 +2550,32 @@ Editor::setup_toolbar () const guint32 FUDGE = 18; // Combo's are stupid - they steal space from the entry for the button + /* Mode Buttons (tool selection) */ vector<ToggleButton *> mouse_mode_buttons; mouse_move_button.add (*(manage (new Image (get_xpm("tool_object.xpm"))))); + mouse_move_button.set_relief(Gtk::RELIEF_NONE); mouse_mode_buttons.push_back (&mouse_move_button); mouse_select_button.add (*(manage (new Image (get_xpm("tool_range.xpm"))))); + mouse_select_button.set_relief(Gtk::RELIEF_NONE); mouse_mode_buttons.push_back (&mouse_select_button); mouse_gain_button.add (*(manage (new Image (get_xpm("tool_gain.xpm"))))); + mouse_gain_button.set_relief(Gtk::RELIEF_NONE); mouse_mode_buttons.push_back (&mouse_gain_button); mouse_zoom_button.add (*(manage (new Image (get_xpm("tool_zoom.xpm"))))); + mouse_zoom_button.set_relief(Gtk::RELIEF_NONE); mouse_mode_buttons.push_back (&mouse_zoom_button); mouse_timefx_button.add (*(manage (new Image (get_xpm("tool_stretch.xpm"))))); + mouse_timefx_button.set_relief(Gtk::RELIEF_NONE); mouse_mode_buttons.push_back (&mouse_timefx_button); mouse_audition_button.add (*(manage (new Image (get_xpm("tool_audition.xpm"))))); + mouse_audition_button.set_relief(Gtk::RELIEF_NONE); mouse_mode_buttons.push_back (&mouse_audition_button); mouse_mode_button_set = new GroupedButtons (mouse_mode_buttons); - /* - mouse_mode_button_table.set_homogeneous (true); - mouse_mode_button_table.set_col_spacings (1); - mouse_mode_button_table.set_row_spacings (1); - mouse_mode_button_table.set_border_width (2); - - mouse_mode_button_table.attach (mouse_move_button, 0, 1, 0, 1); - mouse_mode_button_table.attach (mouse_select_button, 1, 2, 0, 1); - mouse_mode_button_table.attach (mouse_zoom_button, 2, 3, 0, 1); - - mouse_mode_button_table.attach (mouse_gain_button, 0, 1, 1, 2); - mouse_mode_button_table.attach (mouse_timefx_button, 1, 2, 1, 2); - mouse_mode_button_table.attach (mouse_audition_button, 2, 3, 1, 2); - - mouse_mode_tearoff = manage (new TearOff (mouse_mode_button_table)); - */ - HBox* mode_box = manage(new HBox); mode_box->set_border_width (2); mode_box->set_spacing(4); @@ -2601,13 +2588,14 @@ Editor::setup_toolbar () mouse_mode_button_box.pack_start(mouse_audition_button, true, true); mouse_mode_button_box.set_homogeneous(true); + // This one needs a little more "FUDGE" on my machine at least.. edit_mode_selector.set_name ("EditModeSelector"); - Gtkmm2ext::set_size_request_to_display_given_text (edit_mode_selector, "Splice", 2+FUDGE, 10); + Gtkmm2ext::set_size_request_to_display_given_text (edit_mode_selector, "Splice Edit", 3+FUDGE, 10); set_popdown_strings (edit_mode_selector, internationalize (edit_mode_strings)); edit_mode_selector.signal_changed().connect (mem_fun(*this, &Editor::edit_mode_selection_done)); - mode_box->pack_start(mouse_mode_button_box); mode_box->pack_start(edit_mode_selector); + mode_box->pack_start(mouse_mode_button_box); mouse_mode_tearoff = manage (new TearOff (*mode_box)); mouse_mode_tearoff->set_name ("MouseModeBase"); @@ -2709,40 +2697,22 @@ Editor::setup_toolbar () snap_box.pack_start (snap_mode_selector, false, false); snap_box.pack_start (snap_type_selector, false, false); - /* automation control */ - - /*global_automation_button.set_name ("MouseModeButton"); - automation_mode_button.set_name ("MouseModeButton"); - automation_box.set_spacing (2); - automation_box.set_border_width (2); - automation_box.pack_start (global_automation_button, false, false); - automation_box.pack_start (automation_mode_button, false, false);*/ + /* Nudge */ - /* Selection/cursor clocks */ + HBox *nudge_box = manage (new HBox); + nudge_box->set_spacing(1); + nudge_box->set_border_width (2); - toolbar_selection_cursor_label.set_name ("ToolBarLabel"); - selection_start_clock_label.set_name ("ToolBarLabel"); - selection_end_clock_label.set_name ("ToolBarLabel"); - - selection_start_clock_label.set_text (_("Start:")); - selection_end_clock_label.set_text (_("End:")); + nudge_forward_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::nudge_forward), false)); + nudge_backward_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::nudge_backward), false)); - /* the zoom in/out buttons are generally taller than the clocks, so - put all the toolbar clocks into a size group with one of the - buttons to make them all equal height. + nudge_box->pack_start (nudge_backward_button, false, false); + nudge_box->pack_start (nudge_forward_button, false, false); + nudge_box->pack_start (nudge_clock, false, false); - this also applies to the various toolbar combos - */ - /*RefPtr<SizeGroup> toolbar_clock_size_group = SizeGroup::create (SIZE_GROUP_VERTICAL); - toolbar_clock_size_group->add_widget (zoom_out_button); - toolbar_clock_size_group->add_widget (edit_cursor_clock); - toolbar_clock_size_group->add_widget (zoom_range_clock); - toolbar_clock_size_group->add_widget (nudge_clock); - toolbar_clock_size_group->add_widget (edit_mode_selector); - toolbar_clock_size_group->add_widget (snap_type_selector); - toolbar_clock_size_group->add_widget (snap_mode_selector);*/ + /* Pack everything in... */ HBox* hbox = new HBox; hbox->set_spacing(10); @@ -2760,32 +2730,14 @@ Editor::setup_toolbar () &tools_tearoff->tearoff_window(), 0)); toolbar_hbox.set_spacing (10); - toolbar_hbox.set_border_width (2); + toolbar_hbox.set_border_width (1); toolbar_hbox.pack_start (*mouse_mode_tearoff, false, false); toolbar_hbox.pack_start (*tools_tearoff, false, false); + hbox->pack_start (snap_box, false, false); hbox->pack_start (zoom_box, false, false); - hbox->pack_start (edit_mode_box, false, false); - - //VBox *nudge_vbox = manage (new VBox); - - //nudge_vbox->set_border_width (2); - - HBox *nudge_box = manage (new HBox); - nudge_box->set_spacing(1); - nudge_box->set_border_width (2); - - nudge_forward_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::nudge_forward), false)); - nudge_backward_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::nudge_backward), false)); - - nudge_box->pack_start (nudge_backward_button, false, false); - nudge_box->pack_start (nudge_forward_button, false, false); - nudge_box->pack_start (nudge_clock, false, false); - - //nudge_vbox->pack_start (*nudge_box, false, false); - hbox->pack_start (*nudge_box, false, false); hbox->show_all (); @@ -3577,9 +3529,9 @@ Editor::edit_mode_selection_done () string choice = edit_mode_selector.get_active_text(); EditMode mode = Slide; - if (choice == _("Splice")) { + if (choice == _("Splice Edit")) { mode = Splice; - } else if (choice == _("Slide")) { + } else if (choice == _("Slide Edit")) { mode = Slide; } @@ -3670,15 +3622,15 @@ Editor::zoom_focus_selection_done () string choice = zoom_focus_selector.get_active_text(); ZoomFocus focus_type = ZoomFocusLeft; - if (choice == _("Left")) { + if (choice == _("Focus Left")) { focus_type = ZoomFocusLeft; - } else if (choice == _("Right")) { + } else if (choice == _("Focus Right")) { focus_type = ZoomFocusRight; - } else if (choice == _("Center")) { + } else if (choice == _("Focus Center")) { focus_type = ZoomFocusCenter; - } else if (choice == _("Playhead")) { + } else if (choice == _("Focus Playhead")) { focus_type = ZoomFocusPlayhead; - } else if (choice == _("Edit Cursor")) { + } else if (choice == _("Focus Edit Cursor")) { focus_type = ZoomFocusEdit; } diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 5b197ae862..e04e7fe125 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -1264,10 +1264,6 @@ class Editor : public PublicEditor void editor_mixer_button_toggled (); - AudioClock selection_start_clock; - Gtk::Label selection_start_clock_label; - AudioClock selection_end_clock; - Gtk::Label selection_end_clock_label; AudioClock edit_cursor_clock; AudioClock zoom_range_clock; Gtk::Button zoom_in_button; diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc index a55b6f2066..7a9c6d4153 100644 --- a/gtk2_ardour/editor_mixer.cc +++ b/gtk2_ardour/editor_mixer.cc @@ -270,8 +270,6 @@ Editor::session_going_away () group_model->clear (); edit_cursor_clock.set_session (0); - selection_start_clock.set_session (0); - selection_end_clock.set_session (0); zoom_range_clock.set_session (0); nudge_clock.set_session (0); diff --git a/gtk2_ardour/pixmaps/tool_object.xpm b/gtk2_ardour/pixmaps/tool_object.xpm index a2e6fe68c5..3d18ab8af7 100644 --- a/gtk2_ardour/pixmaps/tool_object.xpm +++ b/gtk2_ardour/pixmaps/tool_object.xpm @@ -1,23 +1,18 @@ /* XPM */ static char * tool_object_xpm[] = { -"16 12 8 1", +"16 12 3 1", " c None", ". c #000000", -"+ c #444444", -"@ c #888888", -"# c #CC9966", -"$ c #DDDDDD", -"% c #FFCC99", -"& c #FFFFFF", +"+ c #FFFFFF", " ... ", -" .&. ", -" .&. ", -" .&. ", -" .&..... ", -" .&.&.&... ", -" ...&.&.&.&. ", -" .&.&&&&&&&. ", -" .&&&&&&&&&. ", -" ...&&&&&&.. ", -" ..&&&&&. ", -" .&&&&&. "}; +" .+. ", +" .+. ", +" .+. ", +" .+..... ", +" .+.+.+... ", +" ...+.+.+.+. ", +" .+.+++++++. ", +" .+++++++++. ", +" ..+++++++.. ", +" ...+++++. ", +" .+++++. "}; diff --git a/gtk2_ardour/pixmaps/tool_stretch.xpm b/gtk2_ardour/pixmaps/tool_stretch.xpm index fa9fd333aa..77943cd7d4 100644 --- a/gtk2_ardour/pixmaps/tool_stretch.xpm +++ b/gtk2_ardour/pixmaps/tool_stretch.xpm @@ -11,8 +11,8 @@ static char * tool_stretch_xpm[] = { ".++..........++.", " .+. .+. ", " .. .. ", -" + + ", -" + + + + + + + ", +" + + + + ", +" ++ +++ + + +++ ", "++++++++++++++++", -" + + + + + ", -" + + + "}; +" ++ + ++ + + ", +" + + + + "}; diff --git a/gtk2_ardour/pixmaps/zoom_full.xpm b/gtk2_ardour/pixmaps/zoom_full.xpm index f902403722..5564074875 100644 --- a/gtk2_ardour/pixmaps/zoom_full.xpm +++ b/gtk2_ardour/pixmaps/zoom_full.xpm @@ -1,29 +1,30 @@ /* XPM */ static char * zoom_full_xpm[] = { -"12 12 14 1", +"12 12 15 1", " c None", ". c #000000", "+ c #474747", "@ c #E7E7E7", "# c #F6F6F6", "$ c #DCDCDC", -"% c #FFFFFF", -"& c #DFDFDF", -"* c #D7D7D7", -"= c #D6D6D6", -"- c #040404", -"; c #070707", -"> c #060606", -", c #050505", +"% c #ACACAC", +"& c #FFFFFF", +"* c #DFDFDF", +"= c #D7D7D7", +"- c #D6D6D6", +"; c #040404", +"> c #070707", +", c #060606", +"' c #050505", " ... ", " +.@#$.+ ", -" .%%.%%. ", -".&%..%%*. ", -".#%%.%%#. ", -".$%%.%%&. ", -" .%...%.+ ", -" +.*#=... ", +" .%&&&%. ", +".*..&..=. ", +".#.&&&.#. ", +".$..&..*. ", +" .%&&&%.+ ", +" +.=#-... ", " ...+... ", -" -.; ", -" >.-", -" ,."}; +" ;.> ", +" ,.;", +" '."}; diff --git a/libs/gtkmm2ext/tearoff.cc b/libs/gtkmm2ext/tearoff.cc index 9f915d8227..529cca15e3 100644 --- a/libs/gtkmm2ext/tearoff.cc +++ b/libs/gtkmm2ext/tearoff.cc @@ -51,7 +51,7 @@ TearOff::TearOff (Widget& c, bool allow_resize) VBox* box1; box1 = manage (new VBox); - box1->pack_start (close_event_box, false, false, 5); + box1->pack_start (close_event_box, false, false, 2); window_box.pack_end (*box1, false, false, 2); own_window.add (window_box); @@ -67,7 +67,7 @@ TearOff::TearOff (Widget& c, bool allow_resize) VBox* box2; box2 = manage (new VBox); - box2->pack_start (tearoff_event_box, false, false, 5); + box2->pack_start (tearoff_event_box, false, false, 2); pack_start (contents); pack_start (*box2, false, false, 2); |