diff --git a/meson.build b/meson.build index 10384da..af6467b 100644 --- a/meson.build +++ b/meson.build @@ -39,7 +39,6 @@ cdata.set_quoted('PACKAGE_STRING', 'pavucontrol') cdata.set_quoted('PACKAGE_VERSION', meson.project_version()) cdata.set_quoted('GETTEXT_PACKAGE', 'pavucontrol') cdata.set_quoted('LOCALEDIR', localedir) -cdata.set_quoted('GLADE_FILE', join_paths(datadir, 'pavucontrol', 'pavucontrol.glade')) cdata.set('HAVE_LIBCANBERRA', canberragtk_dep.found()) diff --git a/src/cardwidget.cc b/src/cardwidget.cc index bdacdaa..f2aa618 100644 --- a/src/cardwidget.cc +++ b/src/cardwidget.cc @@ -60,7 +60,7 @@ CardWidget::CardWidget(BaseObjectType* cobject, const Glib::RefPtr CardWidget* CardWidget::create() { CardWidget* w; - Glib::RefPtr x = Gtk::Builder::create_from_file(GLADE_FILE, "cardWidget"); + Glib::RefPtr x = Gtk::Builder::create_from_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "cardWidget"); w = Gtk::Builder::get_widget_derived(x, "cardWidget"); w->reference(); return w; diff --git a/src/channelwidget.cc b/src/channelwidget.cc index 87c494b..499bd46 100644 --- a/src/channelwidget.cc +++ b/src/channelwidget.cc @@ -50,8 +50,8 @@ ChannelWidget::ChannelWidget(BaseObjectType* cobject, const Glib::RefPtr x = Gtk::Builder::create(); - x->add_from_file(GLADE_FILE, "adjustment1"); - x->add_from_file(GLADE_FILE, "channelWidget"); + x->add_from_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "adjustment1"); + x->add_from_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "channelWidget"); w = Gtk::Builder::get_widget_derived(x, "channelWidget"); w->reference(); diff --git a/src/devicewidget.cc b/src/devicewidget.cc index e149ceb..d7212d8 100644 --- a/src/devicewidget.cc +++ b/src/devicewidget.cc @@ -261,7 +261,7 @@ void DeviceWidget::openRenamePopup(const Glib::VariantBase& parameter) { return; } - Glib::RefPtr x = Gtk::Builder::create_from_file(GLADE_FILE, "renameDialog"); + Glib::RefPtr 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()); RenameWindow* renameDialog = Gtk::Builder::get_widget_derived(x, "renameDialog", description.c_str(), key); renameDialog->set_transient_for(*mpMainWindow); diff --git a/src/mainwindow.cc b/src/mainwindow.cc index 9bee3b1..e9c2518 100644 --- a/src/mainwindow.cc +++ b/src/mainwindow.cc @@ -182,11 +182,11 @@ MainWindow::MainWindow(BaseObjectType* cobject, const Glib::RefPtr MainWindow* MainWindow::create(bool maximize) { MainWindow* w; Glib::RefPtr 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->add_from_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "liststore1"); + x->add_from_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "liststore2"); + x->add_from_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "liststore3"); + x->add_from_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "liststore4"); + x->add_from_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "mainWindow"); w = Gtk::Builder::get_widget_derived(x, "mainWindow"); w->get_style_context()->add_class("pavucontrol-window"); if (w && maximize) diff --git a/src/meson.build b/src/meson.build index 97eeb00..ba8fa76 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,3 +1,10 @@ +gnome = import('gnome') +resources = gnome.compile_resources('resources', + 'resources.gresource.xml', + source_dir: '.', + c_name: 'resources' +) + pavucontrol_sources = [ 'cardwidget.cc', 'channelwidget.cc', @@ -12,6 +19,7 @@ pavucontrol_sources = [ 'sourceoutputwidget.cc', 'sourcewidget.cc', 'streamwidget.cc', + resources ] pavucontrol_deps = [gtkmm_dep, sigcpp_dep, canberragtk_dep, libpulse_dep, libpulsemlglib_dep] @@ -30,8 +38,6 @@ executable('pavucontrol', dependencies : pavucontrol_deps, ) -install_data('pavucontrol.glade') - desktop_file = i18n.merge_file( input : 'org.pulseaudio.pavucontrol.desktop.in', output : 'org.pulseaudio.pavucontrol.desktop', diff --git a/src/pavucontrol.glade b/src/pavucontrol.glade index 25591fd..5f83859 100644 --- a/src/pavucontrol.glade +++ b/src/pavucontrol.glade @@ -58,7 +58,7 @@ vertical - + center vertical 6 @@ -67,7 +67,7 @@ 12 12 - + center 6 @@ -76,7 +76,7 @@ - + 1 @@ -90,7 +90,7 @@ - + 3 @@ -100,7 +100,7 @@ 0 1 - + changes-prevent normal @@ -112,11 +112,11 @@ - + center 6 - + <b>Profile:</b> 1 0 @@ -132,7 +132,7 @@ center 6 - + <b>Codec:</b> 1 0 @@ -150,7 +150,7 @@ - + center @@ -167,7 +167,7 @@ vertical - + center vertical 6 @@ -176,7 +176,7 @@ 12 12 - + center 6 @@ -185,7 +185,7 @@ - + 1 @@ -203,7 +203,7 @@ - + 3 @@ -212,7 +212,7 @@ Mute audio 0 - + audio-volume-muted normal @@ -227,7 +227,7 @@ 0 1 - + changes-prevent normal @@ -240,7 +240,7 @@ 1 Set as default - + emblem-default @@ -255,7 +255,7 @@ center 6 - + <b>Port:</b> 1 0 @@ -287,7 +287,7 @@ 0 1 - + vertical @@ -384,7 +384,7 @@ center 6 - + <b>Latency offset:</b> 1 0 @@ -397,7 +397,7 @@ - + ms 1 @@ -416,7 +416,7 @@ - + center @@ -502,7 +502,7 @@ - + vertical 12 @@ -514,14 +514,14 @@ - + vertical - + 1 1 - + vertical @@ -540,12 +540,12 @@ - + center - + 6 12 12 @@ -553,7 +553,7 @@ 12 center - + 1 <b>_Show:</b> 1 @@ -566,7 +566,7 @@ 1 liststore1 - + 0 @@ -578,7 +578,7 @@ - + _Playback 1 @@ -588,14 +588,14 @@ - + vertical - + 1 1 - + vertical @@ -614,12 +614,12 @@ - + center - + 6 12 12 @@ -627,7 +627,7 @@ 12 center - + 1 <b>_Show:</b> 1 @@ -640,7 +640,7 @@ 1 liststore2 - + 0 @@ -652,7 +652,7 @@ - + _Recording 1 @@ -662,14 +662,14 @@ - + vertical - + 1 1 - + vertical @@ -688,12 +688,12 @@ - + center - + 6 12 12 @@ -701,7 +701,7 @@ 12 center - + 1 <b>S_how:</b> 1 @@ -715,7 +715,7 @@ 1 liststore3 - + 0 @@ -727,7 +727,7 @@ - + _Output Devices 1 @@ -737,14 +737,14 @@ - + vertical - + 1 1 - + vertical @@ -763,12 +763,12 @@ - + center - + 6 12 12 @@ -776,7 +776,7 @@ 12 center - + 1 <b>Sho_w:</b> 1 @@ -790,7 +790,7 @@ 1 liststore4 - + 0 @@ -802,7 +802,7 @@ - + _Input Devices 1 @@ -812,16 +812,16 @@ - + vertical - + 1 1 - + - + vertical @@ -838,11 +838,11 @@ - + vertical 1 - + @@ -862,7 +862,7 @@ - + _Configuration 1 @@ -885,7 +885,7 @@ 1 - + vertical 2 5 @@ -893,7 +893,7 @@ 5 5 - + 1 <b>Rename device to:</b> 1 @@ -910,7 +910,7 @@ - + bottom GTK_ALIGN_END 1 @@ -945,7 +945,7 @@ vertical - + center vertical 6 @@ -954,7 +954,7 @@ 12 12 - + center 6 @@ -963,7 +963,7 @@ - + 1 2 @@ -997,7 +997,7 @@ - + 3 @@ -1006,7 +1006,7 @@ Mute audio 0 - + audio-volume-muted normal @@ -1021,7 +1021,7 @@ 0 1 - + changes-prevent normal @@ -1048,7 +1048,7 @@ - + center diff --git a/src/pavucontrol.gladep b/src/pavucontrol.gladep deleted file mode 100644 index 183077b..0000000 --- a/src/pavucontrol.gladep +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - FALSE - diff --git a/src/pavucontrol.h b/src/pavucontrol.h index d7e81a8..f7bf6cc 100644 --- a/src/pavucontrol.h +++ b/src/pavucontrol.h @@ -31,10 +31,6 @@ #include #include -#ifndef GLADE_FILE -#define GLADE_FILE "pavucontrol.glade" -#endif - /* Can be removed when PulseAudio 0.9.23 or newer is required */ #ifndef PA_VOLUME_UI_MAX # define PA_VOLUME_UI_MAX (pa_sw_volume_from_dB(+11.0)) diff --git a/src/resources.gresource.xml b/src/resources.gresource.xml new file mode 100644 index 0000000..27bef9a --- /dev/null +++ b/src/resources.gresource.xml @@ -0,0 +1,6 @@ + + + + pavucontrol.glade + + diff --git a/src/rolewidget.cc b/src/rolewidget.cc index cff0880..59279e5 100644 --- a/src/rolewidget.cc +++ b/src/rolewidget.cc @@ -38,7 +38,7 @@ RoleWidget::RoleWidget(BaseObjectType* cobject, const Glib::RefPtr RoleWidget* RoleWidget::create() { RoleWidget* w; - Glib::RefPtr x = Gtk::Builder::create_from_file(GLADE_FILE, "streamWidget"); + Glib::RefPtr x = Gtk::Builder::create_from_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "streamWidget"); w = Gtk::Builder::get_widget_derived(x, "streamWidget"); w->reference(); return w; diff --git a/src/sinkinputwidget.cc b/src/sinkinputwidget.cc index 732205f..46fc52b 100644 --- a/src/sinkinputwidget.cc +++ b/src/sinkinputwidget.cc @@ -40,7 +40,7 @@ SinkInputWidget::SinkInputWidget(BaseObjectType* cobject, const Glib::RefPtr x = Gtk::Builder::create_from_file(GLADE_FILE, "streamWidget"); + Glib::RefPtr x = Gtk::Builder::create_from_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "streamWidget"); w = Gtk::Builder::get_widget_derived(x, "streamWidget"); w->init(mainWindow); w->reference(); diff --git a/src/sinkwidget.cc b/src/sinkwidget.cc index 0af4957..6835d29 100644 --- a/src/sinkwidget.cc +++ b/src/sinkwidget.cc @@ -104,7 +104,7 @@ SinkWidget::SinkWidget(BaseObjectType* cobject, const Glib::RefPtr SinkWidget* SinkWidget::create(MainWindow* mainWindow) { SinkWidget* w; - Glib::RefPtr x = Gtk::Builder::create_from_file(GLADE_FILE, "deviceWidget"); + Glib::RefPtr x = Gtk::Builder::create_from_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "deviceWidget"); w = Gtk::Builder::get_widget_derived(x, "deviceWidget"); w->init(mainWindow, "sink"); w->reference(); diff --git a/src/sourceoutputwidget.cc b/src/sourceoutputwidget.cc index d164552..1cb4a22 100644 --- a/src/sourceoutputwidget.cc +++ b/src/sourceoutputwidget.cc @@ -46,7 +46,7 @@ SourceOutputWidget::SourceOutputWidget(BaseObjectType* cobject, const Glib::RefP SourceOutputWidget* SourceOutputWidget::create(MainWindow* mainWindow) { SourceOutputWidget* w; - Glib::RefPtr x = Gtk::Builder::create_from_file(GLADE_FILE, "streamWidget"); + Glib::RefPtr x = Gtk::Builder::create_from_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "streamWidget"); w = Gtk::Builder::get_widget_derived(x, "streamWidget"); w->init(mainWindow); w->reference(); diff --git a/src/sourcewidget.cc b/src/sourcewidget.cc index ebcf7fb..3ae2395 100644 --- a/src/sourcewidget.cc +++ b/src/sourcewidget.cc @@ -32,7 +32,7 @@ SourceWidget::SourceWidget(BaseObjectType* cobject, const Glib::RefPtr x = Gtk::Builder::create_from_file(GLADE_FILE, "deviceWidget"); + Glib::RefPtr x = Gtk::Builder::create_from_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "deviceWidget"); w = Gtk::Builder::get_widget_derived(x, "deviceWidget"); w->init(mainWindow, "source"); w->reference();