mainwindow: change "[Set as] fallback" to "default"
The "Set as fallback" title is a frequent source of confusion, many people look at it and do not realize that its actual functional is "setting as default". Presumably, when this title first appeared it was presumed that apps should chose a device themselves, and then if they don't there's a "fallback". But in reality most apps do not chose any device explicitly, and it's expected behavior to make use of this "fallback" device. So it is more correct to call a "default" device.
This commit is contained in:
parent
ee77d86eed
commit
1363cd73c2
|
@ -274,7 +274,7 @@ finish:
|
|||
}
|
||||
}
|
||||
|
||||
static void set_icon_name_fallback(Gtk::Image *i, const char *name, Gtk::IconSize size) {
|
||||
static void set_icon_name_default(Gtk::Image *i, const char *name, Gtk::IconSize size) {
|
||||
Glib::RefPtr<Gtk::IconTheme> theme;
|
||||
Glib::RefPtr<Gdk::Pixbuf> pixbuf;
|
||||
gint width = 24, height = 24;
|
||||
|
@ -382,7 +382,7 @@ void MainWindow::updateCard(const pa_card_info &info) {
|
|||
g_free(txt);
|
||||
|
||||
icon = pa_proplist_gets(info.proplist, PA_PROP_DEVICE_ICON_NAME);
|
||||
set_icon_name_fallback(w->iconImage, icon ? icon : "audio-card", Gtk::ICON_SIZE_SMALL_TOOLBAR);
|
||||
set_icon_name_default(w->iconImage, icon ? icon : "audio-card", Gtk::ICON_SIZE_SMALL_TOOLBAR);
|
||||
|
||||
w->hasSinks = w->hasSources = false;
|
||||
profile_priorities.clear();
|
||||
|
@ -580,7 +580,7 @@ bool MainWindow::updateSink(const pa_sink_info &info) {
|
|||
g_free(txt);
|
||||
|
||||
icon = pa_proplist_gets(info.proplist, PA_PROP_DEVICE_ICON_NAME);
|
||||
set_icon_name_fallback(w->iconImage, icon ? icon : "audio-card", Gtk::ICON_SIZE_SMALL_TOOLBAR);
|
||||
set_icon_name_default(w->iconImage, icon ? icon : "audio-card", Gtk::ICON_SIZE_SMALL_TOOLBAR);
|
||||
|
||||
w->setVolume(info.volume);
|
||||
w->muteToggleButton->set_active(info.mute);
|
||||
|
@ -748,7 +748,7 @@ void MainWindow::updateSource(const pa_source_info &info) {
|
|||
g_free(txt);
|
||||
|
||||
icon = pa_proplist_gets(info.proplist, PA_PROP_DEVICE_ICON_NAME);
|
||||
set_icon_name_fallback(w->iconImage, icon ? icon : "audio-input-microphone", Gtk::ICON_SIZE_SMALL_TOOLBAR);
|
||||
set_icon_name_default(w->iconImage, icon ? icon : "audio-input-microphone", Gtk::ICON_SIZE_SMALL_TOOLBAR);
|
||||
|
||||
w->setVolume(info.volume);
|
||||
w->muteToggleButton->set_active(info.mute);
|
||||
|
@ -817,7 +817,7 @@ void MainWindow::setIconFromProplist(Gtk::Image *icon, pa_proplist *l, const cha
|
|||
|
||||
finish:
|
||||
|
||||
set_icon_name_fallback(icon, t, Gtk::ICON_SIZE_SMALL_TOOLBAR);
|
||||
set_icon_name_default(icon, t, Gtk::ICON_SIZE_SMALL_TOOLBAR);
|
||||
}
|
||||
|
||||
void MainWindow::updateSinkInput(const pa_sink_input_info &info) {
|
||||
|
|
|
@ -405,7 +405,7 @@
|
|||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="receives_default">False</property>
|
||||
<property name="tooltip_text" translatable="yes">Set as fallback</property>
|
||||
<property name="tooltip_text" translatable="yes">Set as default</property>
|
||||
<child>
|
||||
<object class="GtkImage" id="image2">
|
||||
<property name="visible">True</property>
|
||||
|
|
Loading…
Reference in New Issue