[pulseaudio-commits] [Git][pulseaudio/pavucontrol][master] 2 commits: mainwindow: change "[Set as] fallback" to "default"

[Arun Raghavan (@arun)]

Arun Raghavan pushed to branch master at PulseAudio / pavucontrol


Commits:
1363cd73 by Konstantin Kharlamov at 2023-06-22T10:42:06+03:00
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.

- - - - -
8c20afda by Konstantin Kharlamov at 2023-06-22T10:42:13+03:00
ru.po: translate "Set as default"

- - - - -


3 changed files:

- po/ru.po
- src/mainwindow.cc
- src/pavucontrol.glade


Changes:

=====================================
po/ru.po
=====================================
@@ -94,8 +94,8 @@ msgid "Lock channels together"
 msgstr "Связать громкости каналов"
 
 #: src/pavucontrol.glade:408
-msgid "Set as fallback"
-msgstr "Сделать резервным"
+msgid "Set as default"
+msgstr "Установить по умолчанию"
 
 #: src/pavucontrol.glade:446
 msgid "<b>Port:</b>"


=====================================
src/mainwindow.cc
=====================================
@@ -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) {


=====================================
src/pavucontrol.glade
=====================================
@@ -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>



View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pavucontrol/-/compare/ee77d86eed3c35f9f7a1f2e2da385d4b526d77a1...8c20afdaecb14e806ca5841105aadc139164d8bc

-- 
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pavucontrol/-/compare/ee77d86eed3c35f9f7a1f2e2da385d4b526d77a1...8c20afdaecb14e806ca5841105aadc139164d8bc
You're receiving this email because of your account on gitlab.freedesktop.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/pulseaudio-commits/attachments/20230623/519a7d35/attachment-0001.htm>