[Git][pulseaudio/pavucontrol][master] 2 commits: Embed ui file as resource and clean it up
Arun Raghavan (@arun)
gitlab at gitlab.freedesktop.org
Fri May 17 01:28:54 UTC 2024
Arun Raghavan pushed to branch master at PulseAudio / pavucontrol
Commits:
64881e3d by JA at 2024-04-26T17:26:43+02:00
Embed ui file as resource and clean it up
Remove a lot of unrequired ids, and fix meson dependency name
- - - - -
d600f47d by JA at 2024-04-26T17:38:54+02:00
Split pavucontrol.glade into separate .ui files
and some cleanup
- - - - -
21 changed files:
- meson.build
- po/POTFILES.in
- src/cardwidget.cc
- + src/cardwidget.ui
- src/channelwidget.cc
- + src/channelwidget.ui
- src/devicewidget.cc
- + src/devicewidget.ui
- src/mainwindow.cc
- src/pavucontrol.glade → src/mainwindow.ui
- src/meson.build
- − src/pavucontrol.gladep
- src/pavucontrol.h
- + src/renamedialog.ui
- + src/resources.gresource.xml
- src/rolewidget.cc
- src/sinkinputwidget.cc
- src/sinkwidget.cc
- src/sourceoutputwidget.cc
- src/sourcewidget.cc
- + src/streamwidget.ui
Changes:
=====================================
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())
=====================================
po/POTFILES.in
=====================================
@@ -1,6 +1,11 @@
src/org.pulseaudio.pavucontrol.appdata.xml.in
src/pavucontrol.desktop.in
-src/pavucontrol.glade
+src/mainwindow.ui
+src/cardwidget.ui
+src/channelwidget.ui
+src/renamedialog.ui
+src/streamwidget.ui
+src/devicewidget.ui
src/pavucontrol.cc
src/cardwidget.cc
src/channelwidget.cc
=====================================
src/cardwidget.cc
=====================================
@@ -60,7 +60,7 @@ CardWidget::CardWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>
CardWidget* CardWidget::create() {
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/cardwidget.ui", "cardWidget");
w = Gtk::Builder::get_widget_derived<CardWidget>(x, "cardWidget");
w->reference();
return w;
=====================================
src/cardwidget.ui
=====================================
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <requires lib="gtk" version="4.0"/>
+ <object class="GtkBox" id="cardWidget">
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkBox">
+ <property name="valign">center</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">12</property>
+ <property name="margin-end">12</property>
+ <property name="margin-bottom">12</property>
+ <child>
+ <object class="GtkBox">
+ <property name="valign">center</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkImage" id="cardIconImage">
+ <property name="icon_name">gtk-missing-image</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property name="hexpand">1</property>
+ <child>
+ <object class="GtkLabel" id="cardNameLabel">
+ <property name="hexpand">1</property>
+ <property name="label" translatable="1">Card Name</property>
+ <property name="use_markup">1</property>
+ <property name="ellipsize">middle</property>
+ <property name="xalign">0</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkToggleButton" id="profileLockToggleButton">
+ <property name="halign">center</property>
+ <property name="focusable">1</property>
+ <property name="tooltip_text" translatable="1">Lock card to this profile</property>
+ <property name="has-frame">0</property>
+ <property name="active">1</property>
+ <child>
+ <object class="GtkImage">
+ <property name="icon_name">changes-prevent</property>
+ <property name="icon_size">normal</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property name="valign">center</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel">
+ <property name="label" translatable="1"><b>Profile:</b></property>
+ <property name="use_markup">1</property>
+ <property name="xalign">0</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="profileList">
+ <property name="hexpand">1</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkBox" id="codecBox">
+ <property name="halign">center</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel">
+ <property name="label" translatable="1"><b>Codec:</b></property>
+ <property name="use_markup">1</property>
+ <property name="xalign">0</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="codecList">
+ <property name="hexpand">1</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparator">
+ <property name="valign">center</property>
+ </object>
+ </child>
+ </object>
+</interface>
=====================================
src/channelwidget.cc
=====================================
@@ -49,9 +49,7 @@ ChannelWidget::ChannelWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Bu
ChannelWidget* ChannelWidget::createOne(MinimalStreamWidget *owner, int channelIndex, pa_channel_position channelPosition, bool can_decibel) {
ChannelWidget* w;
- Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create();
- x->add_from_file(GLADE_FILE, "adjustment1");
- x->add_from_file(GLADE_FILE, "channelWidget");
+ Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_resource("/org/pulseaudio/pavucontrol/ui/channelwidget.ui", "channelWidget");
w = Gtk::Builder::get_widget_derived<ChannelWidget>(x, "channelWidget");
w->reference();
=====================================
src/channelwidget.ui
=====================================
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <requires lib="gtk" version="4.0"/>
+ <object class="GtkBox" id="channelWidget">
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="channelLabel">
+ <property name="halign">center</property>
+ <property name="label" translatable="1"><b>left-front</b></property>
+ <property name="use_markup">1</property>
+ <property name="xalign">1</property>
+ <property name="yalign">0</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkScale" id="volumeScale">
+ <property name="hexpand">1</property>
+ <property name="focusable">1</property>
+ <property name="adjustment">
+ <object class="GtkAdjustment">
+ <property name="upper">100</property>
+ <property name="step_increment">5</property>
+ </object>
+ </property>
+ <property name="digits">0</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel" id="volumeLabel">
+ <property name="halign">center</property>
+ <property name="margin_start">8</property>
+ <property name="margin_end">8</property>
+ <property name="label" translatable="1"><small>50%</small></property>
+ <property name="use_markup">1</property>
+ <property name="justify">right</property>
+ <property name="width_chars">12</property>
+ <property name="xalign">1</property>
+ <property name="yalign">0</property>
+ </object>
+ </child>
+ </object>
+</interface>
=====================================
src/devicewidget.cc
=====================================
@@ -261,7 +261,7 @@ void DeviceWidget::openRenamePopup(const Glib::VariantBase& parameter) {
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/renamedialog.ui", "renameDialog");
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);
renameDialog->set_transient_for(*mpMainWindow);
=====================================
src/devicewidget.ui
=====================================
@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <object class="GtkBox" id="deviceWidget">
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkBox">
+ <property name="valign">center</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">12</property>
+ <property name="margin-end">12</property>
+ <property name="margin-bottom">12</property>
+ <child>
+ <object class="GtkBox">
+ <property name="valign">center</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkImage" id="deviceIconImage">
+ <property name="icon_name">gtk-missing-image</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property name="hexpand">1</property>
+ <child>
+ <object class="GtkLabel" id="deviceBoldNameLabel">
+ <property name="use_markup">1</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel" id="deviceNameLabel">
+ <property name="label" translatable="1">Device Title</property>
+ <property name="use_markup">1</property>
+ <property name="ellipsize">end</property>
+ <property name="xalign">0</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkToggleButton" id="deviceMuteToggleButton">
+ <property name="halign">center</property>
+ <property name="focusable">1</property>
+ <property name="tooltip_text" translatable="1">Mute audio</property>
+ <property name="has-frame">0</property>
+ <child>
+ <object class="GtkImage">
+ <property name="icon_name">audio-volume-muted</property>
+ <property name="icon_size">normal</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkToggleButton" id="deviceLockToggleButton">
+ <property name="halign">center</property>
+ <property name="focusable">1</property>
+ <property name="tooltip_text" translatable="1">Lock channels together</property>
+ <property name="has-frame">0</property>
+ <property name="active">1</property>
+ <child>
+ <object class="GtkImage">
+ <property name="icon_name">changes-prevent</property>
+ <property name="icon_size">normal</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkToggleButton" id="defaultToggleButton">
+ <property name="halign">center</property>
+ <property name="focusable">1</property>
+ <property name="tooltip_text" translatable="1">Set as default</property>
+ <child>
+ <object class="GtkImage">
+ <property name="icon_name">emblem-default</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkBox" id="portSelect">
+ <property name="valign">center</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel">
+ <property name="label" translatable="1"><b>Port:</b></property>
+ <property name="use_markup">1</property>
+ <property name="xalign">0</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="portList">
+ <property name="hexpand">1</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkBox" id="deviceChannelsVBox">
+ <property name="valign">center</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkExpander" id="advancedOptions">
+ <property name="valign">center</property>
+ <property name="visible">0</property>
+ <property name="focusable">1</property>
+ <child>
+ <object class="GtkBox">
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkGrid" id="encodingSelect">
+ <property name="valign">center</property>
+ <property name="visible">0</property>
+ <property name="row_homogeneous">1</property>
+ <property name="column_homogeneous">1</property>
+ <child>
+ <object class="GtkCheckButton" id="encodingFormatPCM">
+ <property name="label" translatable="1">PCM</property>
+ <property name="sensitive">0</property>
+ <property name="focusable">1</property>
+ <property name="active">1</property>
+ <layout>
+ <property name="column">0</property>
+ <property name="row">0</property>
+ </layout>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="encodingFormatAC3">
+ <property name="label" translatable="1">AC-3</property>
+ <property name="focusable">1</property>
+ <layout>
+ <property name="column">1</property>
+ <property name="row">0</property>
+ </layout>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="encodingFormatDTS">
+ <property name="label" translatable="1">DTS</property>
+ <property name="focusable">1</property>
+ <layout>
+ <property name="column">2</property>
+ <property name="row">0</property>
+ </layout>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="encodingFormatEAC3">
+ <property name="label" translatable="1">E-AC-3</property>
+ <property name="focusable">1</property>
+ <layout>
+ <property name="column">0</property>
+ <property name="row">1</property>
+ </layout>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="encodingFormatMPEG">
+ <property name="label" translatable="1">MPEG</property>
+ <property name="focusable">1</property>
+ <layout>
+ <property name="column">1</property>
+ <property name="row">1</property>
+ </layout>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="encodingFormatAAC">
+ <property name="label" translatable="1">AAC</property>
+ <property name="focusable">1</property>
+ <layout>
+ <property name="column">2</property>
+ <property name="row">1</property>
+ </layout>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="encodingFormatTRUEHD">
+ <property name="label" translatable="1">TrueHD</property>
+ <property name="focusable">1</property>
+ <layout>
+ <property name="column">0</property>
+ <property name="row">2</property>
+ </layout>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="encodingFormatDTSHD">
+ <property name="label" translatable="1">DTS-HD</property>
+ <property name="focusable">1</property>
+ <layout>
+ <property name="column">1</property>
+ <property name="row">2</property>
+ </layout>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkBox" id="offsetSelect">
+ <property name="valign">center</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel">
+ <property name="label" translatable="1"><b>Latency offset:</b></property>
+ <property name="use_markup">1</property>
+ <property name="xalign">0</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="offsetButton">
+ <property name="hexpand">1</property>
+ <property name="focusable">1</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="label" translatable="1">ms</property>
+ <property name="use_markup">1</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="advancedLabel">
+ <property name="label" translatable="1">Advanced</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparator">
+ <property name="valign">center</property>
+ </object>
+ </child>
+ </object>
+</interface>
=====================================
src/mainwindow.cc
=====================================
@@ -181,12 +181,7 @@ MainWindow::MainWindow(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>
MainWindow* MainWindow::create(bool maximize) {
MainWindow* w;
- 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");
+ Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_resource("/org/pulseaudio/pavucontrol/ui/mainwindow.ui", "mainWindow");
w = Gtk::Builder::get_widget_derived<MainWindow>(x, "mainWindow");
w->get_style_context()->add_class("pavucontrol-window");
if (w && maximize)
=====================================
src/pavucontrol.glade → src/mainwindow.ui
=====================================
@@ -1,498 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0"/>
- <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="channelWindow">
- <property name="visible">1</property>
- <property name="title" translatable="1">window2</property>
- <child>
- <placeholder/>
- </child>
- <property name="child">
- <object class="GtkBox" id="channelWidget">
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="channelLabel">
- <property name="halign">center</property>
- <property name="label" translatable="1"><b>left-front</b></property>
- <property name="use_markup">1</property>
- <property name="xalign">1</property>
- <property name="yalign">0</property>
- </object>
- </child>
- <child>
- <object class="GtkScale" id="volumeScale">
- <property name="hexpand">1</property>
- <property name="focusable">1</property>
- <property name="adjustment">adjustment1</property>
- <property name="digits">0</property>
- </object>
- </child>
- <child>
- <object class="GtkLabel" id="volumeLabel">
- <property name="halign">center</property>
- <property name="margin_start">8</property>
- <property name="margin_end">8</property>
- <property name="label" translatable="1"><small>50%</small></property>
- <property name="use_markup">1</property>
- <property name="justify">right</property>
- <property name="width_chars">12</property>
- <property name="xalign">1</property>
- <property name="yalign">0</property>
- </object>
- </child>
- </object>
- </property>
- </object>
- <object class="GtkWindow" id="cardWindow">
- <property name="visible">1</property>
- <property name="title" translatable="1">window1</property>
- <child>
- <placeholder/>
- </child>
- <property name="child">
- <object class="GtkBox" id="cardWidget">
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkBox" id="vbox7">
- <property name="valign">center</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <property name="margin-start">12</property>
- <property name="margin-top">12</property>
- <property name="margin-end">12</property>
- <property name="margin-bottom">12</property>
- <child>
- <object class="GtkBox" id="hbox9">
- <property name="valign">center</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkImage" id="cardIconImage">
- <property name="icon_name">gtk-missing-image</property>
- </object>
- </child>
- <child>
- <object class="GtkBox" id="hbox11">
- <property name="hexpand">1</property>
- <child>
- <object class="GtkLabel" id="cardNameLabel">
- <property name="hexpand">1</property>
- <property name="label" translatable="1">Card Name</property>
- <property name="use_markup">1</property>
- <property name="ellipsize">middle</property>
- <property name="xalign">0</property>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkBox" id="hbox14">
- <property name="spacing">3</property>
- <child>
- <object class="GtkToggleButton" id="profileLockToggleButton">
- <property name="halign">center</property>
- <property name="focusable">1</property>
- <property name="tooltip_text" translatable="1">Lock card to this profile</property>
- <property name="has-frame">0</property>
- <property name="active">1</property>
- <child>
- <object class="GtkImage" id="image4">
- <property name="icon_name">changes-prevent</property>
- <property name="icon_size">normal</property>
- </object>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkBox" id="hbox1">
- <property name="valign">center</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label1">
- <property name="label" translatable="1"><b>Profile:</b></property>
- <property name="use_markup">1</property>
- <property name="xalign">0</property>
- </object>
- </child>
- <child>
- <object class="GtkComboBox" id="profileList">
- <property name="hexpand">1</property>
- </object>
- </child>
- <child>
- <object class="GtkBox" id="codecBox">
- <property name="halign">center</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label51">
- <property name="label" translatable="1"><b>Codec:</b></property>
- <property name="use_markup">1</property>
- <property name="xalign">0</property>
- </object>
- </child>
- <child>
- <object class="GtkComboBox" id="codecList">
- <property name="hexpand">1</property>
- </object>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkSeparator" id="hseparator5">
- <property name="valign">center</property>
- </object>
- </child>
- </object>
- </property>
- </object>
- <object class="GtkWindow" id="deviceWindow">
- <property name="visible">1</property>
- <property name="title" translatable="1">window1</property>
- <child>
- <placeholder/>
- </child>
- <property name="child">
- <object class="GtkBox" id="deviceWidget">
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkBox" id="vbox26">
- <property name="valign">center</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <property name="margin-start">12</property>
- <property name="margin-top">12</property>
- <property name="margin-end">12</property>
- <property name="margin-bottom">12</property>
- <child>
- <object class="GtkBox" id="hbox2">
- <property name="valign">center</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkImage" id="deviceIconImage">
- <property name="icon_name">gtk-missing-image</property>
- </object>
- </child>
- <child>
- <object class="GtkBox" id="hbox12">
- <property name="hexpand">1</property>
- <child>
- <object class="GtkLabel" id="deviceBoldNameLabel">
- <property name="use_markup">1</property>
- </object>
- </child>
- <child>
- <object class="GtkLabel" id="deviceNameLabel">
- <property name="label" translatable="1">Device Title</property>
- <property name="use_markup">1</property>
- <property name="ellipsize">end</property>
- <property name="xalign">0</property>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkBox" id="hbox10">
- <property name="spacing">3</property>
- <child>
- <object class="GtkToggleButton" id="deviceMuteToggleButton">
- <property name="halign">center</property>
- <property name="focusable">1</property>
- <property name="tooltip_text" translatable="1">Mute audio</property>
- <property name="has-frame">0</property>
- <child>
- <object class="GtkImage" id="image20">
- <property name="icon_name">audio-volume-muted</property>
- <property name="icon_size">normal</property>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkToggleButton" id="deviceLockToggleButton">
- <property name="halign">center</property>
- <property name="focusable">1</property>
- <property name="tooltip_text" translatable="1">Lock channels together</property>
- <property name="has-frame">0</property>
- <property name="active">1</property>
- <child>
- <object class="GtkImage" id="image18">
- <property name="icon_name">changes-prevent</property>
- <property name="icon_size">normal</property>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkToggleButton" id="defaultToggleButton">
- <property name="halign">center</property>
- <property name="focusable">1</property>
- <property name="tooltip_text" translatable="1">Set as default</property>
- <child>
- <object class="GtkImage" id="image2">
- <property name="icon_name">emblem-default</property>
- </object>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkBox" id="portSelect">
- <property name="valign">center</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label2">
- <property name="label" translatable="1"><b>Port:</b></property>
- <property name="use_markup">1</property>
- <property name="xalign">0</property>
- </object>
- </child>
- <child>
- <object class="GtkComboBox" id="portList">
- <property name="hexpand">1</property>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkBox" id="deviceChannelsVBox">
- <property name="valign">center</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkExpander" id="advancedOptions">
- <property name="valign">center</property>
- <property name="visible">0</property>
- <property name="focusable">1</property>
- <child>
- <object class="GtkBox" id="vbox1">
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkGrid" id="encodingSelect">
- <property name="valign">center</property>
- <property name="visible">0</property>
- <property name="row_homogeneous">1</property>
- <property name="column_homogeneous">1</property>
- <child>
- <object class="GtkCheckButton" id="encodingFormatPCM">
- <property name="label" translatable="1">PCM</property>
- <property name="sensitive">0</property>
- <property name="focusable">1</property>
- <property name="active">1</property>
- <layout>
- <property name="column">0</property>
- <property name="row">0</property>
- </layout>
- </object>
- </child>
- <child>
- <object class="GtkCheckButton" id="encodingFormatAC3">
- <property name="label" translatable="1">AC-3</property>
- <property name="focusable">1</property>
- <layout>
- <property name="column">1</property>
- <property name="row">0</property>
- </layout>
- </object>
- </child>
- <child>
- <object class="GtkCheckButton" id="encodingFormatDTS">
- <property name="label" translatable="1">DTS</property>
- <property name="focusable">1</property>
- <layout>
- <property name="column">2</property>
- <property name="row">0</property>
- </layout>
- </object>
- </child>
- <child>
- <object class="GtkCheckButton" id="encodingFormatEAC3">
- <property name="label" translatable="1">E-AC-3</property>
- <property name="focusable">1</property>
- <layout>
- <property name="column">0</property>
- <property name="row">1</property>
- </layout>
- </object>
- </child>
- <child>
- <object class="GtkCheckButton" id="encodingFormatMPEG">
- <property name="label" translatable="1">MPEG</property>
- <property name="focusable">1</property>
- <layout>
- <property name="column">1</property>
- <property name="row">1</property>
- </layout>
- </object>
- </child>
- <child>
- <object class="GtkCheckButton" id="encodingFormatAAC">
- <property name="label" translatable="1">AAC</property>
- <property name="focusable">1</property>
- <layout>
- <property name="column">2</property>
- <property name="row">1</property>
- </layout>
- </object>
- </child>
- <child>
- <object class="GtkCheckButton" id="encodingFormatTRUEHD">
- <property name="label" translatable="1">TrueHD</property>
- <property name="focusable">1</property>
- <layout>
- <property name="column">0</property>
- <property name="row">2</property>
- </layout>
- </object>
- </child>
- <child>
- <object class="GtkCheckButton" id="encodingFormatDTSHD">
- <property name="label" translatable="1">DTS-HD</property>
- <property name="focusable">1</property>
- <layout>
- <property name="column">1</property>
- <property name="row">2</property>
- </layout>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkBox" id="offsetSelect">
- <property name="valign">center</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label3">
- <property name="label" translatable="1"><b>Latency offset:</b></property>
- <property name="use_markup">1</property>
- <property name="xalign">0</property>
- </object>
- </child>
- <child>
- <object class="GtkSpinButton" id="offsetButton">
- <property name="hexpand">1</property>
- <property name="focusable">1</property>
- </object>
- </child>
- <child>
- <object class="GtkLabel" id="label4">
- <property name="label" translatable="1">ms</property>
- <property name="use_markup">1</property>
- </object>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="advancedLabel">
- <property name="label" translatable="1">Advanced</property>
- </object>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkSeparator" id="hseparator2">
- <property name="valign">center</property>
- </object>
- </child>
- </object>
- </property>
- </object>
- <object class="GtkListStore" id="liststore1">
- <columns>
- <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 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 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 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="title" translatable="1">Volume Control</property>
<property name="default_width">500</property>
@@ -502,7 +10,7 @@
<placeholder/>
</child>
<property name="child">
- <object class="GtkBox" id="vbox20">
+ <object class="GtkBox">
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
@@ -514,14 +22,14 @@
<child>
<object class="GtkNotebookPage">
<property name="child">
- <object class="GtkBox" id="vbox32">
+ <object class="GtkBox">
<property name="orientation">vertical</property>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow5">
+ <object class="GtkScrolledWindow">
<property name="vexpand">1</property>
<property name="focusable">1</property>
<property name="child">
- <object class="GtkViewport" id="viewport1">
+ <object class="GtkViewport">
<property name="child">
<object class="GtkBox" id="streamsVBox">
<property name="orientation">vertical</property>
@@ -540,12 +48,12 @@
</object>
</child>
<child>
- <object class="GtkSeparator" id="hseparator1">
+ <object class="GtkSeparator">
<property name="valign">center</property>
</object>
</child>
<child>
- <object class="GtkBox" id="hbox5">
+ <object class="GtkBox">
<property name="spacing">6</property>
<property name="margin-top">12</property>
<property name="margin-bottom">12</property>
@@ -553,7 +61,7 @@
<property name="margin-end">12</property>
<property name="valign">center</property>
<child>
- <object class="GtkLabel" id="label5">
+ <object class="GtkLabel">
<property name="hexpand">1</property>
<property name="label" translatable="1"><b>_Show:</b></property>
<property name="use_markup">1</property>
@@ -564,9 +72,26 @@
<child>
<object class="GtkComboBox" id="sinkInputTypeComboBox">
<property name="hexpand">1</property>
- <property name="model">liststore1</property>
+ <property name="model">
+ <object class="GtkListStore">
+ <columns>
+ <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>
+ </property>
<child>
- <object class="GtkCellRendererText" id="cellrenderertext1"/>
+ <object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
@@ -578,7 +103,7 @@
</object>
</property>
<property name="tab">
- <object class="GtkLabel" id="label34">
+ <object class="GtkLabel">
<property name="label" translatable="1">_Playback</property>
<property name="use_underline">1</property>
</object>
@@ -588,14 +113,14 @@
<child>
<object class="GtkNotebookPage">
<property name="child">
- <object class="GtkBox" id="vbox2">
+ <object class="GtkBox">
<property name="orientation">vertical</property>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow2">
+ <object class="GtkScrolledWindow">
<property name="vexpand">1</property>
<property name="focusable">1</property>
<property name="child">
- <object class="GtkViewport" id="viewport5">
+ <object class="GtkViewport">
<property name="child">
<object class="GtkBox" id="recsVBox">
<property name="orientation">vertical</property>
@@ -614,12 +139,12 @@
</object>
</child>
<child>
- <object class="GtkSeparator" id="hseparator3">
+ <object class="GtkSeparator">
<property name="valign">center</property>
</object>
</child>
<child>
- <object class="GtkBox" id="hbox7">
+ <object class="GtkBox">
<property name="spacing">6</property>
<property name="margin-top">12</property>
<property name="margin-bottom">12</property>
@@ -627,7 +152,7 @@
<property name="margin-end">12</property>
<property name="valign">center</property>
<child>
- <object class="GtkLabel" id="label8">
+ <object class="GtkLabel">
<property name="hexpand">1</property>
<property name="label" translatable="1"><b>_Show:</b></property>
<property name="use_markup">1</property>
@@ -638,9 +163,26 @@
<child>
<object class="GtkComboBox" id="sourceOutputTypeComboBox">
<property name="hexpand">1</property>
- <property name="model">liststore2</property>
+ <property name="model">
+ <object class="GtkListStore">
+ <columns>
+ <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>
+ </property>
<child>
- <object class="GtkCellRendererText" id="cellrenderertext2"/>
+ <object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
@@ -652,7 +194,7 @@
</object>
</property>
<property name="tab">
- <object class="GtkLabel" id="label6">
+ <object class="GtkLabel">
<property name="label" translatable="1">_Recording</property>
<property name="use_underline">1</property>
</object>
@@ -662,14 +204,14 @@
<child>
<object class="GtkNotebookPage">
<property name="child">
- <object class="GtkBox" id="vbox30">
+ <object class="GtkBox">
<property name="orientation">vertical</property>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow8">
+ <object class="GtkScrolledWindow">
<property name="vexpand">1</property>
<property name="focusable">1</property>
<property name="child">
- <object class="GtkViewport" id="viewport4">
+ <object class="GtkViewport">
<property name="child">
<object class="GtkBox" id="sinksVBox">
<property name="orientation">vertical</property>
@@ -688,12 +230,12 @@
</object>
</child>
<child>
- <object class="GtkSeparator" id="hseparator4">
+ <object class="GtkSeparator">
<property name="valign">center</property>
</object>
</child>
<child>
- <object class="GtkBox" id="hbox3">
+ <object class="GtkBox">
<property name="spacing">6</property>
<property name="margin-top">12</property>
<property name="margin-bottom">12</property>
@@ -701,7 +243,7 @@
<property name="margin-end">12</property>
<property name="valign">center</property>
<child>
- <object class="GtkLabel" id="label4826">
+ <object class="GtkLabel">
<property name="hexpand">1</property>
<property name="label" translatable="1"><b>S_how:</b></property>
<property name="use_markup">1</property>
@@ -713,9 +255,26 @@
<child>
<object class="GtkComboBox" id="sinkTypeComboBox">
<property name="hexpand">1</property>
- <property name="model">liststore3</property>
+ <property name="model">
+ <object class="GtkListStore">
+ <columns>
+ <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>
+ </property>
<child>
- <object class="GtkCellRendererText" id="cellrenderertext3"/>
+ <object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
@@ -727,7 +286,7 @@
</object>
</property>
<property name="tab">
- <object class="GtkLabel" id="label4711">
+ <object class="GtkLabel">
<property name="label" translatable="1">_Output Devices</property>
<property name="use_underline">1</property>
</object>
@@ -737,14 +296,14 @@
<child>
<object class="GtkNotebookPage">
<property name="child">
- <object class="GtkBox" id="vbox31">
+ <object class="GtkBox">
<property name="orientation">vertical</property>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow7">
+ <object class="GtkScrolledWindow">
<property name="vexpand">1</property>
<property name="focusable">1</property>
<property name="child">
- <object class="GtkViewport" id="viewport3">
+ <object class="GtkViewport">
<property name="child">
<object class="GtkBox" id="sourcesVBox">
<property name="orientation">vertical</property>
@@ -763,12 +322,12 @@
</object>
</child>
<child>
- <object class="GtkSeparator" id="hseparator6">
+ <object class="GtkSeparator">
<property name="valign">center</property>
</object>
</child>
<child>
- <object class="GtkBox" id="hbox4">
+ <object class="GtkBox">
<property name="spacing">6</property>
<property name="margin-top">12</property>
<property name="margin-bottom">12</property>
@@ -776,7 +335,7 @@
<property name="margin-end">12</property>
<property name="valign">center</property>
<child>
- <object class="GtkLabel" id="label4827">
+ <object class="GtkLabel">
<property name="hexpand">1</property>
<property name="label" translatable="1"><b>Sho_w:</b></property>
<property name="use_markup">1</property>
@@ -788,9 +347,32 @@
<child>
<object class="GtkComboBox" id="sourceTypeComboBox">
<property name="hexpand">1</property>
- <property name="model">liststore4</property>
+ <property name="model">
+ <object class="GtkListStore">
+ <columns>
+ <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>
+ </property>
<child>
- <object class="GtkCellRendererText" id="cellrenderertext4"/>
+ <object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
@@ -802,7 +384,7 @@
</object>
</property>
<property name="tab">
- <object class="GtkLabel" id="label4717">
+ <object class="GtkLabel">
<property name="label" translatable="1">_Input Devices</property>
<property name="use_underline">1</property>
</object>
@@ -812,16 +394,16 @@
<child>
<object class="GtkNotebookPage">
<property name="child">
- <object class="GtkBox" id="vbox3">
+ <object class="GtkBox">
<property name="orientation">vertical</property>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <object class="GtkScrolledWindow">
<property name="vexpand">1</property>
<property name="focusable">1</property>
<property name="child">
- <object class="GtkViewport" id="viewport2">
+ <object class="GtkViewport">
<property name="child">
- <object class="GtkBox" id="vbox4">
+ <object class="GtkBox">
<property name="orientation">vertical</property>
<child>
<object class="GtkBox" id="cardsVBox">
@@ -838,11 +420,11 @@
</object>
</child>
<child>
- <object class="GtkBox" id="vbox5">
+ <object class="GtkBox">
<property name="orientation">vertical</property>
<property name="vexpand-set">1</property>
<child>
- <object class="GtkSeparator" id="hseparator7"/>
+ <object class="GtkSeparator"/>
</child>
<child>
<object class="GtkCheckButton" id="showVolumeMetersCheckButton">
@@ -862,7 +444,7 @@
</object>
</property>
<property name="tab">
- <object class="GtkLabel" id="label7">
+ <object class="GtkLabel">
<property name="label" translatable="1">_Configuration</property>
<property name="use_underline">1</property>
</object>
@@ -882,177 +464,4 @@
</object>
</property>
</object>
- <object class="GtkApplicationWindow" id="renameDialog">
- <property name="modal">1</property>
- <child>
- <object class="GtkBox" id="dialog-vbox1">
- <property name="orientation">vertical</property>
- <property name="spacing">2</property>
- <property name="margin-start">5</property>
- <property name="margin-top">5</property>
- <property name="margin-end">5</property>
- <property name="margin-bottom">5</property>
- <child>
- <object class="GtkLabel" id="label9">
- <property name="vexpand">1</property>
- <property name="label" translatable="1"><b>Rename device to:</b></property>
- <property name="use_markup">1</property>
- <property name="xalign">0</property>
- </object>
- </child>
- <child>
- <object class="GtkEntry" id="renameText">
- <property name="vexpand">1</property>
- <property name="focusable">1</property>
- <property name="invisible_char">●</property>
- <property name="activates_default">1</property>
- <property name="width_chars">60</property>
- </object>
- </child>
- <child>
- <object class="GtkBox" id="dialog-action_area1">
- <property name="baseline_position">bottom</property>
- <property name="halign">GTK_ALIGN_END</property>
- <property name="homogeneous">1</property>
- <child>
- <object class="GtkButton">
- <property name="label" translatable="1">_Cancel</property>
- <property name="use_underline">1</property>
- <property name="focusable">1</property>
- <property name="action_name">window.close</property>
- </object>
- </child>
- <child>
- <object class="GtkButton" id="renameButton">
- <property name="label" translatable="1">_Ok</property>
- <property name="use_underline">1</property>
- <property name="focusable">1</property>
- <property name="action_name">win.rename</property>
- </object>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <object class="GtkWindow" id="streamWindow">
- <property name="visible">1</property>
- <property name="title" translatable="1">window1</property>
- <child>
- <placeholder/>
- </child>
- <property name="child">
- <object class="GtkBox" id="streamWidget">
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkBox" id="vbox6">
- <property name="valign">center</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <property name="margin-start">12</property>
- <property name="margin-top">12</property>
- <property name="margin-end">12</property>
- <property name="margin-bottom">12</property>
- <child>
- <object class="GtkBox" id="hbox6">
- <property name="valign">center</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkImage" id="streamIconImage">
- <property name="icon_name">gtk-missing-image</property>
- </object>
- </child>
- <child>
- <object class="GtkBox" id="hbox8">
- <property name="hexpand">1</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkLabel" id="streamBoldNameLabel">
- <property name="use_markup">1</property>
- </object>
- </child>
- <child>
- <object class="GtkLabel" id="streamNameLabel">
- <property name="label" translatable="1">Stream Title</property>
- <property name="use_markup">1</property>
- <property name="ellipsize">end</property>
- <property name="xalign">0</property>
- </object>
- </child>
- <child>
- <object class="GtkLabel" id="directionLabel">
- <property name="margin_start">4</property>
- <property name="margin_end">4</property>
- <property name="label" translatable="1">direction</property>
- <property name="use_markup">1</property>
- <property name="xalign">0</property>
- </object>
- </child>
- <child>
- <object class="GtkComboBoxText" id="deviceComboBox">
- <property name="halign">GTK_ALIGN_END</property>
- <property name="hexpand">1</property>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkBox" id="hbox13">
- <property name="spacing">3</property>
- <child>
- <object class="GtkToggleButton" id="streamMuteToggleButton">
- <property name="halign">center</property>
- <property name="focusable">1</property>
- <property name="tooltip_text" translatable="1">Mute audio</property>
- <property name="has-frame">0</property>
- <child>
- <object class="GtkImage" id="image1">
- <property name="icon_name">audio-volume-muted</property>
- <property name="icon_size">normal</property>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkToggleButton" id="streamLockToggleButton">
- <property name="halign">center</property>
- <property name="focusable">1</property>
- <property name="tooltip_text" translatable="1">Lock channels together</property>
- <property name="has-frame">0</property>
- <property name="active">1</property>
- <child>
- <object class="GtkImage" id="image3">
- <property name="icon_name">changes-prevent</property>
- <property name="icon_size">normal</property>
- </object>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkBox" id="streamChannelsVBox">
- <property name="valign">center</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkSeparator" id="hseparator8">
- <property name="valign">center</property>
- </object>
- </child>
- </object>
- </property>
- </object>
</interface>
=====================================
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',
=====================================
src/pavucontrol.gladep deleted
=====================================
@@ -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>
=====================================
src/pavucontrol.h
=====================================
@@ -31,10 +31,6 @@
#include <pulse/pulseaudio.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 */
#ifndef PA_VOLUME_UI_MAX
# define PA_VOLUME_UI_MAX (pa_sw_volume_from_dB(+11.0))
=====================================
src/renamedialog.ui
=====================================
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <object class="GtkApplicationWindow" id="renameDialog">
+ <property name="modal">1</property>
+ <child>
+ <object class="GtkBox">
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
+ <property name="margin-start">5</property>
+ <property name="margin-top">5</property>
+ <property name="margin-end">5</property>
+ <property name="margin-bottom">5</property>
+ <child>
+ <object class="GtkLabel">
+ <property name="vexpand">1</property>
+ <property name="label" translatable="1"><b>Rename device to:</b></property>
+ <property name="use_markup">1</property>
+ <property name="xalign">0</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkEntry" id="renameText">
+ <property name="vexpand">1</property>
+ <property name="focusable">1</property>
+ <property name="invisible_char">●</property>
+ <property name="activates_default">1</property>
+ <property name="width_chars">60</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property name="baseline_position">bottom</property>
+ <property name="halign">GTK_ALIGN_END</property>
+ <property name="homogeneous">1</property>
+ <child>
+ <object class="GtkButton">
+ <property name="label" translatable="1">_Cancel</property>
+ <property name="use_underline">1</property>
+ <property name="focusable">1</property>
+ <property name="action_name">window.close</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkButton" id="renameButton">
+ <property name="label" translatable="1">_Ok</property>
+ <property name="use_underline">1</property>
+ <property name="focusable">1</property>
+ <property name="action_name">win.rename</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+</interface>
=====================================
src/resources.gresource.xml
=====================================
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+ <gresource prefix="/org/pulseaudio/pavucontrol/ui">
+ <file preprocess="xml-stripblanks" compressed="true">mainwindow.ui</file>
+ <file preprocess="xml-stripblanks" compressed="true">cardwidget.ui</file>
+ <file preprocess="xml-stripblanks" compressed="true">channelwidget.ui</file>
+ <file preprocess="xml-stripblanks" compressed="true">renamedialog.ui</file>
+ <file preprocess="xml-stripblanks" compressed="true">streamwidget.ui</file>
+ <file preprocess="xml-stripblanks" compressed="true">devicewidget.ui</file>
+ </gresource>
+</gresources>
=====================================
src/rolewidget.cc
=====================================
@@ -38,7 +38,7 @@ RoleWidget::RoleWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>
RoleWidget* RoleWidget::create() {
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/streamwidget.ui", "streamWidget");
w = Gtk::Builder::get_widget_derived<RoleWidget>(x, "streamWidget");
w->reference();
return w;
=====================================
src/sinkinputwidget.cc
=====================================
@@ -40,7 +40,7 @@ SinkInputWidget::SinkInputWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk
SinkInputWidget* SinkInputWidget::create(MainWindow* mainWindow) {
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/streamwidget.ui", "streamWidget");
w = Gtk::Builder::get_widget_derived<SinkInputWidget>(x, "streamWidget");
w->init(mainWindow);
w->reference();
=====================================
src/sinkwidget.cc
=====================================
@@ -104,7 +104,7 @@ SinkWidget::SinkWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>
SinkWidget* SinkWidget::create(MainWindow* mainWindow) {
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/devicewidget.ui", "deviceWidget");
w = Gtk::Builder::get_widget_derived<SinkWidget>(x, "deviceWidget");
w->init(mainWindow, "sink");
w->reference();
=====================================
src/sourceoutputwidget.cc
=====================================
@@ -46,7 +46,7 @@ SourceOutputWidget::SourceOutputWidget(BaseObjectType* cobject, const Glib::RefP
SourceOutputWidget* SourceOutputWidget::create(MainWindow* mainWindow) {
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/streamwidget.ui", "streamWidget");
w = Gtk::Builder::get_widget_derived<SourceOutputWidget>(x, "streamWidget");
w->init(mainWindow);
w->reference();
=====================================
src/sourcewidget.cc
=====================================
@@ -32,7 +32,7 @@ SourceWidget::SourceWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Buil
SourceWidget* SourceWidget::create(MainWindow* mainWindow) {
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/devicewidget.ui", "deviceWidget");
w = Gtk::Builder::get_widget_derived<SourceWidget>(x, "deviceWidget");
w->init(mainWindow, "source");
w->reference();
=====================================
src/streamwidget.ui
=====================================
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <object class="GtkBox" id="streamWidget">
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkBox">
+ <property name="valign">center</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">12</property>
+ <property name="margin-end">12</property>
+ <property name="margin-bottom">12</property>
+ <child>
+ <object class="GtkBox">
+ <property name="valign">center</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkImage" id="streamIconImage">
+ <property name="icon_name">gtk-missing-image</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property name="hexpand">1</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkLabel" id="streamBoldNameLabel">
+ <property name="use_markup">1</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel" id="streamNameLabel">
+ <property name="label" translatable="1">Stream Title</property>
+ <property name="use_markup">1</property>
+ <property name="ellipsize">end</property>
+ <property name="xalign">0</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel" id="directionLabel">
+ <property name="margin_start">4</property>
+ <property name="margin_end">4</property>
+ <property name="label" translatable="1">direction</property>
+ <property name="use_markup">1</property>
+ <property name="xalign">0</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="deviceComboBox">
+ <property name="halign">GTK_ALIGN_END</property>
+ <property name="hexpand">1</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkToggleButton" id="streamMuteToggleButton">
+ <property name="halign">center</property>
+ <property name="focusable">1</property>
+ <property name="tooltip_text" translatable="1">Mute audio</property>
+ <property name="has-frame">0</property>
+ <child>
+ <object class="GtkImage">
+ <property name="icon_name">audio-volume-muted</property>
+ <property name="icon_size">normal</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkToggleButton" id="streamLockToggleButton">
+ <property name="halign">center</property>
+ <property name="focusable">1</property>
+ <property name="tooltip_text" translatable="1">Lock channels together</property>
+ <property name="has-frame">0</property>
+ <property name="active">1</property>
+ <child>
+ <object class="GtkImage">
+ <property name="icon_name">changes-prevent</property>
+ <property name="icon_size">normal</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkBox" id="streamChannelsVBox">
+ <property name="valign">center</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparator">
+ <property name="valign">center</property>
+ </object>
+ </child>
+ </object>
+</interface>
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pavucontrol/-/compare/22b04fff6e881b4e0a1b8344a6513bdf99a10c65...d600f47de1a1677f796440d531c8fada32efbb25
--
This project does not include diff previews in email notifications.
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pavucontrol/-/compare/22b04fff6e881b4e0a1b8344a6513bdf99a10c65...d600f47de1a1677f796440d531c8fada32efbb25
You're receiving this email because of your account on gitlab.freedesktop.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/pulseaudio-commits/attachments/20240517/e0785d53/attachment-0001.htm>
More information about the pulseaudio-commits
mailing list