diff options
| author | Colin Guthrie <cguthrie@mandriva.org> | 2009-06-13 19:15:02 +0100 |
|---|---|---|
| committer | Colin Guthrie <cguthrie@mandriva.org> | 2009-06-17 08:54:14 +0100 |
| commit | 02b316fcba8a112e528a0bddfcb93cf6f3179168 (patch) | |
| tree | 96471135e9d83af7ebb275d77e71c9d0c0b6033d /src/pavucontrol.glade | |
| parent | e71562619a67fa6823ba5d14c3df411b12fe192b (diff) | |
More changes in the UI to try and make things neater.
This abandons the combo box approach an instead partially reverts to the popup.
We now display a suffix after the stream title saying " on <device>" or " from <device>"
where the <device> part looks like a hyperlink and, when clicked, shows the popup to change the device.
If there is only one device available, we suppress the whole thing and thus avoid confusion.
Diffstat (limited to 'src/pavucontrol.glade')
| -rw-r--r-- | src/pavucontrol.glade | 102 |
1 files changed, 52 insertions, 50 deletions
diff --git a/src/pavucontrol.glade b/src/pavucontrol.glade index 5f13333..07d1a36 100644 --- a/src/pavucontrol.glade +++ b/src/pavucontrol.glade @@ -498,7 +498,6 @@ Monitors</property> <widget class="GtkImage" id="iconImage"> <property name="visible">True</property> <property name="stock">gtk-missing-image</property> - <property name="icon-size">4</property> </widget> <packing> <property name="expand">False</property> @@ -508,6 +507,7 @@ Monitors</property> <child> <widget class="GtkHBox" id="hbox12"> <property name="visible">True</property> + <property name="spacing">2</property> <child> <widget class="GtkLabel" id="boldNameLabel"> <property name="visible">True</property> @@ -524,12 +524,42 @@ Monitors</property> <property name="xalign">0</property> <property name="label" translatable="yes">Stream Title</property> <property name="use_markup">True</property> - <property name="ellipsize">middle</property> </widget> <packing> + <property name="expand">False</property> <property name="position">1</property> </packing> </child> + <child> + <widget class="GtkLabel" id="directionLabel"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="xpad">4</property> + <property name="label" translatable="yes">direction</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <widget class="GtkEventBox" id="deviceButton"> + <property name="visible">True</property> + <child> + <widget class="GtkLabel" id="deviceLabel"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes"><a href="">Device</a></property> + <property name="use_markup">True</property> + </widget> + </child> + </widget> + <packing> + <property name="position">3</property> + </packing> + </child> </widget> <packing> <property name="position">1</property> @@ -582,6 +612,26 @@ Monitors</property> <property name="position">1</property> </packing> </child> + <child> + <widget class="GtkButton" id="terminateButton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="has_tooltip">True</property> + <property name="tooltip" translatable="yes">Terminate stream</property> + <child> + <widget class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-delete</property> + </widget> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> </widget> <packing> <property name="expand">False</property> @@ -612,52 +662,6 @@ Monitors</property> <property name="position">1</property> </packing> </child> - <child> - <widget class="GtkHBox" id="streamControlHBox"> - <property name="visible">True</property> - <child> - <widget class="GtkLabel" id="directionLabel"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">direction</property> - <property name="use_markup">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <widget class="GtkComboBox" id="deviceCombo"> - <property name="visible">True</property> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> - <widget class="GtkButton" id="terminateButton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip" translatable="yes">Terminate stream</property> - <child> - <widget class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="stock">gtk-delete</property> - </widget> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="position">2</property> - </packing> - </child> - </widget> - <packing> - <property name="position">2</property> - </packing> - </child> </widget> <packing> <property name="expand">False</property> @@ -702,7 +706,6 @@ Monitors</property> <widget class="GtkImage" id="iconImage"> <property name="visible">True</property> <property name="stock">gtk-missing-image</property> - <property name="icon-size">4</property> </widget> <packing> <property name="expand">False</property> @@ -947,7 +950,6 @@ Monitors</property> <property name="visible">True</property> <property name="xalign">0</property> <property name="stock">gtk-missing-image</property> - <property name="icon-size">4</property> </widget> <packing> <property name="expand">False</property> |