itdominator
/
pavucontrol
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Embed ui file as resource and clean it up 

Remove a lot of unrequired ids, and fix meson dependency name
This commit is contained in:
JA 2024-04-26 17:13:28 +02:00
parent 22b04fff6e
commit 64881e3db0
15 changed files with 99 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meson.build
View File

@ -39,7 +39,6 @@ cdata.set_quoted('PACKAGE_STRING', 'pavucontrol')
cdata.set_quoted('PACKAGE_VERSION', meson.project_version()) cdata.set_quoted('PACKAGE_VERSION', meson.project_version())
cdata.set_quoted('GETTEXT_PACKAGE', 'pavucontrol') cdata.set_quoted('GETTEXT_PACKAGE', 'pavucontrol')
cdata.set_quoted('LOCALEDIR', localedir) cdata.set_quoted('LOCALEDIR', localedir)
cdata.set_quoted('GLADE_FILE', join_paths(datadir, 'pavucontrol', 'pavucontrol.glade'))
cdata.set('HAVE_LIBCANBERRA', canberragtk_dep.found()) cdata.set('HAVE_LIBCANBERRA', canberragtk_dep.found())

2
src/cardwidget.cc
View File

@ -60,7 +60,7 @@ CardWidget::CardWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>
CardWidget* CardWidget::create() { CardWidget* CardWidget::create() {
CardWidget* w; CardWidget* w;
Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_file(GLADE_FILE, "cardWidget"); Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "cardWidget");
w = Gtk::Builder::get_widget_derived<CardWidget>(x, "cardWidget"); w = Gtk::Builder::get_widget_derived<CardWidget>(x, "cardWidget");
w->reference(); w->reference();
return w; return w;

4
src/channelwidget.cc
View File

@ -50,8 +50,8 @@ ChannelWidget::ChannelWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Bu
ChannelWidget* ChannelWidget::createOne(MinimalStreamWidget *owner, int channelIndex, pa_channel_position channelPosition, bool can_decibel) { ChannelWidget* ChannelWidget::createOne(MinimalStreamWidget *owner, int channelIndex, pa_channel_position channelPosition, bool can_decibel) {
ChannelWidget* w; ChannelWidget* w;
Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create(); Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create();
x->add_from_file(GLADE_FILE, "adjustment1"); x->add_from_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "adjustment1");
x->add_from_file(GLADE_FILE, "channelWidget"); x->add_from_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "channelWidget");
w = Gtk::Builder::get_widget_derived<ChannelWidget>(x, "channelWidget"); w = Gtk::Builder::get_widget_derived<ChannelWidget>(x, "channelWidget");
w->reference(); w->reference();

2
src/devicewidget.cc
View File

@ -261,7 +261,7 @@ void DeviceWidget::openRenamePopup(const Glib::VariantBase& parameter) {
return; return;
} }
Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_file(GLADE_FILE, "renameDialog"); Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "renameDialog");
gchar *key = g_markup_printf_escaped("%s:%s", mDeviceType.c_str(), name.c_str()); gchar *key = g_markup_printf_escaped("%s:%s", mDeviceType.c_str(), name.c_str());
RenameWindow* renameDialog = Gtk::Builder::get_widget_derived<RenameWindow>(x, "renameDialog", description.c_str(), key); RenameWindow* renameDialog = Gtk::Builder::get_widget_derived<RenameWindow>(x, "renameDialog", description.c_str(), key);
renameDialog->set_transient_for(*mpMainWindow); renameDialog->set_transient_for(*mpMainWindow);

10
src/mainwindow.cc
View File

@ -182,11 +182,11 @@ MainWindow::MainWindow(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>
MainWindow* MainWindow::create(bool maximize) { MainWindow* MainWindow::create(bool maximize) {
MainWindow* w; MainWindow* w;
Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create(); Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create();
x->add_from_file(GLADE_FILE, "liststore1"); x->add_from_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "liststore1");
x->add_from_file(GLADE_FILE, "liststore2"); x->add_from_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "liststore2");
x->add_from_file(GLADE_FILE, "liststore3"); x->add_from_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "liststore3");
x->add_from_file(GLADE_FILE, "liststore4"); x->add_from_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "liststore4");
x->add_from_file(GLADE_FILE, "mainWindow"); x->add_from_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "mainWindow");
w = Gtk::Builder::get_widget_derived<MainWindow>(x, "mainWindow"); w = Gtk::Builder::get_widget_derived<MainWindow>(x, "mainWindow");
w->get_style_context()->add_class("pavucontrol-window"); w->get_style_context()->add_class("pavucontrol-window");
if (w && maximize) if (w && maximize)

10
src/meson.build
View File

@ -1,3 +1,10 @@
gnome = import('gnome')
resources = gnome.compile_resources('resources',
'resources.gresource.xml',
source_dir: '.',
c_name: 'resources'
)
pavucontrol_sources = [ pavucontrol_sources = [
'cardwidget.cc', 'cardwidget.cc',
'channelwidget.cc', 'channelwidget.cc',
@ -12,6 +19,7 @@ pavucontrol_sources = [
'sourceoutputwidget.cc', 'sourceoutputwidget.cc',
'sourcewidget.cc', 'sourcewidget.cc',
'streamwidget.cc', 'streamwidget.cc',
resources
] ]
pavucontrol_deps = [gtkmm_dep, sigcpp_dep, canberragtk_dep, libpulse_dep, libpulsemlglib_dep] pavucontrol_deps = [gtkmm_dep, sigcpp_dep, canberragtk_dep, libpulse_dep, libpulsemlglib_dep]
@ -30,8 +38,6 @@ executable('pavucontrol',
dependencies : pavucontrol_deps, dependencies : pavucontrol_deps,
) )
install_data('pavucontrol.glade')
desktop_file = i18n.merge_file( desktop_file = i18n.merge_file(
input : 'org.pulseaudio.pavucontrol.desktop.in', input : 'org.pulseaudio.pavucontrol.desktop.in',
output : 'org.pulseaudio.pavucontrol.desktop', output : 'org.pulseaudio.pavucontrol.desktop',

142
src/pavucontrol.glade
View File

@ -58,7 +58,7 @@
<object class="GtkBox" id="cardWidget"> <object class="GtkBox" id="cardWidget">
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkBox" id="vbox7"> <object class="GtkBox">
<property name="valign">center</property> <property name="valign">center</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">6</property>
@ -67,7 +67,7 @@
<property name="margin-end">12</property> <property name="margin-end">12</property>
<property name="margin-bottom">12</property> <property name="margin-bottom">12</property>
<child> <child>
<object class="GtkBox" id="hbox9"> <object class="GtkBox">
<property name="valign">center</property> <property name="valign">center</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
@ -76,7 +76,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkBox" id="hbox11"> <object class="GtkBox">
<property name="hexpand">1</property> <property name="hexpand">1</property>
<child> <child>
<object class="GtkLabel" id="cardNameLabel"> <object class="GtkLabel" id="cardNameLabel">
@ -90,7 +90,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkBox" id="hbox14"> <object class="GtkBox">
<property name="spacing">3</property> <property name="spacing">3</property>
<child> <child>
<object class="GtkToggleButton" id="profileLockToggleButton"> <object class="GtkToggleButton" id="profileLockToggleButton">
@ -100,7 +100,7 @@
<property name="has-frame">0</property> <property name="has-frame">0</property>
<property name="active">1</property> <property name="active">1</property>
<child> <child>
<object class="GtkImage" id="image4"> <object class="GtkImage">
<property name="icon_name">changes-prevent</property> <property name="icon_name">changes-prevent</property>
<property name="icon_size">normal</property> <property name="icon_size">normal</property>
</object> </object>
@ -112,11 +112,11 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkBox" id="hbox1"> <object class="GtkBox">
<property name="valign">center</property> <property name="valign">center</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<object class="GtkLabel" id="label1"> <object class="GtkLabel">
<property name="label" translatable="1">&lt;b&gt;Profile:&lt;/b&gt;</property> <property name="label" translatable="1">&lt;b&gt;Profile:&lt;/b&gt;</property>
<property name="use_markup">1</property> <property name="use_markup">1</property>
<property name="xalign">0</property> <property name="xalign">0</property>
@ -132,7 +132,7 @@
<property name="halign">center</property> <property name="halign">center</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<object class="GtkLabel" id="label51"> <object class="GtkLabel">
<property name="label" translatable="1">&lt;b&gt;Codec:&lt;/b&gt;</property> <property name="label" translatable="1">&lt;b&gt;Codec:&lt;/b&gt;</property>
<property name="use_markup">1</property> <property name="use_markup">1</property>
<property name="xalign">0</property> <property name="xalign">0</property>
@ -150,7 +150,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkSeparator" id="hseparator5"> <object class="GtkSeparator">
<property name="valign">center</property> <property name="valign">center</property>
</object> </object>
</child> </child>
@ -167,7 +167,7 @@
<object class="GtkBox" id="deviceWidget"> <object class="GtkBox" id="deviceWidget">
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkBox" id="vbox26"> <object class="GtkBox">
<property name="valign">center</property> <property name="valign">center</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">6</property>
@ -176,7 +176,7 @@
<property name="margin-end">12</property> <property name="margin-end">12</property>
<property name="margin-bottom">12</property> <property name="margin-bottom">12</property>
<child> <child>
<object class="GtkBox" id="hbox2"> <object class="GtkBox">
<property name="valign">center</property> <property name="valign">center</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
@ -185,7 +185,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkBox" id="hbox12"> <object class="GtkBox">
<property name="hexpand">1</property> <property name="hexpand">1</property>
<child> <child>
<object class="GtkLabel" id="deviceBoldNameLabel"> <object class="GtkLabel" id="deviceBoldNameLabel">
@ -203,7 +203,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkBox" id="hbox10"> <object class="GtkBox">
<property name="spacing">3</property> <property name="spacing">3</property>
<child> <child>
<object class="GtkToggleButton" id="deviceMuteToggleButton"> <object class="GtkToggleButton" id="deviceMuteToggleButton">
@ -212,7 +212,7 @@
<property name="tooltip_text" translatable="1">Mute audio</property> <property name="tooltip_text" translatable="1">Mute audio</property>
<property name="has-frame">0</property> <property name="has-frame">0</property>
<child> <child>
<object class="GtkImage" id="image20"> <object class="GtkImage">
<property name="icon_name">audio-volume-muted</property> <property name="icon_name">audio-volume-muted</property>
<property name="icon_size">normal</property> <property name="icon_size">normal</property>
</object> </object>
@ -227,7 +227,7 @@
<property name="has-frame">0</property> <property name="has-frame">0</property>
<property name="active">1</property> <property name="active">1</property>
<child> <child>
<object class="GtkImage" id="image18"> <object class="GtkImage">
<property name="icon_name">changes-prevent</property> <property name="icon_name">changes-prevent</property>
<property name="icon_size">normal</property> <property name="icon_size">normal</property>
</object> </object>
@ -240,7 +240,7 @@
<property name="focusable">1</property> <property name="focusable">1</property>
<property name="tooltip_text" translatable="1">Set as default</property> <property name="tooltip_text" translatable="1">Set as default</property>
<child> <child>
<object class="GtkImage" id="image2"> <object class="GtkImage">
<property name="icon_name">emblem-default</property> <property name="icon_name">emblem-default</property>
</object> </object>
</child> </child>
@ -255,7 +255,7 @@
<property name="valign">center</property> <property name="valign">center</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<object class="GtkLabel" id="label2"> <object class="GtkLabel">
<property name="label" translatable="1">&lt;b&gt;Port:&lt;/b&gt;</property> <property name="label" translatable="1">&lt;b&gt;Port:&lt;/b&gt;</property>
<property name="use_markup">1</property> <property name="use_markup">1</property>
<property name="xalign">0</property> <property name="xalign">0</property>
@ -287,7 +287,7 @@
<property name="visible">0</property> <property name="visible">0</property>
<property name="focusable">1</property> <property name="focusable">1</property>
<child> <child>
<object class="GtkBox" id="vbox1"> <object class="GtkBox">
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkGrid" id="encodingSelect"> <object class="GtkGrid" id="encodingSelect">
@ -384,7 +384,7 @@
<property name="valign">center</property> <property name="valign">center</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<object class="GtkLabel" id="label3"> <object class="GtkLabel">
<property name="label" translatable="1">&lt;b&gt;Latency offset:&lt;/b&gt;</property> <property name="label" translatable="1">&lt;b&gt;Latency offset:&lt;/b&gt;</property>
<property name="use_markup">1</property> <property name="use_markup">1</property>
<property name="xalign">0</property> <property name="xalign">0</property>
@ -397,7 +397,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkLabel" id="label4"> <object class="GtkLabel">
<property name="label" translatable="1">ms</property> <property name="label" translatable="1">ms</property>
<property name="use_markup">1</property> <property name="use_markup">1</property>
</object> </object>
@ -416,7 +416,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkSeparator" id="hseparator2"> <object class="GtkSeparator">
<property name="valign">center</property> <property name="valign">center</property>
</object> </object>
</child> </child>
@ -502,7 +502,7 @@
<placeholder/> <placeholder/>
</child> </child>
<property name="child"> <property name="child">
<object class="GtkBox" id="vbox20"> <object class="GtkBox">
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">12</property> <property name="spacing">12</property>
<child> <child>
@ -514,14 +514,14 @@
<child> <child>
<object class="GtkNotebookPage"> <object class="GtkNotebookPage">
<property name="child"> <property name="child">
<object class="GtkBox" id="vbox32"> <object class="GtkBox">
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkScrolledWindow" id="scrolledwindow5"> <object class="GtkScrolledWindow">
<property name="vexpand">1</property> <property name="vexpand">1</property>
<property name="focusable">1</property> <property name="focusable">1</property>
<property name="child"> <property name="child">
<object class="GtkViewport" id="viewport1"> <object class="GtkViewport">
<property name="child"> <property name="child">
<object class="GtkBox" id="streamsVBox"> <object class="GtkBox" id="streamsVBox">
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
@ -540,12 +540,12 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkSeparator" id="hseparator1"> <object class="GtkSeparator">
<property name="valign">center</property> <property name="valign">center</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkBox" id="hbox5"> <object class="GtkBox">
<property name="spacing">6</property> <property name="spacing">6</property>
<property name="margin-top">12</property> <property name="margin-top">12</property>
<property name="margin-bottom">12</property> <property name="margin-bottom">12</property>
@ -553,7 +553,7 @@
<property name="margin-end">12</property> <property name="margin-end">12</property>
<property name="valign">center</property> <property name="valign">center</property>
<child> <child>
<object class="GtkLabel" id="label5"> <object class="GtkLabel">
<property name="hexpand">1</property> <property name="hexpand">1</property>
<property name="label" translatable="1">&lt;b&gt;_Show:&lt;/b&gt;</property> <property name="label" translatable="1">&lt;b&gt;_Show:&lt;/b&gt;</property>
<property name="use_markup">1</property> <property name="use_markup">1</property>
@ -566,7 +566,7 @@
<property name="hexpand">1</property> <property name="hexpand">1</property>
<property name="model">liststore1</property> <property name="model">liststore1</property>
<child> <child>
<object class="GtkCellRendererText" id="cellrenderertext1"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">0</attribute> <attribute name="text">0</attribute>
</attributes> </attributes>
@ -578,7 +578,7 @@
</object> </object>
</property> </property>
<property name="tab"> <property name="tab">
<object class="GtkLabel" id="label34"> <object class="GtkLabel">
<property name="label" translatable="1">_Playback</property> <property name="label" translatable="1">_Playback</property>
<property name="use_underline">1</property> <property name="use_underline">1</property>
</object> </object>
@ -588,14 +588,14 @@
<child> <child>
<object class="GtkNotebookPage"> <object class="GtkNotebookPage">
<property name="child"> <property name="child">
<object class="GtkBox" id="vbox2"> <object class="GtkBox">
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkScrolledWindow" id="scrolledwindow2"> <object class="GtkScrolledWindow">
<property name="vexpand">1</property> <property name="vexpand">1</property>
<property name="focusable">1</property> <property name="focusable">1</property>
<property name="child"> <property name="child">
<object class="GtkViewport" id="viewport5"> <object class="GtkViewport">
<property name="child"> <property name="child">
<object class="GtkBox" id="recsVBox"> <object class="GtkBox" id="recsVBox">
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
@ -614,12 +614,12 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkSeparator" id="hseparator3"> <object class="GtkSeparator">
<property name="valign">center</property> <property name="valign">center</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkBox" id="hbox7"> <object class="GtkBox">
<property name="spacing">6</property> <property name="spacing">6</property>
<property name="margin-top">12</property> <property name="margin-top">12</property>
<property name="margin-bottom">12</property> <property name="margin-bottom">12</property>
@ -627,7 +627,7 @@
<property name="margin-end">12</property> <property name="margin-end">12</property>
<property name="valign">center</property> <property name="valign">center</property>
<child> <child>
<object class="GtkLabel" id="label8"> <object class="GtkLabel">
<property name="hexpand">1</property> <property name="hexpand">1</property>
<property name="label" translatable="1">&lt;b&gt;_Show:&lt;/b&gt;</property> <property name="label" translatable="1">&lt;b&gt;_Show:&lt;/b&gt;</property>
<property name="use_markup">1</property> <property name="use_markup">1</property>
@ -640,7 +640,7 @@
<property name="hexpand">1</property> <property name="hexpand">1</property>
<property name="model">liststore2</property> <property name="model">liststore2</property>
<child> <child>
<object class="GtkCellRendererText" id="cellrenderertext2"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">0</attribute> <attribute name="text">0</attribute>
</attributes> </attributes>
@ -652,7 +652,7 @@
</object> </object>
</property> </property>
<property name="tab"> <property name="tab">
<object class="GtkLabel" id="label6"> <object class="GtkLabel">
<property name="label" translatable="1">_Recording</property> <property name="label" translatable="1">_Recording</property>
<property name="use_underline">1</property> <property name="use_underline">1</property>
</object> </object>
@ -662,14 +662,14 @@
<child> <child>
<object class="GtkNotebookPage"> <object class="GtkNotebookPage">
<property name="child"> <property name="child">
<object class="GtkBox" id="vbox30"> <object class="GtkBox">
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkScrolledWindow" id="scrolledwindow8"> <object class="GtkScrolledWindow">
<property name="vexpand">1</property> <property name="vexpand">1</property>
<property name="focusable">1</property> <property name="focusable">1</property>
<property name="child"> <property name="child">
<object class="GtkViewport" id="viewport4"> <object class="GtkViewport">
<property name="child"> <property name="child">
<object class="GtkBox" id="sinksVBox"> <object class="GtkBox" id="sinksVBox">
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
@ -688,12 +688,12 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkSeparator" id="hseparator4"> <object class="GtkSeparator">
<property name="valign">center</property> <property name="valign">center</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkBox" id="hbox3"> <object class="GtkBox">
<property name="spacing">6</property> <property name="spacing">6</property>
<property name="margin-top">12</property> <property name="margin-top">12</property>
<property name="margin-bottom">12</property> <property name="margin-bottom">12</property>
@ -701,7 +701,7 @@
<property name="margin-end">12</property> <property name="margin-end">12</property>
<property name="valign">center</property> <property name="valign">center</property>
<child> <child>
<object class="GtkLabel" id="label4826"> <object class="GtkLabel">
<property name="hexpand">1</property> <property name="hexpand">1</property>
<property name="label" translatable="1">&lt;b&gt;S_how:&lt;/b&gt;</property> <property name="label" translatable="1">&lt;b&gt;S_how:&lt;/b&gt;</property>
<property name="use_markup">1</property> <property name="use_markup">1</property>
@ -715,7 +715,7 @@
<property name="hexpand">1</property> <property name="hexpand">1</property>
<property name="model">liststore3</property> <property name="model">liststore3</property>
<child> <child>
<object class="GtkCellRendererText" id="cellrenderertext3"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">0</attribute> <attribute name="text">0</attribute>
</attributes> </attributes>
@ -727,7 +727,7 @@
</object> </object>
</property> </property>
<property name="tab"> <property name="tab">
<object class="GtkLabel" id="label4711"> <object class="GtkLabel">
<property name="label" translatable="1">_Output Devices</property> <property name="label" translatable="1">_Output Devices</property>
<property name="use_underline">1</property> <property name="use_underline">1</property>
</object> </object>
@ -737,14 +737,14 @@
<child> <child>
<object class="GtkNotebookPage"> <object class="GtkNotebookPage">
<property name="child"> <property name="child">
<object class="GtkBox" id="vbox31"> <object class="GtkBox">
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkScrolledWindow" id="scrolledwindow7"> <object class="GtkScrolledWindow">
<property name="vexpand">1</property> <property name="vexpand">1</property>
<property name="focusable">1</property> <property name="focusable">1</property>
<property name="child"> <property name="child">
<object class="GtkViewport" id="viewport3"> <object class="GtkViewport">
<property name="child"> <property name="child">
<object class="GtkBox" id="sourcesVBox"> <object class="GtkBox" id="sourcesVBox">
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
@ -763,12 +763,12 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkSeparator" id="hseparator6"> <object class="GtkSeparator">
<property name="valign">center</property> <property name="valign">center</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkBox" id="hbox4"> <object class="GtkBox">
<property name="spacing">6</property> <property name="spacing">6</property>
<property name="margin-top">12</property> <property name="margin-top">12</property>
<property name="margin-bottom">12</property> <property name="margin-bottom">12</property>
@ -776,7 +776,7 @@
<property name="margin-end">12</property> <property name="margin-end">12</property>
<property name="valign">center</property> <property name="valign">center</property>
<child> <child>
<object class="GtkLabel" id="label4827"> <object class="GtkLabel">
<property name="hexpand">1</property> <property name="hexpand">1</property>
<property name="label" translatable="1">&lt;b&gt;Sho_w:&lt;/b&gt;</property> <property name="label" translatable="1">&lt;b&gt;Sho_w:&lt;/b&gt;</property>
<property name="use_markup">1</property> <property name="use_markup">1</property>
@ -790,7 +790,7 @@
<property name="hexpand">1</property> <property name="hexpand">1</property>
<property name="model">liststore4</property> <property name="model">liststore4</property>
<child> <child>
<object class="GtkCellRendererText" id="cellrenderertext4"/> <object class="GtkCellRendererText"/>
<attributes> <attributes>
<attribute name="text">0</attribute> <attribute name="text">0</attribute>
</attributes> </attributes>
@ -802,7 +802,7 @@
</object> </object>
</property> </property>
<property name="tab"> <property name="tab">
<object class="GtkLabel" id="label4717"> <object class="GtkLabel">
<property name="label" translatable="1">_Input Devices</property> <property name="label" translatable="1">_Input Devices</property>
<property name="use_underline">1</property> <property name="use_underline">1</property>
</object> </object>
@ -812,16 +812,16 @@
<child> <child>
<object class="GtkNotebookPage"> <object class="GtkNotebookPage">
<property name="child"> <property name="child">
<object class="GtkBox" id="vbox3"> <object class="GtkBox">
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkScrolledWindow" id="scrolledwindow1"> <object class="GtkScrolledWindow">
<property name="vexpand">1</property> <property name="vexpand">1</property>
<property name="focusable">1</property> <property name="focusable">1</property>
<property name="child"> <property name="child">
<object class="GtkViewport" id="viewport2"> <object class="GtkViewport">
<property name="child"> <property name="child">
<object class="GtkBox" id="vbox4"> <object class="GtkBox">
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkBox" id="cardsVBox"> <object class="GtkBox" id="cardsVBox">
@ -838,11 +838,11 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkBox" id="vbox5"> <object class="GtkBox">
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="vexpand-set">1</property> <property name="vexpand-set">1</property>
<child> <child>
<object class="GtkSeparator" id="hseparator7"/> <object class="GtkSeparator"/>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="showVolumeMetersCheckButton"> <object class="GtkCheckButton" id="showVolumeMetersCheckButton">
@ -862,7 +862,7 @@
</object> </object>
</property> </property>
<property name="tab"> <property name="tab">
<object class="GtkLabel" id="label7"> <object class="GtkLabel">
<property name="label" translatable="1">_Configuration</property> <property name="label" translatable="1">_Configuration</property>
<property name="use_underline">1</property> <property name="use_underline">1</property>
</object> </object>
@ -885,7 +885,7 @@
<object class="GtkApplicationWindow" id="renameDialog"> <object class="GtkApplicationWindow" id="renameDialog">
<property name="modal">1</property> <property name="modal">1</property>
<child> <child>
<object class="GtkBox" id="dialog-vbox1"> <object class="GtkBox">
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">2</property> <property name="spacing">2</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
@ -893,7 +893,7 @@
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-bottom">5</property> <property name="margin-bottom">5</property>
<child> <child>
<object class="GtkLabel" id="label9"> <object class="GtkLabel">
<property name="vexpand">1</property> <property name="vexpand">1</property>
<property name="label" translatable="1">&lt;b&gt;Rename device to:&lt;/b&gt;</property> <property name="label" translatable="1">&lt;b&gt;Rename device to:&lt;/b&gt;</property>
<property name="use_markup">1</property> <property name="use_markup">1</property>
@ -910,7 +910,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkBox" id="dialog-action_area1"> <object class="GtkBox">
<property name="baseline_position">bottom</property> <property name="baseline_position">bottom</property>
<property name="halign">GTK_ALIGN_END</property> <property name="halign">GTK_ALIGN_END</property>
<property name="homogeneous">1</property> <property name="homogeneous">1</property>
@ -945,7 +945,7 @@
<object class="GtkBox" id="streamWidget"> <object class="GtkBox" id="streamWidget">
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkBox" id="vbox6"> <object class="GtkBox">
<property name="valign">center</property> <property name="valign">center</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">6</property>
@ -954,7 +954,7 @@
<property name="margin-end">12</property> <property name="margin-end">12</property>
<property name="margin-bottom">12</property> <property name="margin-bottom">12</property>
<child> <child>
<object class="GtkBox" id="hbox6"> <object class="GtkBox">
<property name="valign">center</property> <property name="valign">center</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
@ -963,7 +963,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkBox" id="hbox8"> <object class="GtkBox">
<property name="hexpand">1</property> <property name="hexpand">1</property>
<property name="spacing">2</property> <property name="spacing">2</property>
<child> <child>
@ -997,7 +997,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkBox" id="hbox13"> <object class="GtkBox">
<property name="spacing">3</property> <property name="spacing">3</property>
<child> <child>
<object class="GtkToggleButton" id="streamMuteToggleButton"> <object class="GtkToggleButton" id="streamMuteToggleButton">
@ -1006,7 +1006,7 @@
<property name="tooltip_text" translatable="1">Mute audio</property> <property name="tooltip_text" translatable="1">Mute audio</property>
<property name="has-frame">0</property> <property name="has-frame">0</property>
<child> <child>
<object class="GtkImage" id="image1"> <object class="GtkImage">
<property name="icon_name">audio-volume-muted</property> <property name="icon_name">audio-volume-muted</property>
<property name="icon_size">normal</property> <property name="icon_size">normal</property>
</object> </object>
@ -1021,7 +1021,7 @@
<property name="has-frame">0</property> <property name="has-frame">0</property>
<property name="active">1</property> <property name="active">1</property>
<child> <child>
<object class="GtkImage" id="image3"> <object class="GtkImage">
<property name="icon_name">changes-prevent</property> <property name="icon_name">changes-prevent</property>
<property name="icon_size">normal</property> <property name="icon_size">normal</property>
</object> </object>
@ -1048,7 +1048,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkSeparator" id="hseparator8"> <object class="GtkSeparator">
<property name="valign">center</property> <property name="valign">center</property>
</object> </object>
</child> </child>

8
src/pavucontrol.gladep
View File

@ -1,8 +0,0 @@
<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
<glade-project>
<name></name>
<program_name></program_name>
<gnome_support>FALSE</gnome_support>
</glade-project>

4
src/pavucontrol.h
View File

@ -31,10 +31,6 @@
#include <pulse/pulseaudio.h> #include <pulse/pulseaudio.h>
#include <pulse/glib-mainloop.h> #include <pulse/glib-mainloop.h>
#ifndef GLADE_FILE
#define GLADE_FILE "pavucontrol.glade"
#endif
/* Can be removed when PulseAudio 0.9.23 or newer is required */ /* Can be removed when PulseAudio 0.9.23 or newer is required */
#ifndef PA_VOLUME_UI_MAX #ifndef PA_VOLUME_UI_MAX
# define PA_VOLUME_UI_MAX (pa_sw_volume_from_dB(+11.0)) # define PA_VOLUME_UI_MAX (pa_sw_volume_from_dB(+11.0))

6
src/resources.gresource.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/pulseaudio/pavucontrol/ui">
<file preprocess="xml-stripblanks" compressed="true">pavucontrol.glade</file>
</gresource>
</gresources>

2
src/rolewidget.cc
View File

@ -38,7 +38,7 @@ RoleWidget::RoleWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>
RoleWidget* RoleWidget::create() { RoleWidget* RoleWidget::create() {
RoleWidget* w; RoleWidget* w;
Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_file(GLADE_FILE, "streamWidget"); Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "streamWidget");
w = Gtk::Builder::get_widget_derived<RoleWidget>(x, "streamWidget"); w = Gtk::Builder::get_widget_derived<RoleWidget>(x, "streamWidget");
w->reference(); w->reference();
return w; return w;

2
src/sinkinputwidget.cc
View File

@ -40,7 +40,7 @@ SinkInputWidget::SinkInputWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk
SinkInputWidget* SinkInputWidget::create(MainWindow* mainWindow) { SinkInputWidget* SinkInputWidget::create(MainWindow* mainWindow) {
SinkInputWidget* w; SinkInputWidget* w;
Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_file(GLADE_FILE, "streamWidget"); Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "streamWidget");
w = Gtk::Builder::get_widget_derived<SinkInputWidget>(x, "streamWidget"); w = Gtk::Builder::get_widget_derived<SinkInputWidget>(x, "streamWidget");
w->init(mainWindow); w->init(mainWindow);
w->reference(); w->reference();

2
src/sinkwidget.cc
View File

@ -104,7 +104,7 @@ SinkWidget::SinkWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>
SinkWidget* SinkWidget::create(MainWindow* mainWindow) { SinkWidget* SinkWidget::create(MainWindow* mainWindow) {
SinkWidget* w; SinkWidget* w;
Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_file(GLADE_FILE, "deviceWidget"); Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "deviceWidget");
w = Gtk::Builder::get_widget_derived<SinkWidget>(x, "deviceWidget"); w = Gtk::Builder::get_widget_derived<SinkWidget>(x, "deviceWidget");
w->init(mainWindow, "sink"); w->init(mainWindow, "sink");
w->reference(); w->reference();

2
src/sourceoutputwidget.cc
View File

@ -46,7 +46,7 @@ SourceOutputWidget::SourceOutputWidget(BaseObjectType* cobject, const Glib::RefP
SourceOutputWidget* SourceOutputWidget::create(MainWindow* mainWindow) { SourceOutputWidget* SourceOutputWidget::create(MainWindow* mainWindow) {
SourceOutputWidget* w; SourceOutputWidget* w;
Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_file(GLADE_FILE, "streamWidget"); Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "streamWidget");
w = Gtk::Builder::get_widget_derived<SourceOutputWidget>(x, "streamWidget"); w = Gtk::Builder::get_widget_derived<SourceOutputWidget>(x, "streamWidget");
w->init(mainWindow); w->init(mainWindow);
w->reference(); w->reference();

2
src/sourcewidget.cc
View File

@ -32,7 +32,7 @@ SourceWidget::SourceWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Buil
SourceWidget* SourceWidget::create(MainWindow* mainWindow) { SourceWidget* SourceWidget::create(MainWindow* mainWindow) {
SourceWidget* w; SourceWidget* w;
Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_file(GLADE_FILE, "deviceWidget"); Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "deviceWidget");
w = Gtk::Builder::get_widget_derived<SourceWidget>(x, "deviceWidget"); w = Gtk::Builder::get_widget_derived<SourceWidget>(x, "deviceWidget");
w->init(mainWindow, "source"); w->init(mainWindow, "source");
w->reference(); w->reference();