[pulseaudio-commits] src/mainwindow.cc src/pavucontrol.glade

[Tanu Kaskinen]

 src/mainwindow.cc     |    6 ++++++
 src/pavucontrol.glade |    2 ++
 2 files changed, 8 insertions(+)

New commits:
commit 35e844d2b2cf35f5a4cb29b1e32f4f1fa95dda7b
Author: Alexander E. Patrakov <patrakov at gmail.com>
Date:   Fri Dec 13 17:47:38 2013 +0600

    pavucontrol: ellipsize labels to fix window resizing
    
    ellipsize labels to make the window resizable even with long label text
    and add tooltips to provide a way to read the full text
    
    Originally from Sebastian Wick <sebastian at sebastianwick.net>

diff --git a/src/mainwindow.cc b/src/mainwindow.cc
index be6fb93..fc378c4 100644
--- a/src/mainwindow.cc
+++ b/src/mainwindow.cc
@@ -431,6 +431,7 @@ bool MainWindow::updateSink(const pa_sink_info &info) {
     w->boldNameLabel->set_text("");
     gchar *txt;
     w->nameLabel->set_markup(txt = g_markup_printf_escaped("%s", info.description));
+    w->nameLabel->set_tooltip_text(info.description);
     g_free(txt);
 
     icon = pa_proplist_gets(info.proplist, PA_PROP_DEVICE_ICON_NAME);
@@ -586,6 +587,7 @@ void MainWindow::updateSource(const pa_source_info &info) {
     w->boldNameLabel->set_text("");
     gchar *txt;
     w->nameLabel->set_markup(txt = g_markup_printf_escaped("%s", info.description));
+    w->nameLabel->set_tooltip_text(info.description);
     g_free(txt);
 
     icon = pa_proplist_gets(info.proplist, PA_PROP_DEVICE_ICON_NAME);
@@ -707,6 +709,8 @@ void MainWindow::updateSinkInput(const pa_sink_input_info &info) {
         w->nameLabel->set_label(info.name);
     }
 
+    w->nameLabel->set_tooltip_text(info.name);
+
     setIconFromProplist(w->iconImage, info.proplist, "audio-card");
 
     w->setVolume(info.volume);
@@ -759,6 +763,8 @@ void MainWindow::updateSourceOutput(const pa_source_output_info &info) {
         w->nameLabel->set_label(info.name);
     }
 
+    w->nameLabel->set_tooltip_text(info.name);
+
     setIconFromProplist(w->iconImage, info.proplist, "audio-input-microphone");
 
 #if HAVE_SOURCE_OUTPUT_VOLUMES
diff --git a/src/pavucontrol.glade b/src/pavucontrol.glade
index 4b3dd01..b0aa2a5 100644
--- a/src/pavucontrol.glade
+++ b/src/pavucontrol.glade
@@ -256,6 +256,7 @@
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">Device Title</property>
                             <property name="use_markup">True</property>
+                            <property name="ellipsize">end</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -1384,6 +1385,7 @@
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">Stream Title</property>
                             <property name="use_markup">True</property>
+                            <property name="ellipsize">end</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>