diff options
author | Rafał Mużyło <galtgendo@gmail.com> | 2011-03-03 14:31:14 +0000 |
---|---|---|
committer | Colin Guthrie <cguthrie@mandriva.org> | 2011-03-03 14:31:14 +0000 |
commit | 9ce0e0a380a2d6fd99c02b4b2c0aa29a63e728f8 (patch) | |
tree | 37ff8c689995751d63d8bbc239a34fb69a844304 | |
parent | 5997290d1e0298ddd91444e19a5ad66b64c27d34 (diff) |
Drop the need to use libglademm
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | src/cardwidget.cc | 4 | ||||
-rw-r--r-- | src/cardwidget.h | 2 | ||||
-rw-r--r-- | src/channelwidget.cc | 6 | ||||
-rw-r--r-- | src/channelwidget.h | 2 | ||||
-rw-r--r-- | src/devicewidget.cc | 4 | ||||
-rw-r--r-- | src/devicewidget.h | 2 | ||||
-rw-r--r-- | src/mainwindow.cc | 9 | ||||
-rw-r--r-- | src/mainwindow.h | 2 | ||||
-rw-r--r-- | src/minimalstreamwidget.cc | 2 | ||||
-rw-r--r-- | src/minimalstreamwidget.h | 2 | ||||
-rw-r--r-- | src/pavucontrol.glade | 1447 | ||||
-rw-r--r-- | src/pavucontrol.h | 1 | ||||
-rw-r--r-- | src/rolewidget.cc | 4 | ||||
-rw-r--r-- | src/rolewidget.h | 2 | ||||
-rw-r--r-- | src/sinkinputwidget.cc | 4 | ||||
-rw-r--r-- | src/sinkinputwidget.h | 2 | ||||
-rw-r--r-- | src/sinkwidget.cc | 4 | ||||
-rw-r--r-- | src/sinkwidget.h | 2 | ||||
-rw-r--r-- | src/sourceoutputwidget.cc | 4 | ||||
-rw-r--r-- | src/sourceoutputwidget.h | 2 | ||||
-rw-r--r-- | src/sourcewidget.cc | 4 | ||||
-rw-r--r-- | src/sourcewidget.h | 2 | ||||
-rw-r--r-- | src/streamwidget.cc | 2 | ||||
-rw-r--r-- | src/streamwidget.h | 2 |
25 files changed, 887 insertions, 632 deletions
diff --git a/configure.ac b/configure.ac index 96613ba..beb33f3 100644 --- a/configure.ac +++ b/configure.ac @@ -39,7 +39,7 @@ AC_PROG_LN_S AC_TYPE_SIGNAL AC_HEADER_STDC -PKG_CHECK_MODULES(GUILIBS, [ gtkmm-2.4 >= 2.16 libglademm-2.4 sigc++-2.0 libcanberra-gtk >= 0.16 ]) +PKG_CHECK_MODULES(GUILIBS, [ gtkmm-2.4 >= 2.16 sigc++-2.0 libcanberra-gtk >= 0.16 ]) AC_SUBST(GUILIBS_CFLAGS) AC_SUBST(GUILIBS_LIBS) diff --git a/src/cardwidget.cc b/src/cardwidget.cc index c8efd31..c79ac6c 100644 --- a/src/cardwidget.cc +++ b/src/cardwidget.cc @@ -27,7 +27,7 @@ #include "i18n.h" /*** CardWidget ***/ -CardWidget::CardWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x) : +CardWidget::CardWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& x) : Gtk::VBox(cobject) { x->get_widget("nameLabel", nameLabel); @@ -43,7 +43,7 @@ CardWidget::CardWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade: CardWidget* CardWidget::create() { CardWidget* w; - Glib::RefPtr<Gnome::Glade::Xml> x = Gnome::Glade::Xml::create(GLADE_FILE, "cardWidget"); + Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_file(GLADE_FILE, "cardWidget"); x->get_widget_derived("cardWidget", w); return w; } diff --git a/src/cardwidget.h b/src/cardwidget.h index ca90273..3837d5b 100644 --- a/src/cardwidget.h +++ b/src/cardwidget.h @@ -25,7 +25,7 @@ class CardWidget : public Gtk::VBox { public: - CardWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x); + CardWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& x); static CardWidget* create(); Gtk::Label *nameLabel; diff --git a/src/channelwidget.cc b/src/channelwidget.cc index bcfcd82..21f3afa 100644 --- a/src/channelwidget.cc +++ b/src/channelwidget.cc @@ -31,7 +31,7 @@ static bool show_decibel = true; /*** ChannelWidget ***/ -ChannelWidget::ChannelWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x) : +ChannelWidget::ChannelWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& x) : Gtk::EventBox(cobject), volumeScaleEnabled(true) { @@ -47,7 +47,9 @@ ChannelWidget::ChannelWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome:: ChannelWidget* ChannelWidget::create() { ChannelWidget* w; - Glib::RefPtr<Gnome::Glade::Xml> x = Gnome::Glade::Xml::create(GLADE_FILE, "channelWidget"); + Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create(); + x->add_from_file(GLADE_FILE, "adjustment1"); + x->add_from_file(GLADE_FILE, "channelWidget"); x->get_widget_derived("channelWidget", w); return w; } diff --git a/src/channelwidget.h b/src/channelwidget.h index b15fe84..26a880c 100644 --- a/src/channelwidget.h +++ b/src/channelwidget.h @@ -27,7 +27,7 @@ class MinimalStreamWidget; class ChannelWidget : public Gtk::EventBox { public: - ChannelWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x); + ChannelWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& x); static ChannelWidget* create(); void setVolume(pa_volume_t volume); diff --git a/src/devicewidget.cc b/src/devicewidget.cc index 0798e42..9a75970 100644 --- a/src/devicewidget.cc +++ b/src/devicewidget.cc @@ -31,7 +31,7 @@ #include "i18n.h" /*** DeviceWidget ***/ -DeviceWidget::DeviceWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x) : +DeviceWidget::DeviceWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& x) : MinimalStreamWidget(cobject, x) { x->get_widget("lockToggleButton", lockToggleButton); @@ -197,7 +197,7 @@ void DeviceWidget::renamePopup() { Gtk::Dialog* dialog; Gtk::Entry* renameText; - Glib::RefPtr<Gnome::Glade::Xml> x = Gnome::Glade::Xml::create(GLADE_FILE, "renameDialog"); + Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_file(GLADE_FILE, "renameDialog"); x->get_widget("renameDialog", dialog); x->get_widget("renameText", renameText); diff --git a/src/devicewidget.h b/src/devicewidget.h index 3170f04..358c708 100644 --- a/src/devicewidget.h +++ b/src/devicewidget.h @@ -30,7 +30,7 @@ class ChannelWidget; class DeviceWidget : public MinimalStreamWidget { public: - DeviceWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x); + DeviceWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& x); void init(MainWindow* mainWindow, Glib::ustring); void setChannelMap(const pa_channel_map &m, bool can_decibel); diff --git a/src/mainwindow.cc b/src/mainwindow.cc index 60137b6..119e30e 100644 --- a/src/mainwindow.cc +++ b/src/mainwindow.cc @@ -66,7 +66,7 @@ struct source_port_prio_compare { } }; -MainWindow::MainWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x) : +MainWindow::MainWindow(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& x) : Gtk::Window(cobject), showSinkInputType(SINK_INPUT_CLIENT), showSinkType(SINK_ALL), @@ -139,7 +139,12 @@ MainWindow::MainWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade: MainWindow* MainWindow::create() { MainWindow* w; - Glib::RefPtr<Gnome::Glade::Xml> x = Gnome::Glade::Xml::create(GLADE_FILE, "mainWindow"); + Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create(); + x->add_from_file(GLADE_FILE, "liststore1"); + x->add_from_file(GLADE_FILE, "liststore2"); + x->add_from_file(GLADE_FILE, "liststore3"); + x->add_from_file(GLADE_FILE, "liststore4"); + x->add_from_file(GLADE_FILE, "mainWindow"); x->get_widget_derived("mainWindow", w); return w; } diff --git a/src/mainwindow.h b/src/mainwindow.h index a1e56f0..87a0898 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -34,7 +34,7 @@ class RoleWidget; class MainWindow : public Gtk::Window { public: - MainWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x); + MainWindow(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& x); static MainWindow* create(); virtual ~MainWindow(); diff --git a/src/minimalstreamwidget.cc b/src/minimalstreamwidget.cc index ac665de..562739d 100644 --- a/src/minimalstreamwidget.cc +++ b/src/minimalstreamwidget.cc @@ -25,7 +25,7 @@ #include "minimalstreamwidget.h" /*** MinimalStreamWidget ***/ -MinimalStreamWidget::MinimalStreamWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x) : +MinimalStreamWidget::MinimalStreamWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& x) : Gtk::VBox(cobject), peakProgressBar(), lastPeak(0), diff --git a/src/minimalstreamwidget.h b/src/minimalstreamwidget.h index ba7eb1d..7d5ee24 100644 --- a/src/minimalstreamwidget.h +++ b/src/minimalstreamwidget.h @@ -25,7 +25,7 @@ class MinimalStreamWidget : public Gtk::VBox { public: - MinimalStreamWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x); + MinimalStreamWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& x); Gtk::VBox *channelsVBox; Gtk::Label *nameLabel, *boldNameLabel; diff --git a/src/pavucontrol.glade b/src/pavucontrol.glade index 82aca34..f120b95 100644 --- a/src/pavucontrol.glade +++ b/src/pavucontrol.glade @@ -1,611 +1,1275 @@ -<?xml version="1.0"?> -<glade-interface> - <!-- interface-requires gtk+ 2.16 --> +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <requires lib="gtk+" version="2.16"/> <!-- interface-naming-policy toplevel-contextual --> - <widget class="GtkWindow" id="mainWindow"> + <object class="GtkAdjustment" id="adjustment1"> + <property name="upper">100</property> + <property name="value">44.2408370972</property> + <property name="step_increment">5</property> + </object> + <object class="GtkWindow" id="cardWindow"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="title" translatable="yes">window1</property> + <child> + <object class="GtkEventBox" id="cardWidget"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkVBox" id="cardWidget1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkVBox" id="vbox7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">12</property> + <property name="spacing">6</property> + <child> + <object class="GtkHBox" id="hbox9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkImage" id="iconImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="stock">gtk-missing-image</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox11"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkLabel" id="nameLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Card Name</property> + <property name="use_markup">True</property> + <property name="ellipsize">middle</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes"><b>Profile:</b></property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="profileList"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHSeparator" id="hseparator5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> + </object> + <object class="GtkWindow" id="channelWindow"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="title" translatable="yes">window2</property> + <child> + <object class="GtkHBox" id="channelWidget"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="channelLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes"><b>left-front</b></property> + <property name="use_markup">True</property> + <property name="width_chars">15</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHScale" id="volumeScale"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="adjustment">adjustment1</property> + <property name="digits">0</property> + <property name="draw_value">False</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="volumeLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">50%</property> + <property name="width_chars">9</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </object> + </child> + </object> + <object class="GtkWindow" id="deviceWindow"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="title" translatable="yes">window1</property> + <child> + <object class="GtkEventBox" id="deviceWidget"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkVBox" id="streamWidget2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkVBox" id="vbox26"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">12</property> + <property name="spacing">6</property> + <child> + <object class="GtkHBox" id="hbox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkImage" id="iconImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-missing-image</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox12"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkLabel" id="boldNameLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="use_markup">True</property> + <property name="ellipsize">middle</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="nameLabel"> + <property name="visible">True</property> + <property name="can_focus">False</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> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">3</property> + <child> + <object class="GtkToggleButton" id="muteToggleButton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Mute audio</property> + <property name="use_action_appearance">False</property> + <property name="relief">none</property> + <child> + <object class="GtkImage" id="image20"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">audio-volume-muted</property> + <property name="icon-size">1</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkToggleButton" id="lockToggleButton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Lock channels together</property> + <property name="use_action_appearance">False</property> + <property name="relief">none</property> + <property name="active">True</property> + <child> + <object class="GtkImage" id="image18"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">stock_lock</property> + <property name="icon-size">1</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkToggleButton" id="defaultToggleButton"> + <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="use_action_appearance">False</property> + <child> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">emblem-default</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="portSelect"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes"><b>Port:</b></property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="portList"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="channelsVBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHSeparator" id="hseparator2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> + </object> + <object class="GtkListStore" id="liststore1"> + <columns> + <!-- column-name item text --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">All Streams</col> + </row> + <row> + <col id="0" translatable="yes">Applications</col> + </row> + <row> + <col id="0" translatable="yes">Virtual Streams</col> + </row> + </data> + </object> + <object class="GtkListStore" id="liststore2"> + <columns> + <!-- column-name item text --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">All Streams</col> + </row> + <row> + <col id="0" translatable="yes">Applications</col> + </row> + <row> + <col id="0" translatable="yes">Virtual Streams</col> + </row> + </data> + </object> + <object class="GtkListStore" id="liststore3"> + <columns> + <!-- column-name item text --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">All Output Devices</col> + </row> + <row> + <col id="0" translatable="yes">Hardware Output Devices</col> + </row> + <row> + <col id="0" translatable="yes">Virtual Output Devices</col> + </row> + </data> + </object> + <object class="GtkListStore" id="liststore4"> + <columns> + <!-- column-name item text --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">All Input Devices</col> + </row> + <row> + <col id="0" translatable="yes">All Except Monitors</col> + </row> + <row> + <col id="0" translatable="yes">Hardware Input Devices</col> + </row> + <row> + <col id="0" translatable="yes">Virtual Input Devices</col> + </row> + <row> + <col id="0" translatable="yes">Monitors</col> + </row> + </data> + </object> + <object class="GtkWindow" id="mainWindow"> + <property name="can_focus">False</property> <property name="title" translatable="yes">Volume Control</property> <property name="default_width">500</property> <property name="default_height">400</property> <property name="icon_name">multimedia-volume-control</property> <child> - <widget class="GtkVBox" id="vbox20"> + <object class="GtkVBox" id="vbox20"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">12</property> - <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <widget class="GtkNotebook" id="notebook"> + <object class="GtkNotebook" id="notebook"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="show_border">False</property> <child> - <widget class="GtkVBox" id="vbox32"> + <object class="GtkVBox" id="vbox32"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow5"> + <object class="GtkScrolledWindow" id="scrolledwindow5"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="border_width">12</property> <property name="hscrollbar_policy">never</property> <property name="vscrollbar_policy">automatic</property> <child> - <widget class="GtkViewport" id="viewport1"> + <object class="GtkViewport" id="viewport1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="shadow_type">none</property> <child> - <widget class="GtkVBox" id="streamsVBox"> + <object class="GtkVBox" id="streamsVBox"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <child> - <widget class="GtkLabel" id="noStreamsLabel"> + <object class="GtkLabel" id="noStreamsLabel"> <property name="visible">True</property> <property name="sensitive">False</property> + <property name="can_focus">False</property> <property name="xpad">16</property> <property name="ypad">16</property> <property name="label" translatable="yes"><i>No application is currently playing audio.</i></property> <property name="use_markup">True</property> - </widget> + </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - </widget> + </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkAlignment" id="alignment3"> + <object class="GtkAlignment" id="alignment3"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="bottom_padding">12</property> <property name="left_padding">12</property> <property name="right_padding">12</property> <child> - <widget class="GtkHBox" id="hbox5"> + <object class="GtkHBox" id="hbox5"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label1"> + <object class="GtkLabel" id="label1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">1</property> <property name="label" translatable="yes"><b>_Show:</b></property> <property name="use_markup">True</property> <property name="use_underline">True</property> - </widget> + </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkComboBox" id="sinkInputTypeComboBox"> + <object class="GtkComboBox" id="sinkInputTypeComboBox"> <property name="visible">True</property> - <property name="items" translatable="yes" comments="Applications All streams">All Streams -Applications -Virtual Streams</property> - </widget> + <property name="can_focus">False</property> + <property name="model">liststore1</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label34"> + <child type="tab"> + <object class="GtkLabel" id="label34"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">_Playback</property> <property name="use_underline">True</property> - </widget> + </object> <packing> <property name="tab_fill">False</property> - <property name="type">tab</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox2"> + <object class="GtkVBox" id="vbox2"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow2"> + <object class="GtkScrolledWindow" id="scrolledwindow2"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="border_width">12</property> <property name="hscrollbar_policy">never</property> <property name="vscrollbar_policy">automatic</property> <child> - <widget class="GtkViewport" id="viewport5"> + <object class="GtkViewport" id="viewport5"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="shadow_type">none</property> <child> - <widget class="GtkVBox" id="recsVBox"> + <object class="GtkVBox" id="recsVBox"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <child> - <widget class="GtkLabel" id="noRecsLabel"> + <object class="GtkLabel" id="noRecsLabel"> <property name="visible">True</property> <property name="sensitive">False</property> + <property name="can_focus">False</property> <property name="xpad">16</property> <property name="ypad">16</property> <property name="label" translatable="yes"><i>No application is currently recording audio.</i></property> <property name="use_markup">True</property> - </widget> + </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - </widget> + </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkAlignment" id="alignment9"> + <object class="GtkAlignment" id="alignment9"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="bottom_padding">12</property> <property name="left_padding">12</property> <property name="right_padding">12</property> <child> - <widget class="GtkHBox" id="hbox7"> + <object class="GtkHBox" id="hbox7"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label8"> + <object class="GtkLabel" id="label8"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">1</property> <property name="label" translatable="yes"><b>_Show:</b></property> <property name="use_markup">True</property> <property name="use_underline">True</property> - </widget> + </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkComboBox" id="sourceOutputTypeComboBox"> + <object class="GtkComboBox" id="sourceOutputTypeComboBox"> <property name="visible">True</property> - <property name="items" translatable="yes" comments="Applications All streams">All Streams -Applications -Virtual Streams</property> - </widget> + <property name="can_focus">False</property> + <property name="model">liststore2</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext2"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - <child> - <widget class="GtkLabel" id="label2"> + <child type="tab"> + <object class="GtkLabel" id="label2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">_Recording</property> <property name="use_underline">True</property> - </widget> + </object> <packing> <property name="position">1</property> <property name="tab_fill">False</property> - <property name="type">tab</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox30"> + <object class="GtkVBox" id="vbox30"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow8"> + <object class="GtkScrolledWindow" id="scrolledwindow8"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="border_width">12</property> <property name="hscrollbar_policy">never</property> <property name="vscrollbar_policy">automatic</property> <child> - <widget class="GtkViewport" id="viewport4"> + <object class="GtkViewport" id="viewport4"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="shadow_type">none</property> <child> - <widget class="GtkVBox" id="sinksVBox"> + <object class="GtkVBox" id="sinksVBox"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <child> - <widget class="GtkLabel" id="noSinksLabel"> + <object class="GtkLabel" id="noSinksLabel"> <property name="visible">True</property> <property name="sensitive">False</property> + <property name="can_focus">False</property> <property name="xpad">16</property> <property name="ypad">16</property> <property name="label" translatable="yes"><i>No output devices available</i></property> <property name="use_markup">True</property> - </widget> + </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - </widget> + </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkAlignment" id="alignment1"> + <object class="GtkAlignment" id="alignment1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="bottom_padding">12</property> <property name="left_padding">12</property> <property name="right_padding">12</property> <child> - <widget class="GtkHBox" id="hbox3"> + <object class="GtkHBox" id="hbox3"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label4826"> + <object class="GtkLabel" id="label4826"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">1</property> <property name="label" translatable="yes"><b>S_how:</b></property> <property name="use_markup">True</property> <property name="use_underline">True</property> <property name="mnemonic_widget">sinkTypeComboBox</property> - </widget> + </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkComboBox" id="sinkTypeComboBox"> + <object class="GtkComboBox" id="sinkTypeComboBox"> <property name="visible">True</property> - <property name="items" translatable="yes">All Output Devices -Hardware Output Devices -Virtual Output Devices</property> - </widget> + <property name="can_focus">False</property> + <property name="model">liststore3</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext3"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="position">2</property> </packing> </child> - <child> - <widget class="GtkLabel" id="label4711"> + <child type="tab"> + <object class="GtkLabel" id="label4711"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">_Output Devices</property> <property name="use_underline">True</property> - </widget> + </object> <packing> <property name="position">2</property> <property name="tab_fill">False</property> - <property name="type">tab</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox31"> + <object class="GtkVBox" id="vbox31"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow7"> + <object class="GtkScrolledWindow" id="scrolledwindow7"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="border_width">12</property> <property name="hscrollbar_policy">never</property> <property name="vscrollbar_policy">automatic</property> <child> - <widget class="GtkViewport" id="viewport3"> + <object class="GtkViewport" id="viewport3"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="resize_mode">queue</property> <property name="shadow_type">none</property> <child> - <widget class="GtkVBox" id="sourcesVBox"> + <object class="GtkVBox" id="sourcesVBox"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <child> - <widget class="GtkLabel" id="noSourcesLabel"> + <object class="GtkLabel" id="noSourcesLabel"> <property name="visible">True</property> <property name="sensitive">False</property> + <property name="can_focus">False</property> <property name="xpad">16</property> <property name="ypad">16</property> <property name="label" translatable="yes"><i>No input devices available</i></property> <property name="use_markup">True</property> - </widget> + </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - </widget> + </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkAlignment" id="alignment2"> + <object class="GtkAlignment" id="alignment2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="bottom_padding">12</property> <property name="left_padding">12</property> <property name="right_padding">12</property> <child> - <widget class="GtkHBox" id="hbox4"> + <object class="GtkHBox" id="hbox4"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label4827"> + <object class="GtkLabel" id="label4827"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">1</property> <property name="label" translatable="yes"><b>Sho_w:</b></property> <property name="use_markup">True</property> <property name="use_underline">True</property> <property name="mnemonic_widget">sourceTypeComboBox</property> - </widget> + </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkComboBox" id="sourceTypeComboBox"> + <object class="GtkComboBox" id="sourceTypeComboBox"> <property name="visible">True</property> - <property name="items" translatable="yes">All Input Devices -All Except Monitors -Hardware Input Devices -Virtual Input Devices -Monitors</property> - </widget> + <property name="can_focus">False</property> + <property name="model">liststore4</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext4"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="position">3</property> </packing> </child> - <child> - <widget class="GtkLabel" id="label4717"> + <child type="tab"> + <object class="GtkLabel" id="label4717"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">_Input Devices</property> <property name="use_underline">True</property> - </widget> + </object> <packing> <property name="position">3</property> <property name="tab_fill">False</property> - <property name="type">tab</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox1"> + <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow1"> + <object class="GtkScrolledWindow" id="scrolledwindow1"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="border_width">12</property> <property name="hscrollbar_policy">never</property> <property name="vscrollbar_policy">automatic</property> <child> - <widget class="GtkViewport" id="viewport2"> + <object class="GtkViewport" id="viewport2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="shadow_type">none</property> <child> - <widget class="GtkVBox" id="cardsVBox"> + <object class="GtkVBox" id="cardsVBox"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <child> - <widget class="GtkLabel" id="noCardsLabel"> + <object class="GtkLabel" id="noCardsLabel"> <property name="visible">True</property> <property name="sensitive">False</property> + <property name="can_focus">False</property> <property name="xpad">16</property> <property name="ypad">16</property> <property name="label" translatable="yes"><i>No cards available for configuration</i></property> <property name="use_markup">True</property> - </widget> + </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - </widget> + </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> - </widget> + </object> <packing> <property name="position">4</property> </packing> </child> - <child> - <widget class="GtkLabel" id="label5"> + <child type="tab"> + <object class="GtkLabel" id="label5"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">_Configuration</property> <property name="use_underline">True</property> - </widget> + </object> <packing> <property name="position">4</property> <property name="tab_fill">False</property> - <property name="type">tab</property> </packing> </child> - </widget> + </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkLabel" id="connectingLabel"> + <object class="GtkLabel" id="connectingLabel"> + <property name="can_focus">False</property> <property name="label" translatable="yes"><i>Establishing connection to PulseAudio. Please wait...</i></property> <property name="use_markup">True</property> - </widget> + </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> - <widget class="GtkWindow" id="streamWindow"> + </object> + <object class="GtkDialog" id="renameDialog"> + <property name="can_focus">False</property> + <property name="border_width">5</property> + <property name="type_hint">normal</property> + <child internal-child="vbox"> + <object class="GtkVBox" id="dialog-vbox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">2</property> + <child internal-child="action_area"> + <object class="GtkHButtonBox" id="dialog-action_area1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="layout_style">end</property> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes"><b>Rename device to:</b></property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="renameText"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + <property name="activates_default">True</property> + <property name="width_chars">60</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + <property name="primary_icon_sensitive">True</property> + <property name="secondary_icon_sensitive">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + </child> + </object> + <object class="GtkWindow" id="streamWindow"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="title" translatable="yes">window1</property> <child> - <widget class="GtkEventBox" id="streamWidget"> + <object class="GtkEventBox" id="streamWidget"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <widget class="GtkVBox" id="streamWidget2"> + <object class="GtkVBox" id="streamWidget2"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <child> - <widget class="GtkVBox" id="vbox26"> + <object class="GtkVBox" id="vbox26"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">12</property> - <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <widget class="GtkHBox" id="hbox1"> + <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <widget class="GtkImage" id="iconImage"> + <object class="GtkImage" id="iconImage"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="stock">gtk-missing-image</property> - </widget> + </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox12"> + <object class="GtkHBox" id="hbox12"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">2</property> <child> - <widget class="GtkLabel" id="boldNameLabel"> + <object class="GtkLabel" id="boldNameLabel"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="use_markup">True</property> <property name="ellipsize">middle</property> - </widget> + </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkLabel" id="nameLabel"> + <object class="GtkLabel" id="nameLabel"> <property name="visible">True</property> + <property name="can_focus">False</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> + </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkLabel" id="directionLabel"> + <object class="GtkLabel" id="directionLabel"> <property name="visible">True</property> + <property name="can_focus">False</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> + </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> <child> - <widget class="GtkButton" id="deviceButton"> + <object class="GtkButton" id="deviceButton"> <property name="label" translatable="yes">Device</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="use_action_appearance">False</property> <property name="relief">half</property> <property name="xalign">0</property> - </widget> + </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="pack_type">end</property> <property name="position">3</property> </packing> </child> - </widget> + </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox10"> + <object class="GtkHBox" id="hbox10"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">3</property> <child> - <widget class="GtkToggleButton" id="muteToggleButton"> + <object class="GtkToggleButton" id="muteToggleButton"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip" translatable="yes">Mute audio</property> + <property name="tooltip_text" translatable="yes">Mute audio</property> + <property name="use_action_appearance">False</property> <property name="relief">none</property> <child> - <widget class="GtkImage" id="image20"> + <object class="GtkImage" id="image20"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="icon_name">audio-volume-muted</property> <property name="icon-size">1</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -613,34 +1277,37 @@ Monitors</property> </packing> </child> <child> - <widget class="GtkToggleButton" id="lockToggleButton"> + <object class="GtkToggleButton" id="lockToggleButton"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip" translatable="yes">Lock channels together</property> + <property name="tooltip_text" translatable="yes">Lock channels together</property> + <property name="use_action_appearance">False</property> <property name="relief">none</property> <property name="active">True</property> <child> - <widget class="GtkImage" id="image18"> + <object class="GtkImage" id="image18"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="icon_name">stock_lock</property> <property name="icon-size">1</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -648,9 +1315,9 @@ Monitors</property> </packing> </child> <child> - <widget class="GtkVBox" id="channelsVBox"> + <object class="GtkVBox" id="channelsVBox"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <placeholder/> @@ -658,14 +1325,14 @@ Monitors</property> <child> <placeholder/> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -673,437 +1340,19 @@ Monitors</property> </packing> </child> <child> - <widget class="GtkHSeparator" id="hseparator2"> + <object class="GtkHSeparator" id="hseparator2"> <property name="visible">True</property> - </widget> + <property name="can_focus">False</property> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> - </child> - </widget> - </child> - </widget> - <widget class="GtkWindow" id="deviceWindow"> - <property name="visible">True</property> - <property name="title" translatable="yes">window1</property> - <child> - <widget class="GtkEventBox" id="deviceWidget"> - <property name="visible">True</property> - <child> - <widget class="GtkVBox" id="streamWidget2"> - <property name="visible">True</property> - <property name="orientation">vertical</property> - <child> - <widget class="GtkVBox" id="vbox26"> - <property name="visible">True</property> - <property name="border_width">12</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <widget class="GtkHBox" id="hbox1"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <widget class="GtkImage" id="iconImage"> - <property name="visible">True</property> - <property name="stock">gtk-missing-image</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <widget class="GtkHBox" id="hbox12"> - <property name="visible">True</property> - <child> - <widget class="GtkLabel" id="boldNameLabel"> - <property name="visible">True</property> - <property name="use_markup">True</property> - <property name="ellipsize">middle</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="nameLabel"> - <property name="visible">True</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="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> - <widget class="GtkHBox" id="hbox10"> - <property name="visible">True</property> - <property name="spacing">3</property> - <child> - <widget class="GtkToggleButton" id="muteToggleButton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip" translatable="yes">Mute audio</property> - <property name="relief">none</property> - <child> - <widget class="GtkImage" id="image20"> - <property name="visible">True</property> - <property name="icon_name">audio-volume-muted</property> - <property name="icon-size">1</property> - </widget> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <widget class="GtkToggleButton" id="lockToggleButton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip" translatable="yes">Lock channels together</property> - <property name="relief">none</property> - <property name="active">True</property> - <child> - <widget class="GtkImage" id="image18"> - <property name="visible">True</property> - <property name="icon_name">stock_lock</property> - <property name="icon-size">1</property> - </widget> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <widget class="GtkToggleButton" id="defaultToggleButton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip" translatable="yes">Set as fallback</property> - <child> - <widget class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="icon_name">emblem-default</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> - <property name="position">2</property> - </packing> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <widget class="GtkHBox" id="portSelect"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <widget class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes"><b>Port:</b></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="portList"> - <property name="visible">True</property> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> - <widget class="GtkVBox" id="channelsVBox"> - <property name="visible">True</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </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> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <widget class="GtkHSeparator" id="hseparator2"> - <property name="visible">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - </widget> - <widget class="GtkWindow" id="channelWindow"> - <property name="visible">True</property> - <property name="title" translatable="yes">window2</property> - <child> - <widget class="GtkHBox" id="channelWidget"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <widget class="GtkLabel" id="channelLabel"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes"><b>left-front</b></property> - <property name="use_markup">True</property> - <property name="width_chars">15</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <widget class="GtkHScale" id="volumeScale"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">44.2408370972 0 100 5 0 0</property> - <property name="digits">0</property> - <property name="draw_value">False</property> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="volumeLabel"> - <property name="visible">True</property> - <property name="xalign">1</property> - <property name="label" translatable="yes">50%</property> - <property name="width_chars">9</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - </widget> - </child> - </widget> - <widget class="GtkWindow" id="cardWindow"> - <property name="visible">True</property> - <property name="title" translatable="yes">window1</property> - <child> - <widget class="GtkEventBox" id="cardWidget"> - <property name="visible">True</property> - <child> - <widget class="GtkVBox" id="cardWidget1"> - <property name="visible">True</property> - <property name="orientation">vertical</property> - <child> - <widget class="GtkVBox" id="vbox7"> - <property name="visible">True</property> - <property name="border_width">12</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <widget class="GtkHBox" id="hbox9"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <widget class="GtkImage" id="iconImage"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="stock">gtk-missing-image</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <widget class="GtkHBox" id="hbox11"> - <property name="visible">True</property> - <child> - <widget class="GtkLabel" id="nameLabel"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Card Name</property> - <property name="use_markup">True</property> - <property name="ellipsize">middle</property> - </widget> - <packing> - <property name="position">0</property> - </packing> - </child> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <widget class="GtkHBox" id="hbox1"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <widget class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes"><b>Profile:</b></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="profileList"> - <property name="visible">True</property> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <widget class="GtkHSeparator" id="hseparator5"> - <property name="visible">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - </widget> - <widget class="GtkDialog" id="renameDialog"> - <property name="border_width">5</property> - <property name="type_hint">normal</property> - <property name="has_separator">False</property> - <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox1"> - <property name="visible">True</property> - <property name="orientation">vertical</property> - <property name="spacing">2</property> - <child> - <widget class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes"><b>Rename device to:</b></property> - <property name="use_markup">True</property> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> - <widget class="GtkEntry" id="renameText"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">●</property> - <property name="activates_default">True</property> - <property name="width_chars">60</property> - </widget> - <packing> - <property name="position">2</property> - </packing> - </child> - <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="dialog-action_area1"> - <property name="visible">True</property> - <property name="layout_style">end</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="pack_type">end</property> - <property name="position">0</property> - </packing> + </object> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> +</interface> diff --git a/src/pavucontrol.h b/src/pavucontrol.h index 0e0f6bd..4e3d32e 100644 --- a/src/pavucontrol.h +++ b/src/pavucontrol.h @@ -27,7 +27,6 @@ #include <libintl.h> #include <gtkmm.h> -#include <libglademm.h> #include <pulse/pulseaudio.h> diff --git a/src/rolewidget.cc b/src/rolewidget.cc index 31be005..fd3196c 100644 --- a/src/rolewidget.cc +++ b/src/rolewidget.cc @@ -28,7 +28,7 @@ #include "i18n.h" -RoleWidget::RoleWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x) : +RoleWidget::RoleWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& x) : StreamWidget(cobject, x) { lockToggleButton->hide(); @@ -38,7 +38,7 @@ RoleWidget::RoleWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade: RoleWidget* RoleWidget::create() { RoleWidget* w; - Glib::RefPtr<Gnome::Glade::Xml> x = Gnome::Glade::Xml::create(GLADE_FILE, "streamWidget"); + Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_file(GLADE_FILE, "streamWidget"); x->get_widget_derived("streamWidget", w); return w; } diff --git a/src/rolewidget.h b/src/rolewidget.h index c7b198c..1d008f2 100644 --- a/src/rolewidget.h +++ b/src/rolewidget.h @@ -27,7 +27,7 @@ class RoleWidget : public StreamWidget { public: - RoleWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x); + RoleWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& x); static RoleWidget* create(); Glib::ustring role; diff --git a/src/sinkinputwidget.cc b/src/sinkinputwidget.cc index 76d865f..b88b718 100644 --- a/src/sinkinputwidget.cc +++ b/src/sinkinputwidget.cc @@ -28,7 +28,7 @@ #include "i18n.h" -SinkInputWidget::SinkInputWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x) : +SinkInputWidget::SinkInputWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& x) : StreamWidget(cobject, x) { gchar *txt; @@ -40,7 +40,7 @@ SinkInputWidget::SinkInputWidget(BaseObjectType* cobject, const Glib::RefPtr<Gno SinkInputWidget* SinkInputWidget::create(MainWindow* mainWindow) { SinkInputWidget* w; - Glib::RefPtr<Gnome::Glade::Xml> x = Gnome::Glade::Xml::create(GLADE_FILE, "streamWidget"); + Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_file(GLADE_FILE, "streamWidget"); x->get_widget_derived("streamWidget", w); w->init(mainWindow); return w; diff --git a/src/sinkinputwidget.h b/src/sinkinputwidget.h index 11893ff..de3ecb8 100644 --- a/src/sinkinputwidget.h +++ b/src/sinkinputwidget.h @@ -29,7 +29,7 @@ class MainWindow; class SinkInputWidget : public StreamWidget { public: - SinkInputWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x); + SinkInputWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& x); static SinkInputWidget* create(MainWindow* mainWindow); ~SinkInputWidget(void); diff --git a/src/sinkwidget.cc b/src/sinkwidget.cc index 3196dc7..c797e68 100644 --- a/src/sinkwidget.cc +++ b/src/sinkwidget.cc @@ -28,13 +28,13 @@ #include "i18n.h" -SinkWidget::SinkWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x) : +SinkWidget::SinkWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& x) : DeviceWidget(cobject, x) { } SinkWidget* SinkWidget::create(MainWindow* mainWindow) { SinkWidget* w; - Glib::RefPtr<Gnome::Glade::Xml> x = Gnome::Glade::Xml::create(GLADE_FILE, "deviceWidget"); + Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_file(GLADE_FILE, "deviceWidget"); x->get_widget_derived("deviceWidget", w); w->init(mainWindow, "sink"); return w; diff --git a/src/sinkwidget.h b/src/sinkwidget.h index 84f0d4a..3fbd7aa 100644 --- a/src/sinkwidget.h +++ b/src/sinkwidget.h @@ -27,7 +27,7 @@ class SinkWidget : public DeviceWidget { public: - SinkWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x); + SinkWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& x); static SinkWidget* create(MainWindow* mainWindow); SinkType type; diff --git a/src/sourceoutputwidget.cc b/src/sourceoutputwidget.cc index 7064b38..ce1cbb6 100644 --- a/src/sourceoutputwidget.cc +++ b/src/sourceoutputwidget.cc @@ -28,7 +28,7 @@ #include "i18n.h" -SourceOutputWidget::SourceOutputWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x) : +SourceOutputWidget::SourceOutputWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& x) : StreamWidget(cobject, x) { gchar *txt; @@ -44,7 +44,7 @@ SourceOutputWidget::SourceOutputWidget(BaseObjectType* cobject, const Glib::RefP SourceOutputWidget* SourceOutputWidget::create(MainWindow* mainWindow) { SourceOutputWidget* w; - Glib::RefPtr<Gnome::Glade::Xml> x = Gnome::Glade::Xml::create(GLADE_FILE, "streamWidget"); + Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_file(GLADE_FILE, "streamWidget"); x->get_widget_derived("streamWidget", w); w->init(mainWindow); return w; diff --git a/src/sourceoutputwidget.h b/src/sourceoutputwidget.h index 0b88d06..e9b0dce 100644 --- a/src/sourceoutputwidget.h +++ b/src/sourceoutputwidget.h @@ -29,7 +29,7 @@ class MainWindow; class SourceOutputWidget : public StreamWidget { public: - SourceOutputWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x); + SourceOutputWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& x); static SourceOutputWidget* create(MainWindow* mainWindow); ~SourceOutputWidget(void); diff --git a/src/sourcewidget.cc b/src/sourcewidget.cc index 29980cc..5e4ecf0 100644 --- a/src/sourcewidget.cc +++ b/src/sourcewidget.cc @@ -26,13 +26,13 @@ #include "i18n.h" -SourceWidget::SourceWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x) : +SourceWidget::SourceWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& x) : DeviceWidget(cobject, x) { } SourceWidget* SourceWidget::create(MainWindow* mainWindow) { SourceWidget* w; - Glib::RefPtr<Gnome::Glade::Xml> x = Gnome::Glade::Xml::create(GLADE_FILE, "deviceWidget"); + Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_file(GLADE_FILE, "deviceWidget"); x->get_widget_derived("deviceWidget", w); w->init(mainWindow, "source"); return w; diff --git a/src/sourcewidget.h b/src/sourcewidget.h index 9a2cca3..ebd92e3 100644 --- a/src/sourcewidget.h +++ b/src/sourcewidget.h @@ -27,7 +27,7 @@ class SourceWidget : public DeviceWidget { public: - SourceWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x); + SourceWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& x); static SourceWidget* create(MainWindow* mainWindow); SourceType type; diff --git a/src/streamwidget.cc b/src/streamwidget.cc index c4ad15f..431e460 100644 --- a/src/streamwidget.cc +++ b/src/streamwidget.cc @@ -29,7 +29,7 @@ #include "i18n.h" /*** StreamWidget ***/ -StreamWidget::StreamWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x) : +StreamWidget::StreamWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& x) : MinimalStreamWidget(cobject, x), peak(NULL), mpMainWindow(NULL) { diff --git a/src/streamwidget.h b/src/streamwidget.h index 28a2a47..b797ec5 100644 --- a/src/streamwidget.h +++ b/src/streamwidget.h @@ -30,7 +30,7 @@ class ChannelWidget; class StreamWidget : public MinimalStreamWidget { public: - StreamWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x); + StreamWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& x); void init(MainWindow* mainWindow); void setChannelMap(const pa_channel_map &m, bool can_decibel); |