clean up Window titles for consistency

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@5830 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Ben Loftis 2009-10-20 22:40:55 +00:00
parent 114b511413
commit bcc7af086e
18 changed files with 31 additions and 82 deletions

View File

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

View File

@ -1184,7 +1184,7 @@ ARDOUR_UI::open_session ()
/* 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::OPEN, Gtk::RESPONSE_ACCEPT);
open_session_selector->set_default_response(Gtk::RESPONSE_ACCEPT);
@ -1850,6 +1850,7 @@ ARDOUR_UI::snapshot_session ()
prompter.set_name ("Prompter");
prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
prompter.set_title (_("Take Snapshot"));
prompter.set_prompt (_("Name of New Snapshot"));
prompter.set_initial_text (timebuf);
@ -1955,7 +1956,6 @@ ARDOUR_UI::transport_rec_enable_blink (bool onoff)
void
ARDOUR_UI::save_template ()
{
ArdourPrompter prompter (true);
string name;
@ -1965,6 +1965,7 @@ ARDOUR_UI::save_template ()
}
prompter.set_name (X_("Prompter"));
prompter.set_title (_("Save Mix Template"));
prompter.set_prompt (_("Name for mix template:"));
prompter.set_initial_text(session->name() + _("-template"));
prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
@ -2096,6 +2097,7 @@ ARDOUR_UI::ask_about_loading_existing_session (const Glib::ustring& session_path
msg.set_name (X_("CleanupDialog"));
msg.set_title (_("Cleanup Unused Sources"));
msg.set_wmclass (X_("existing_session"), "Ardour");
msg.set_position (Gtk::WIN_POS_MOUSE);
pop_back_splash ();

View File

@ -862,9 +862,7 @@ ARDOUR_UI::setup_clock ()
big_clock_window->add (big_clock);
big_clock_window->signal_key_press_event().connect (bind (sigc::ptr_fun (relay_key_press), big_clock_window));
WindowTitle title(Glib::get_application_name());
title += _("Clock");
big_clock_window->set_title (title.get_string());
big_clock_window->set_title (_("Clock"));
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_unmap().connect (bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleBigClock")));

View File

@ -24,7 +24,6 @@
#include <ardour/utils.h>
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/stop_signal.h>
#include <gtkmm2ext/window_title.h>
#include <cmath>
#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)));
WindowTitle title(string_compose (_("Region %1"), _region->name()));
title += Glib::get_application_name();
set_title (title.get_string());
set_title (string_compose (_("Region %1"), _region->name()));
show_all();

View File

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

View File

@ -31,7 +31,6 @@
#include <pbd/shortpath.h>
#include <gtkmm2ext/choice.h>
#include <gtkmm2ext/window_title.h>
#include <ardour/session.h>
#include <ardour/audioplaylist.h>
@ -451,9 +450,7 @@ Editor::import_sndfiles (vector<ustring> paths, ImportMode mode, SrcQuality qual
int target_regions, int target_tracks, boost::shared_ptr<AudioTrack> track, bool replace,
uint32_t total)
{
WindowTitle title = string_compose (_("importing %1"), paths.front());
interthread_progress_window->set_title (title.get_string());
interthread_progress_window->set_title (string_compose (_("Importing %1"), paths.front()));
interthread_progress_window->set_position (Gtk::WIN_POS_MOUSE);
interthread_progress_bar.set_fraction (0.0f);
interthread_cancel_label.set_text (_("Cancel Import"));

View File

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

View File

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

View File

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

View File

@ -28,7 +28,6 @@
#include <pbd/xml++.h>
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/window_title.h>
#include <ardour/export.h>
#include <ardour/sndfile_helpers.h>
@ -122,10 +121,7 @@ ExportDialog::ExportDialog(PublicEditor& e)
channel_count_selection_allowed = true;
export_cd_markers_allowed = true;
WindowTitle title(Glib::get_application_name());
title += _("Export");
set_title (title.get_string());
set_title (_("Export"));
set_wmclass (X_("ardour_export"), "Ardour");
set_name ("ExportWindow");
add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);

View File

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

View File

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

View File

@ -375,9 +375,7 @@ NewSessionDialog::NewSessionDialog()
set_icon_list (window_icons);
}
WindowTitle title(Glib::get_application_name());
title += _("Session Control");
set_title(title.get_string());
set_title(_("Session Control"));
set_position (Gtk::WIN_POS_MOUSE);
set_resizable(false);

View File

@ -121,9 +121,7 @@ OptionEditor::OptionEditor (ARDOUR_UI& uip, PublicEditor& ed, Mixer_UI& mixui)
auditioner_io_selector = 0;
session = 0;
WindowTitle title(Glib::get_application_name());
title += _("Preferences");
set_title(title.get_string());
set_title(_("Preferences"));
set_default_size (300, 300);
set_wmclass (X_("ardour_preferences"), "Ardour");

View File

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

View File

@ -34,7 +34,6 @@
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/stop_signal.h>
#include <gtkmm2ext/doi.h>
#include <gtkmm2ext/window_title.h>
#include <ardour/ardour.h>
#include <ardour/session.h>
@ -1122,9 +1121,7 @@ RedirectBox::edit_redirect (boost::shared_ptr<Redirect> redirect)
send_ui = new SendUIWindow (send, _session);
WindowTitle title(Glib::get_application_name());
title += send->name();
send_ui->set_title (title.get_string());
send_ui->set_title (send->name());
send->set_gui (send_ui);
@ -1159,9 +1156,7 @@ RedirectBox::edit_redirect (boost::shared_ptr<Redirect> redirect)
plugin_ui = new PluginUIWindow (win, plugin_insert);
WindowTitle title(Glib::get_application_name());
title += generate_redirect_title (plugin_insert);
plugin_ui->set_title (title.get_string());
plugin_ui->set_title (generate_redirect_title (plugin_insert));
plugin_insert->set_gui (plugin_ui);
@ -1443,19 +1438,15 @@ RedirectBox::route_name_changed (void* src)
/* rename editor windows for sends and plugins */
WindowTitle title (Glib::get_application_name());
if ((insert = boost::dynamic_pointer_cast<Insert> (redirect)) == 0) {
boost::shared_ptr<Send> send = boost::dynamic_pointer_cast<Send> (redirect);
title += send->name();
static_cast<Window*>(gui)->set_title (title.get_string());
static_cast<Window*>(gui)->set_title (send->name());
} else {
boost::shared_ptr<PluginInsert> plugin_insert;
if ((plugin_insert = boost::dynamic_pointer_cast<PluginInsert> (insert)) != 0) {
title += generate_redirect_title (plugin_insert);
static_cast<Window*>(gui)->set_title (generate_redirect_title (plugin_insert));
}
static_cast<Window*>(gui)->set_title (title.get_string());
}
}
}

View File

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

View File

@ -44,7 +44,7 @@ sigc::signal<void> ColorsChanged;
sigc::signal<void,uint32_t> ColorChanged;
ThemeManager::ThemeManager()
: ArdourDialog ("ThemeManager"),
: ArdourDialog ("Theme Manager"),
dark_button ("Dark Theme"),
light_button ("Light Theme"),
reset_button ("Restore Defaults")