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

Tidy up window titles, according to GNOME HIG and as suggested in mantis 2803.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@5805 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2009-10-19 17:25:37 +00:00
parent 539a692b0e
commit 09ec342926
24 changed files with 40 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gtk2_ardour/add_route_dialog.cc
View file

@ -24,7 +24,6 @@
#include <gtkmm/stock.h> #include <gtkmm/stock.h>
#include <gtkmm/separator.h> #include <gtkmm/separator.h>
#include <gtkmm/table.h> #include <gtkmm/table.h>
#include <gtkmm2ext/window_title.h>
#include "pbd/error.h" #include "pbd/error.h"
#include "pbd/convert.h" #include "pbd/convert.h"
@ -78,9 +77,7 @@ AddRouteDialog::AddRouteDialog (Session & s)
set_skip_taskbar_hint (true); set_skip_taskbar_hint (true);
set_resizable (false); set_resizable (false);
WindowTitle title(Glib::get_application_name()); set_title (_("Add Track/Bus"));
title += _("Add Route");
set_title(title.get_string());
name_template_entry.set_name (X_("AddRouteDialogNameTemplateEntry")); name_template_entry.set_name (X_("AddRouteDialogNameTemplateEntry"));
routes_spinner.set_name (X_("AddRouteDialogSpinner")); routes_spinner.set_name (X_("AddRouteDialogSpinner"));

2
gtk2_ardour/analysis_window.cc
View file

@ -57,7 +57,7 @@ AnalysisWindow::AnalysisWindow() :
fft_graph (16384) fft_graph (16384)
{ {
set_name(_("FFT analysis window")); set_name(_("FFT analysis window"));
set_title(_("FFT analysis window")); set_title (_("Spectral Analysis"));
track_list_ready = false; track_list_ready = false;

6
gtk2_ardour/ardour_ui.cc
View file

@ -1211,7 +1211,7 @@ ARDOUR_UI::open_session ()
/* ardour sessions are folders */ /* ardour sessions are folders */
open_session_selector = new Gtk::FileChooserDialog (_("open session"), FILE_CHOOSER_ACTION_OPEN); open_session_selector = new Gtk::FileChooserDialog (_("Open Session"), FILE_CHOOSER_ACTION_OPEN);
open_session_selector->add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); open_session_selector->add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
open_session_selector->add_button (Gtk::Stock::OPEN, Gtk::RESPONSE_ACCEPT); open_session_selector->add_button (Gtk::Stock::OPEN, Gtk::RESPONSE_ACCEPT);
open_session_selector->set_default_response(Gtk::RESPONSE_ACCEPT); open_session_selector->set_default_response(Gtk::RESPONSE_ACCEPT);
@ -1860,6 +1860,7 @@ ARDOUR_UI::snapshot_session ()
prompter.set_name ("Prompter"); prompter.set_name ("Prompter");
prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT); prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
prompter.set_title (_("Take Snapshot"));
prompter.set_prompt (_("Name of New Snapshot")); prompter.set_prompt (_("Name of New Snapshot"));
prompter.set_initial_text (timebuf); prompter.set_initial_text (timebuf);
@ -1971,7 +1972,6 @@ ARDOUR_UI::transport_rec_enable_blink (bool onoff)
void void
ARDOUR_UI::save_template () ARDOUR_UI::save_template ()
{ {
ArdourPrompter prompter (true); ArdourPrompter prompter (true);
string name; string name;
@ -1981,6 +1981,7 @@ ARDOUR_UI::save_template ()
} }
prompter.set_name (X_("Prompter")); prompter.set_name (X_("Prompter"));
prompter.set_title (_("Save Mix Template"));
prompter.set_prompt (_("Name for mix template:")); prompter.set_prompt (_("Name for mix template:"));
prompter.set_initial_text(session->name() + _("-template")); prompter.set_initial_text(session->name() + _("-template"));
prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT); prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
@ -2126,6 +2127,7 @@ ARDOUR_UI::ask_about_loading_existing_session (const Glib::ustring& session_path
msg.set_name (X_("CleanupDialog")); msg.set_name (X_("CleanupDialog"));
msg.set_title (_("Cleanup Unused Sources"));
msg.set_wmclass (X_("existing_session"), "Ardour"); msg.set_wmclass (X_("existing_session"), "Ardour");
msg.set_position (Gtk::WIN_POS_MOUSE); msg.set_position (Gtk::WIN_POS_MOUSE);
pop_back_splash (); pop_back_splash ();

8
gtk2_ardour/ardour_ui_ed.cc
View file

@ -152,7 +152,7 @@ ARDOUR_UI::install_actions ()
act = ActionManager::register_action (main_actions, X_("Export"), _("Export")); act = ActionManager::register_action (main_actions, X_("Export"), _("Export"));
ActionManager::session_sensitive_actions.push_back (act); ActionManager::session_sensitive_actions.push_back (act);
act = ActionManager::register_action (main_actions, X_("CleanupUnused"), _("Cleanup Unused Sources"), mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::cleanup)); act = ActionManager::register_action (main_actions, X_("CleanupUnused"), _("Cleanup Unused Sources..."), mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::cleanup));
ActionManager::session_sensitive_actions.push_back (act); ActionManager::session_sensitive_actions.push_back (act);
ActionManager::write_sensitive_actions.push_back (act); ActionManager::write_sensitive_actions.push_back (act);
@ -217,7 +217,7 @@ ARDOUR_UI::install_actions ()
ActionManager::session_sensitive_actions.push_back (act); ActionManager::session_sensitive_actions.push_back (act);
ActionManager::register_action (common_actions, X_("About"), _("About"), mem_fun(*this, &ARDOUR_UI::show_about)); ActionManager::register_action (common_actions, X_("About"), _("About"), mem_fun(*this, &ARDOUR_UI::show_about));
ActionManager::register_toggle_action (common_actions, X_("ToggleThemeManager"), _("Theme Manager"), mem_fun(*this, &ARDOUR_UI::toggle_theme_manager)); ActionManager::register_toggle_action (common_actions, X_("ToggleThemeManager"), _("Theme Manager"), mem_fun(*this, &ARDOUR_UI::toggle_theme_manager));
ActionManager::register_toggle_action (common_actions, X_("ToggleKeyEditor"), _("Keybindings"), mem_fun(*this, &ARDOUR_UI::toggle_key_editor)); ActionManager::register_toggle_action (common_actions, X_("ToggleKeyEditor"), _("Key Bindings"), mem_fun(*this, &ARDOUR_UI::toggle_key_editor));
ActionManager::register_toggle_action (common_actions, X_("ToggleBundleManager"), _("Bundle Manager"), mem_fun(*this, &ARDOUR_UI::toggle_bundle_manager)); ActionManager::register_toggle_action (common_actions, X_("ToggleBundleManager"), _("Bundle Manager"), mem_fun(*this, &ARDOUR_UI::toggle_bundle_manager));
act = ActionManager::register_action (common_actions, X_("AddAudioTrack"), _("Add Audio Track"), bind (mem_fun(*this, &ARDOUR_UI::session_add_audio_track), 1, 1, ARDOUR::Normal, (ARDOUR::RouteGroup *) 0, 1)); act = ActionManager::register_action (common_actions, X_("AddAudioTrack"), _("Add Audio Track"), bind (mem_fun(*this, &ARDOUR_UI::session_add_audio_track), 1, 1, ARDOUR::Normal, (ARDOUR::RouteGroup *) 0, 1));
@ -586,9 +586,7 @@ ARDOUR_UI::setup_clock ()
big_clock_window->set_border_width (0); big_clock_window->set_border_width (0);
big_clock_window->add (big_clock); big_clock_window->add (big_clock);
WindowTitle title(Glib::get_application_name()); big_clock_window->set_title (_("Big Clock"));
title += _("Big Clock");
big_clock_window->set_title (title.get_string());
big_clock_window->set_type_hint (Gdk::WINDOW_TYPE_HINT_UTILITY); big_clock_window->set_type_hint (Gdk::WINDOW_TYPE_HINT_UTILITY);
big_clock_window->signal_realize().connect (bind (sigc::ptr_fun (set_decoration), big_clock_window, (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH))); big_clock_window->signal_realize().connect (bind (sigc::ptr_fun (set_decoration), big_clock_window, (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
big_clock_window->signal_unmap().connect (bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleBigClock"))); big_clock_window->signal_unmap().connect (bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleBigClock")));

6
gtk2_ardour/audio_region_editor.cc
View file

@ -24,7 +24,6 @@
#include "ardour/utils.h" #include "ardour/utils.h"
#include <gtkmm2ext/utils.h> #include <gtkmm2ext/utils.h>
#include <gtkmm2ext/stop_signal.h> #include <gtkmm2ext/stop_signal.h>
#include <gtkmm2ext/window_title.h>
#include <cmath> #include <cmath>
#include "audio_region_editor.h" #include "audio_region_editor.h"
@ -138,10 +137,7 @@ AudioRegionEditor::AudioRegionEditor (Session& s, boost::shared_ptr<AudioRegion>
signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), static_cast<Window *> (this))); signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), static_cast<Window *> (this)));
WindowTitle title(string_compose (_("Region %1"), _region->name())); set_title (string_compose (_("Region %1"), _region->name()));
title += Glib::get_application_name();
set_title (title.get_string());
show_all(); show_all();

2
gtk2_ardour/bundle_manager.cc
View file

@ -279,7 +279,7 @@ BundleEditor::on_map ()
BundleManager::BundleManager (Session& session) BundleManager::BundleManager (Session& session)
: ArdourDialog (_("Bundle manager")), _session (session), edit_button (_("Edit")), delete_button (_("Delete")) : ArdourDialog (_("Bundle Manager")), _session (session), edit_button (_("Edit")), delete_button (_("Delete"))
{ {
_list_model = Gtk::ListStore::create (_list_model_columns); _list_model = Gtk::ListStore::create (_list_model_columns);
_tree_view.set_model (_list_model); _tree_view.set_model (_list_model);

2
gtk2_ardour/editor.cc
View file

@ -3275,7 +3275,7 @@ Editor::duplicate_dialog (bool with_dialog)
if (with_dialog) { if (with_dialog) {
ArdourDialog win ("Duplication Dialog"); ArdourDialog win ("Duplicate");
Label label (_("Number of Duplications:")); Label label (_("Number of Duplications:"));
Adjustment adjustment (1.0, 1.0, 1000000.0, 1.0, 5.0); Adjustment adjustment (1.0, 1.0, 1000000.0, 1.0, 5.0);
SpinButton spinner (adjustment, 0.0, 1); SpinButton spinner (adjustment, 0.0, 1);

9
gtk2_ardour/editor_audio_import.cc
View file

@ -31,7 +31,6 @@
#include "pbd/shortpath.h" #include "pbd/shortpath.h"
#include <gtkmm2ext/choice.h> #include <gtkmm2ext/choice.h>
#include <gtkmm2ext/window_title.h>
#include "ardour/session.h" #include "ardour/session.h"
#include "ardour/session_directory.h" #include "ardour/session_directory.h"
@ -82,7 +81,7 @@ Editor::add_external_audio_action (ImportMode mode_hint)
} }
if (sfbrowser == 0) { if (sfbrowser == 0) {
sfbrowser = new SoundFileOmega (*this, _("Add existing media"), session, 0, true, mode_hint); sfbrowser = new SoundFileOmega (*this, _("Add Existing Media"), session, 0, true, mode_hint);
} else { } else {
sfbrowser->set_mode (mode_hint); sfbrowser->set_mode (mode_hint);
} }
@ -115,7 +114,7 @@ Editor::external_audio_dialog ()
} }
if (sfbrowser == 0) { if (sfbrowser == 0) {
sfbrowser = new SoundFileOmega (*this, _("Add existing media"), session, track_cnt, true); sfbrowser = new SoundFileOmega (*this, _("Add Existing Media"), session, track_cnt, true);
} else { } else {
sfbrowser->reset (track_cnt); sfbrowser->reset (track_cnt);
} }
@ -460,9 +459,7 @@ int
Editor::import_sndfiles (vector<ustring> paths, ImportMode mode, SrcQuality quality, nframes64_t& pos, Editor::import_sndfiles (vector<ustring> paths, ImportMode mode, SrcQuality quality, nframes64_t& pos,
int target_regions, int target_tracks, boost::shared_ptr<Track> track, bool replace, uint32_t total) int target_regions, int target_tracks, boost::shared_ptr<Track> track, bool replace, uint32_t total)
{ {
WindowTitle title = string_compose (_("importing %1"), paths.front()); interthread_progress_window->set_title (string_compose (_("Importing %1"), paths.front()));
interthread_progress_window->set_title (title.get_string());
interthread_progress_window->set_position (Gtk::WIN_POS_MOUSE); interthread_progress_window->set_position (Gtk::WIN_POS_MOUSE);
interthread_progress_bar.set_fraction (0.0f); interthread_progress_bar.set_fraction (0.0f);
interthread_cancel_label.set_text (_("Cancel Import")); interthread_cancel_label.set_text (_("Cancel Import"));

8
gtk2_ardour/editor_markers.cc
View file

@ -23,7 +23,6 @@
#include <libgnomecanvas/libgnomecanvas.h> #include <libgnomecanvas/libgnomecanvas.h>
#include <gtkmm2ext/gtk_ui.h> #include <gtkmm2ext/gtk_ui.h>
#include <gtkmm2ext/window_title.h>
#include "ardour/location.h" #include "ardour/location.h"
#include "ardour/profile.h" #include "ardour/profile.h"
@ -1047,15 +1046,12 @@ Editor::marker_menu_rename ()
dialog.set_prompt (_("New Name:")); dialog.set_prompt (_("New Name:"));
WindowTitle title(Glib::get_application_name());
if (loc->is_mark()) { if (loc->is_mark()) {
title += _("Rename Mark"); dialog.set_title (_("Rename Mark"));
} else { } else {
title += _("Rename Range"); dialog.set_title (_("Rename Range"));
} }
dialog.set_title(title.get_string());
dialog.set_name ("MarkRenameWindow"); dialog.set_name ("MarkRenameWindow");
dialog.set_size_request (250, -1); dialog.set_size_request (250, -1);
dialog.set_position (Gtk::WIN_POS_MOUSE); dialog.set_position (Gtk::WIN_POS_MOUSE);

15
gtk2_ardour/editor_ops.cc
View file

@ -35,7 +35,6 @@
#include <gtkmm2ext/utils.h> #include <gtkmm2ext/utils.h>
#include <gtkmm2ext/choice.h> #include <gtkmm2ext/choice.h>
#include <gtkmm2ext/window_title.h>
#include <gtkmm2ext/popup.h> #include <gtkmm2ext/popup.h>
#include "ardour/audioengine.h" #include "ardour/audioengine.h"
@ -1879,10 +1878,7 @@ Editor::choose_new_marker_name(string &name) {
dialog.set_prompt (_("New Name:")); dialog.set_prompt (_("New Name:"));
WindowTitle title(Glib::get_application_name()); dialog.set_title (_("New Location Marker"));
title += _("Name New Location Marker");
dialog.set_title(title.get_string());
dialog.set_name ("MarkNameWindow"); dialog.set_name ("MarkNameWindow");
dialog.set_size_request (250, -1); dialog.set_size_request (250, -1);
@ -2554,10 +2550,7 @@ Editor::rename_region()
return; return;
} }
WindowTitle title (Glib::get_application_name()); ArdourDialog d (*this, _("Rename Region"), true, false);
title += _("Rename Region");
ArdourDialog d (*this, title.get_string(), true, false);
Entry entry; Entry entry;
Label label (_("New name:")); Label label (_("New name:"));
HBox hbox; HBox hbox;
@ -3734,9 +3727,7 @@ Editor::freeze_route ()
build_interthread_progress_window (); build_interthread_progress_window ();
} }
WindowTitle title(Glib::get_application_name()); interthread_progress_window->set_title (_("Freeze"));
title += _("Freeze");
interthread_progress_window->set_title (title.get_string());
interthread_progress_window->set_position (Gtk::WIN_POS_MOUSE); interthread_progress_window->set_position (Gtk::WIN_POS_MOUSE);
interthread_progress_window->show_all (); interthread_progress_window->show_all ();
interthread_progress_bar.set_fraction (0.0f); interthread_progress_bar.set_fraction (0.0f);

1
gtk2_ardour/editor_timefx.cc
View file

@ -27,7 +27,6 @@
#include "pbd/pthread_utils.h" #include "pbd/pthread_utils.h"
#include "pbd/memento_command.h" #include "pbd/memento_command.h"
#include <gtkmm2ext/window_title.h>
#include <gtkmm2ext/utils.h> #include <gtkmm2ext/utils.h>
#include "audio_region_view.h" #include "audio_region_view.h"

4
gtk2_ardour/global_port_matrix.cc
View file

@ -115,10 +115,10 @@ GlobalPortMatrixWindow::GlobalPortMatrixWindow (ARDOUR::Session& s, ARDOUR::Data
{ {
switch (t) { switch (t) {
case ARDOUR::DataType::AUDIO: case ARDOUR::DataType::AUDIO:
set_title (_("Audio Connections Manager")); set_title (_("Audio Connection Manager"));
break; break;
case ARDOUR::DataType::MIDI: case ARDOUR::DataType::MIDI:
set_title (_("MIDI Connections Manager")); set_title (_("MIDI Connection Manager"));
break; break;
} }

2
gtk2_ardour/keyeditor.cc
View file

@ -26,7 +26,7 @@ using namespace Gdk;
using namespace PBD; using namespace PBD;
KeyEditor::KeyEditor () KeyEditor::KeyEditor ()
: ArdourDialog (_("Shortcut Editor"), false) : ArdourDialog (_("Key Bindings"), false)
, unbind_button (_("Remove shortcut")) , unbind_button (_("Remove shortcut"))
, unbind_box (BUTTONBOX_END) , unbind_box (BUTTONBOX_END)

6
gtk2_ardour/location_ui.cc
View file

@ -22,7 +22,6 @@
#include <gtkmm2ext/utils.h> #include <gtkmm2ext/utils.h>
#include <gtkmm2ext/stop_signal.h> #include <gtkmm2ext/stop_signal.h>
#include <gtkmm2ext/window_title.h>
#include "ardour/utils.h" #include "ardour/utils.h"
#include "ardour/configuration.h" #include "ardour/configuration.h"
@ -627,10 +626,7 @@ LocationUI::LocationUI ()
{ {
i_am_the_modifier = 0; i_am_the_modifier = 0;
WindowTitle title(Glib::get_application_name()); set_title (_("Locations"));
title += _("Locations");
set_title(title.get_string());
set_wmclass(X_("ardour_locations"), "Ardour"); set_wmclass(X_("ardour_locations"), "Ardour");
set_name ("LocationWindow"); set_name ("LocationWindow");

5
gtk2_ardour/midi_port_dialog.cc
View file

@ -4,7 +4,6 @@
#include "pbd/convert.h" #include "pbd/convert.h"
#include <gtkmm2ext/utils.h> #include <gtkmm2ext/utils.h>
#include <gtkmm2ext/window_title.h>
#include "midi_port_dialog.h" #include "midi_port_dialog.h"
@ -28,9 +27,7 @@ MidiPortDialog::MidiPortDialog ()
set_position (Gtk::WIN_POS_MOUSE); set_position (Gtk::WIN_POS_MOUSE);
set_name (N_("MidiPortDialog")); set_name (N_("MidiPortDialog"));
WindowTitle title(Glib::get_application_name()); set_title (_("Add MIDI Port"));
title += _("Add MIDI port");
set_title(title.get_string());
vector<string> str = internationalize (PACKAGE, mode_strings); vector<string> str = internationalize (PACKAGE, mode_strings);
set_popdown_strings (port_mode_combo, str); set_popdown_strings (port_mode_combo, str);

9
gtk2_ardour/playlist_selector.cc
View file

@ -28,7 +28,6 @@
#include "ardour/configuration.h" #include "ardour/configuration.h"
#include <gtkmm2ext/gtk_ui.h> #include <gtkmm2ext/gtk_ui.h>
#include <gtkmm2ext/window_title.h>
#include "playlist_selector.h" #include "playlist_selector.h"
#include "route_ui.h" #include "route_ui.h"
@ -54,9 +53,7 @@ PlaylistSelector::PlaylistSelector ()
add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK); add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
set_size_request (300, 200); set_size_request (300, 200);
WindowTitle title(Glib::get_application_name()); set_title (_("Playlists"));
title += _("Playlists");
set_title(title.get_string());
model = TreeStore::create (columns); model = TreeStore::create (columns);
tree.set_model (model); tree.set_model (model);
@ -108,9 +105,7 @@ PlaylistSelector::show_for (RouteUI* ruix)
rui = ruix; rui = ruix;
WindowTitle title(Glib::get_application_name()); set_title (string_compose (_("Playlist for %1"), rui->route()->name()));
title += string_compose (_("Playlist for %1"), rui->route()->name());
set_title (title.get_string());
clear_map (); clear_map ();
select_connection.disconnect (); select_connection.disconnect ();

27
gtk2_ardour/processor_box.cc
View file

@ -39,7 +39,6 @@
#include <gtkmm2ext/utils.h> #include <gtkmm2ext/utils.h>
#include <gtkmm2ext/stop_signal.h> #include <gtkmm2ext/stop_signal.h>
#include <gtkmm2ext/doi.h> #include <gtkmm2ext/doi.h>
#include <gtkmm2ext/window_title.h>
#include "ardour/amp.h" #include "ardour/amp.h"
#include "ardour/ardour.h" #include "ardour/ardour.h"
@ -1383,11 +1382,7 @@ ProcessorBox::edit_processor (boost::shared_ptr<Processor> processor)
if (send->get_gui() == 0) { if (send->get_gui() == 0) {
send_ui = new SendUIWindow (send, _session); send_ui = new SendUIWindow (send, _session);
send_ui->set_title (send->name());
WindowTitle title(Glib::get_application_name());
title += send->name();
send_ui->set_title (title.get_string());
send->set_gui (send_ui); send->set_gui (send_ui);
} else { } else {
@ -1415,11 +1410,7 @@ ProcessorBox::edit_processor (boost::shared_ptr<Processor> processor)
if (retrn->get_gui() == 0) { if (retrn->get_gui() == 0) {
return_ui = new ReturnUIWindow (retrn, _session); return_ui = new ReturnUIWindow (retrn, _session);
return_ui->set_title (retrn->name ());
WindowTitle title(Glib::get_application_name());
title += retrn->name();
return_ui->set_title (title.get_string());
send->set_gui (return_ui); send->set_gui (return_ui);
} else { } else {
@ -1440,11 +1431,7 @@ ProcessorBox::edit_processor (boost::shared_ptr<Processor> processor)
if (plugin_insert->get_gui() == 0) { if (plugin_insert->get_gui() == 0) {
plugin_ui = new PluginUIWindow (win, plugin_insert); plugin_ui = new PluginUIWindow (win, plugin_insert);
plugin_ui->set_title (generate_processor_title (plugin_insert));
WindowTitle title(Glib::get_application_name());
title += generate_processor_title (plugin_insert);
plugin_ui->set_title (title.get_string());
plugin_insert->set_gui (plugin_ui); plugin_insert->set_gui (plugin_ui);
} else { } else {
@ -1762,14 +1749,10 @@ ProcessorBox::route_name_changed ()
/* rename editor windows for sends and plugins */ /* rename editor windows for sends and plugins */
WindowTitle title (Glib::get_application_name());
if ((send = boost::dynamic_pointer_cast<Send> (processor)) != 0) { if ((send = boost::dynamic_pointer_cast<Send> (processor)) != 0) {
title += send->name(); static_cast<Window*>(gui)->set_title (send->name ());
static_cast<Window*>(gui)->set_title (title.get_string());
} else if ((plugin_insert = boost::dynamic_pointer_cast<PluginInsert> (processor)) != 0) { } else if ((plugin_insert = boost::dynamic_pointer_cast<PluginInsert> (processor)) != 0) {
title += generate_processor_title (plugin_insert); static_cast<Window*>(gui)->set_title (generate_processor_title (plugin_insert));
static_cast<Window*>(gui)->set_title (title.get_string());
} }
} }
} }

6
gtk2_ardour/route_group_dialog.cc
View file

@ -19,14 +19,12 @@
#include <gtkmm/table.h> #include <gtkmm/table.h>
#include <gtkmm/stock.h> #include <gtkmm/stock.h>
#include <gtkmm2ext/window_title.h>
#include "ardour/route_group.h" #include "ardour/route_group.h"
#include "route_group_dialog.h" #include "route_group_dialog.h"
#include "i18n.h" #include "i18n.h"
#include <iostream> #include <iostream>
using namespace Gtk; using namespace Gtk;
using namespace Gtkmm2ext;
using namespace ARDOUR; using namespace ARDOUR;
using namespace std; using namespace std;
@ -48,9 +46,7 @@ RouteGroupDialog::RouteGroupDialog (RouteGroup* g, StockID const & s)
set_position (Gtk::WIN_POS_MOUSE); set_position (Gtk::WIN_POS_MOUSE);
set_name (N_("RouteGroupDialog")); set_name (N_("RouteGroupDialog"));
WindowTitle title (Glib::get_application_name()); set_title (_("Route Group"));
title += _("Route group");
set_title(title.get_string());
VBox* vbox = manage (new VBox); VBox* vbox = manage (new VBox);
Gtk::Label* l; Gtk::Label* l;

8
gtk2_ardour/route_params_ui.cc
View file

@ -145,10 +145,7 @@ RouteParams_UI::RouteParams_UI ()
set_default_size (620,370); set_default_size (620,370);
set_wmclass (X_("ardour_route_parameters"), "Ardour"); set_wmclass (X_("ardour_route_parameters"), "Ardour");
WindowTitle title(Glib::get_application_name()); set_title (_("Track/Bus Inspector"));
title += _("Track/Bus Inspector");
set_title (title.get_string());
// events // events
route_display.get_selection()->signal_changed().connect(mem_fun(*this, &RouteParams_UI::route_selected)); route_display.get_selection()->signal_changed().connect(mem_fun(*this, &RouteParams_UI::route_selected));
@ -601,8 +598,7 @@ RouteParams_UI::redirect_going_away (boost::shared_ptr<ARDOUR::Processor> insert
void void
RouteParams_UI::update_title () RouteParams_UI::update_title ()
{ {
WindowTitle title(Glib::get_application_name()); WindowTitle title(_("Track/Bus Inspector"));
title += _("Track/Bus Inspector");
if (_route) { if (_route) {

1
gtk2_ardour/session_import_dialog.cc
View file

@ -29,7 +29,6 @@
#include "ardour/tempo_map_importer.h" #include "ardour/tempo_map_importer.h"
#include <gtkmm2ext/utils.h> #include <gtkmm2ext/utils.h>
#include <gtkmm2ext/window_title.h>
#include "prompter.h" #include "prompter.h"
#include "i18n.h" #include "i18n.h"

3
gtk2_ardour/session_metadata_dialog.cc
View file

@ -22,7 +22,6 @@
#include <sstream> #include <sstream>
#include <gtkmm2ext/utils.h> #include <gtkmm2ext/utils.h>
#include <gtkmm2ext/window_title.h>
#include "pbd/xml++.h" #include "pbd/xml++.h"
#include "ardour/session.h" #include "ardour/session.h"
@ -615,7 +614,7 @@ SessionMetadataDialog<DataSet>::init_people_data ()
/* SessionMetadataEditor */ /* SessionMetadataEditor */
SessionMetadataEditor::SessionMetadataEditor () : SessionMetadataEditor::SessionMetadataEditor () :
SessionMetadataDialog<SessionMetadataSetEditable> (_("Edit session metadata")) SessionMetadataDialog<SessionMetadataSetEditable> (_("Edit Session Metadata"))
{ {
} }

2
gtk2_ardour/strip_silence_dialog.cc
View file

@ -33,7 +33,7 @@
/** Construct Strip silence dialog box */ /** Construct Strip silence dialog box */
StripSilenceDialog::StripSilenceDialog (std::list<boost::shared_ptr<ARDOUR::AudioRegion> > const & regions) StripSilenceDialog::StripSilenceDialog (std::list<boost::shared_ptr<ARDOUR::AudioRegion> > const & regions)
: ArdourDialog (_("Strip silence")), _wave_width (640), _wave_height (64) : ArdourDialog (_("Strip Silence")), _wave_width (640), _wave_height (64)
{ {
for (std::list<boost::shared_ptr<ARDOUR::AudioRegion> >::const_iterator i = regions.begin(); i != regions.end(); ++i) { for (std::list<boost::shared_ptr<ARDOUR::AudioRegion> >::const_iterator i = regions.begin(); i != regions.end(); ++i) {

5
gtk2_ardour/theme_manager.cc
View file

@ -24,7 +24,6 @@
#include <gtkmm/stock.h> #include <gtkmm/stock.h>
#include <gtkmm2ext/gtk_ui.h> #include <gtkmm2ext/gtk_ui.h>
#include <gtkmm2ext/window_title.h>
#include <gtkmm/settings.h> #include <gtkmm/settings.h>
#include "pbd/file_utils.h" #include "pbd/file_utils.h"
@ -54,9 +53,7 @@ ThemeManager::ThemeManager()
light_button ("Light theme"), light_button ("Light theme"),
reset_button ("Restore Defaults") reset_button ("Restore Defaults")
{ {
Gtkmm2ext::WindowTitle title (Glib::get_application_name ()); set_title (_("Theme Manager"));
title += _("Theme Manager");
set_title (title.get_string ());
color_list = ListStore::create (columns); color_list = ListStore::create (columns);
color_display.set_model (color_list); color_display.set_model (color_list);

7
gtk2_ardour/time_fx_dialog.cc
View file

@ -29,7 +29,6 @@
#include "pbd/pthread_utils.h" #include "pbd/pthread_utils.h"
#include "pbd/memento_command.h" #include "pbd/memento_command.h"
#include <gtkmm2ext/window_title.h>
#include <gtkmm2ext/utils.h> #include <gtkmm2ext/utils.h>
#include "editor.h" #include "editor.h"
@ -83,13 +82,11 @@ TimeFXDialog::TimeFXDialog (Editor& e, bool pitch)
set_position (Gtk::WIN_POS_MOUSE); set_position (Gtk::WIN_POS_MOUSE);
set_name (N_("TimeFXDialog")); set_name (N_("TimeFXDialog"));
WindowTitle title(Glib::get_application_name());
if (pitching) { if (pitching) {
title += _("Pitch Shift"); set_title (_("Pitch Shift"));
} else { } else {
title += _("Time Stretch"); set_title (_("Time Stretch"));
} }
set_title(title.get_string());
cancel_button = add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); cancel_button = add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);