diff --git a/po/POTFILES.in b/po/POTFILES.in index a939fc8..18fa730 100644 --- a/po/POTFILES.in +++ b/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 diff --git a/src/cardwidget.cc b/src/cardwidget.cc index f2aa618..05e0d0b 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_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "cardWidget"); + Glib::RefPtr x = Gtk::Builder::create_from_resource("/org/pulseaudio/pavucontrol/ui/cardwidget.ui", "cardWidget"); w = Gtk::Builder::get_widget_derived(x, "cardWidget"); w->reference(); return w; diff --git a/src/cardwidget.ui b/src/cardwidget.ui new file mode 100644 index 0000000..effd2e3 --- /dev/null +++ b/src/cardwidget.ui @@ -0,0 +1,104 @@ + + + + + vertical + + + center + vertical + 6 + 12 + 12 + 12 + 12 + + + center + 6 + + + gtk-missing-image + + + + + 1 + + + 1 + Card Name + 1 + middle + 0 + + + + + + + 3 + + + center + 1 + Lock card to this profile + 0 + 1 + + + changes-prevent + normal + + + + + + + + + + + center + 6 + + + <b>Profile:</b> + 1 + 0 + + + + + 1 + + + + + center + 6 + + + <b>Codec:</b> + 1 + 0 + + + + + 1 + + + + + + + + + + + center + + + + diff --git a/src/channelwidget.cc b/src/channelwidget.cc index 499bd46..746e8df 100644 --- a/src/channelwidget.cc +++ b/src/channelwidget.cc @@ -49,9 +49,7 @@ ChannelWidget::ChannelWidget(BaseObjectType* cobject, const Glib::RefPtr x = Gtk::Builder::create(); - x->add_from_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "adjustment1"); - x->add_from_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "channelWidget"); + Glib::RefPtr x = Gtk::Builder::create_from_resource("/org/pulseaudio/pavucontrol/ui/channelwidget.ui", "channelWidget"); w = Gtk::Builder::get_widget_derived(x, "channelWidget"); w->reference(); diff --git a/src/channelwidget.ui b/src/channelwidget.ui new file mode 100644 index 0000000..66e6775 --- /dev/null +++ b/src/channelwidget.ui @@ -0,0 +1,42 @@ + + + + + 6 + + + center + <b>left-front</b> + 1 + 1 + 0 + + + + + 1 + 1 + + + 100 + 5 + + + 0 + + + + + center + 8 + 8 + <small>50%</small> + 1 + right + 12 + 1 + 0 + + + + diff --git a/src/devicewidget.cc b/src/devicewidget.cc index d7212d8..ba2821d 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_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "renameDialog"); + Glib::RefPtr 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(x, "renameDialog", description.c_str(), key); renameDialog->set_transient_for(*mpMainWindow); diff --git a/src/devicewidget.ui b/src/devicewidget.ui new file mode 100644 index 0000000..7d23b4c --- /dev/null +++ b/src/devicewidget.ui @@ -0,0 +1,260 @@ + + + + vertical + + + center + vertical + 6 + 12 + 12 + 12 + 12 + + + center + 6 + + + gtk-missing-image + + + + + 1 + + + 1 + + + + + Device Title + 1 + end + 0 + + + + + + + 3 + + + center + 1 + Mute audio + 0 + + + audio-volume-muted + normal + + + + + + + center + 1 + Lock channels together + 0 + 1 + + + changes-prevent + normal + + + + + + + center + 1 + Set as default + + + emblem-default + + + + + + + + + + + center + 6 + + + <b>Port:</b> + 1 + 0 + + + + + 1 + + + + + + + center + vertical + 6 + + + + + + + + + + + center + 0 + 1 + + + vertical + + + center + 0 + 1 + 1 + + + PCM + 0 + 1 + 1 + + 0 + 0 + + + + + + AC-3 + 1 + + 1 + 0 + + + + + + DTS + 1 + + 2 + 0 + + + + + + E-AC-3 + 1 + + 0 + 1 + + + + + + MPEG + 1 + + 1 + 1 + + + + + + AAC + 1 + + 2 + 1 + + + + + + TrueHD + 1 + + 0 + 2 + + + + + + DTS-HD + 1 + + 1 + 2 + + + + + + + + center + 6 + + + <b>Latency offset:</b> + 1 + 0 + + + + + 1 + 1 + + + + + ms + 1 + + + + + + + + + Advanced + + + + + + + + + center + + + + diff --git a/src/mainwindow.cc b/src/mainwindow.cc index e9c2518..dab8c1b 100644 --- a/src/mainwindow.cc +++ b/src/mainwindow.cc @@ -181,12 +181,7 @@ MainWindow::MainWindow(BaseObjectType* cobject, const Glib::RefPtr MainWindow* MainWindow::create(bool maximize) { MainWindow* w; - Glib::RefPtr x = Gtk::Builder::create(); - 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"); + Glib::RefPtr x = Gtk::Builder::create_from_resource("/org/pulseaudio/pavucontrol/ui/mainwindow.ui", "mainWindow"); w = Gtk::Builder::get_widget_derived(x, "mainWindow"); w->get_style_context()->add_class("pavucontrol-window"); if (w && maximize) diff --git a/src/mainwindow.ui b/src/mainwindow.ui new file mode 100644 index 0000000..d6e92b7 --- /dev/null +++ b/src/mainwindow.ui @@ -0,0 +1,467 @@ + + + + + Volume Control + 500 + 400 + multimedia-volume-control + + + + + + vertical + 12 + + + 1 + 1 + 0 + 1 + + + + + vertical + + + 1 + 1 + + + + + vertical + + + 1 + 0 + <i>No application is currently playing audio.</i> + 1 + + + + + + + + + + + center + + + + + 6 + 12 + 12 + 12 + 12 + center + + + 1 + <b>_Show:</b> + 1 + 1 + 1 + + + + + 1 + + + + + + + + All Streams + + + Applications + + + Virtual Streams + + + + + + + + 0 + + + + + + + + + + + _Playback + 1 + + + + + + + + + vertical + + + 1 + 1 + + + + + vertical + + + 1 + 0 + <i>No application is currently recording audio.</i> + 1 + + + + + + + + + + + center + + + + + 6 + 12 + 12 + 12 + 12 + center + + + 1 + <b>_Show:</b> + 1 + 1 + 1 + + + + + 1 + + + + + + + + All Streams + + + Applications + + + Virtual Streams + + + + + + + + 0 + + + + + + + + + + + _Recording + 1 + + + + + + + + + vertical + + + 1 + 1 + + + + + vertical + + + 1 + 0 + <i>No output devices available</i> + 1 + + + + + + + + + + + center + + + + + 6 + 12 + 12 + 12 + 12 + center + + + 1 + <b>S_how:</b> + 1 + 1 + sinkTypeComboBox + 1 + + + + + 1 + + + + + + + + All Output Devices + + + Hardware Output Devices + + + Virtual Output Devices + + + + + + + + 0 + + + + + + + + + + + _Output Devices + 1 + + + + + + + + + vertical + + + 1 + 1 + + + + + vertical + + + 1 + 0 + <i>No input devices available</i> + 1 + + + + + + + + + + + center + + + + + 6 + 12 + 12 + 12 + 12 + center + + + 1 + <b>Sho_w:</b> + 1 + 1 + sourceTypeComboBox + 1 + + + + + 1 + + + + + + + + All Input Devices + + + All Except Monitors + + + Hardware Input Devices + + + Virtual Input Devices + + + Monitors + + + + + + + + 0 + + + + + + + + + + + _Input Devices + 1 + + + + + + + + + vertical + + + 1 + 1 + + + + + vertical + + + 1 + vertical + + + 1 + 0 + <i>No cards available for configuration</i> + 1 + + + + + + + vertical + 1 + + + + + + Show volume meters + 1 + 1 + + + + + + + + + + + + + + + _Configuration + 1 + + + + + + + + + 1 + 0 + ... + 1 + + + + + + diff --git a/src/pavucontrol.glade b/src/pavucontrol.glade deleted file mode 100644 index 5f83859..0000000 --- a/src/pavucontrol.glade +++ /dev/null @@ -1,1058 +0,0 @@ - - - - - 100 - 44.2408370972 - 5 - - - 1 - window2 - - - - - - 6 - - - center - <b>left-front</b> - 1 - 1 - 0 - - - - - 1 - 1 - adjustment1 - 0 - - - - - center - 8 - 8 - <small>50%</small> - 1 - right - 12 - 1 - 0 - - - - - - - 1 - window1 - - - - - - vertical - - - center - vertical - 6 - 12 - 12 - 12 - 12 - - - center - 6 - - - gtk-missing-image - - - - - 1 - - - 1 - Card Name - 1 - middle - 0 - - - - - - - 3 - - - center - 1 - Lock card to this profile - 0 - 1 - - - changes-prevent - normal - - - - - - - - - - - center - 6 - - - <b>Profile:</b> - 1 - 0 - - - - - 1 - - - - - center - 6 - - - <b>Codec:</b> - 1 - 0 - - - - - 1 - - - - - - - - - - - center - - - - - - - 1 - window1 - - - - - - vertical - - - center - vertical - 6 - 12 - 12 - 12 - 12 - - - center - 6 - - - gtk-missing-image - - - - - 1 - - - 1 - - - - - Device Title - 1 - end - 0 - - - - - - - 3 - - - center - 1 - Mute audio - 0 - - - audio-volume-muted - normal - - - - - - - center - 1 - Lock channels together - 0 - 1 - - - changes-prevent - normal - - - - - - - center - 1 - Set as default - - - emblem-default - - - - - - - - - - - center - 6 - - - <b>Port:</b> - 1 - 0 - - - - - 1 - - - - - - - center - vertical - 6 - - - - - - - - - - - center - 0 - 1 - - - vertical - - - center - 0 - 1 - 1 - - - PCM - 0 - 1 - 1 - - 0 - 0 - - - - - - AC-3 - 1 - - 1 - 0 - - - - - - DTS - 1 - - 2 - 0 - - - - - - E-AC-3 - 1 - - 0 - 1 - - - - - - MPEG - 1 - - 1 - 1 - - - - - - AAC - 1 - - 2 - 1 - - - - - - TrueHD - 1 - - 0 - 2 - - - - - - DTS-HD - 1 - - 1 - 2 - - - - - - - - center - 6 - - - <b>Latency offset:</b> - 1 - 0 - - - - - 1 - 1 - - - - - ms - 1 - - - - - - - - - Advanced - - - - - - - - - center - - - - - - - - - - - - All Streams - - - Applications - - - Virtual Streams - - - - - - - - - - All Streams - - - Applications - - - Virtual Streams - - - - - - - - - - All Output Devices - - - Hardware Output Devices - - - Virtual Output Devices - - - - - - - - - - All Input Devices - - - All Except Monitors - - - Hardware Input Devices - - - Virtual Input Devices - - - Monitors - - - - - Volume Control - 500 - 400 - multimedia-volume-control - - - - - - vertical - 12 - - - 1 - 1 - 0 - 1 - - - - - vertical - - - 1 - 1 - - - - - vertical - - - 1 - 0 - <i>No application is currently playing audio.</i> - 1 - - - - - - - - - - - center - - - - - 6 - 12 - 12 - 12 - 12 - center - - - 1 - <b>_Show:</b> - 1 - 1 - 1 - - - - - 1 - liststore1 - - - - 0 - - - - - - - - - - - _Playback - 1 - - - - - - - - - vertical - - - 1 - 1 - - - - - vertical - - - 1 - 0 - <i>No application is currently recording audio.</i> - 1 - - - - - - - - - - - center - - - - - 6 - 12 - 12 - 12 - 12 - center - - - 1 - <b>_Show:</b> - 1 - 1 - 1 - - - - - 1 - liststore2 - - - - 0 - - - - - - - - - - - _Recording - 1 - - - - - - - - - vertical - - - 1 - 1 - - - - - vertical - - - 1 - 0 - <i>No output devices available</i> - 1 - - - - - - - - - - - center - - - - - 6 - 12 - 12 - 12 - 12 - center - - - 1 - <b>S_how:</b> - 1 - 1 - sinkTypeComboBox - 1 - - - - - 1 - liststore3 - - - - 0 - - - - - - - - - - - _Output Devices - 1 - - - - - - - - - vertical - - - 1 - 1 - - - - - vertical - - - 1 - 0 - <i>No input devices available</i> - 1 - - - - - - - - - - - center - - - - - 6 - 12 - 12 - 12 - 12 - center - - - 1 - <b>Sho_w:</b> - 1 - 1 - sourceTypeComboBox - 1 - - - - - 1 - liststore4 - - - - 0 - - - - - - - - - - - _Input Devices - 1 - - - - - - - - - vertical - - - 1 - 1 - - - - - vertical - - - 1 - vertical - - - 1 - 0 - <i>No cards available for configuration</i> - 1 - - - - - - - vertical - 1 - - - - - - Show volume meters - 1 - 1 - - - - - - - - - - - - - - - _Configuration - 1 - - - - - - - - - 1 - 0 - ... - 1 - - - - - - - 1 - - - vertical - 2 - 5 - 5 - 5 - 5 - - - 1 - <b>Rename device to:</b> - 1 - 0 - - - - - 1 - 1 - ● - 1 - 60 - - - - - bottom - GTK_ALIGN_END - 1 - - - _Cancel - 1 - 1 - window.close - - - - - _Ok - 1 - 1 - win.rename - - - - - - - - - 1 - window1 - - - - - - vertical - - - center - vertical - 6 - 12 - 12 - 12 - 12 - - - center - 6 - - - gtk-missing-image - - - - - 1 - 2 - - - 1 - - - - - Stream Title - 1 - end - 0 - - - - - 4 - 4 - direction - 1 - 0 - - - - - GTK_ALIGN_END - 1 - - - - - - - 3 - - - center - 1 - Mute audio - 0 - - - audio-volume-muted - normal - - - - - - - center - 1 - Lock channels together - 0 - 1 - - - changes-prevent - normal - - - - - - - - - - - center - vertical - 6 - - - - - - - - - - - - - center - - - - - - diff --git a/src/renamedialog.ui b/src/renamedialog.ui new file mode 100644 index 0000000..9ee488a --- /dev/null +++ b/src/renamedialog.ui @@ -0,0 +1,56 @@ + + + + 1 + + + vertical + 2 + 5 + 5 + 5 + 5 + + + 1 + <b>Rename device to:</b> + 1 + 0 + + + + + 1 + 1 + ● + 1 + 60 + + + + + bottom + GTK_ALIGN_END + 1 + + + _Cancel + 1 + 1 + window.close + + + + + _Ok + 1 + 1 + win.rename + + + + + + + + diff --git a/src/resources.gresource.xml b/src/resources.gresource.xml index 27bef9a..0ed3726 100644 --- a/src/resources.gresource.xml +++ b/src/resources.gresource.xml @@ -1,6 +1,11 @@ - pavucontrol.glade + mainwindow.ui + cardwidget.ui + channelwidget.ui + renamedialog.ui + streamwidget.ui + devicewidget.ui diff --git a/src/rolewidget.cc b/src/rolewidget.cc index 59279e5..c2d8a21 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_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "streamWidget"); + Glib::RefPtr x = Gtk::Builder::create_from_resource("/org/pulseaudio/pavucontrol/ui/streamwidget.ui", "streamWidget"); w = Gtk::Builder::get_widget_derived(x, "streamWidget"); w->reference(); return w; diff --git a/src/sinkinputwidget.cc b/src/sinkinputwidget.cc index 46fc52b..6145c2d 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_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "streamWidget"); + Glib::RefPtr x = Gtk::Builder::create_from_resource("/org/pulseaudio/pavucontrol/ui/streamwidget.ui", "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 6835d29..86bd328 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_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "deviceWidget"); + Glib::RefPtr x = Gtk::Builder::create_from_resource("/org/pulseaudio/pavucontrol/ui/devicewidget.ui", "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 1cb4a22..ca6b3f8 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_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "streamWidget"); + Glib::RefPtr x = Gtk::Builder::create_from_resource("/org/pulseaudio/pavucontrol/ui/streamwidget.ui", "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 3ae2395..2423682 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_resource("/org/pulseaudio/pavucontrol/ui/pavucontrol.glade", "deviceWidget"); + Glib::RefPtr x = Gtk::Builder::create_from_resource("/org/pulseaudio/pavucontrol/ui/devicewidget.ui", "deviceWidget"); w = Gtk::Builder::get_widget_derived(x, "deviceWidget"); w->init(mainWindow, "source"); w->reference(); diff --git a/src/streamwidget.ui b/src/streamwidget.ui new file mode 100644 index 0000000..023d760 --- /dev/null +++ b/src/streamwidget.ui @@ -0,0 +1,114 @@ + + + + vertical + + + center + vertical + 6 + 12 + 12 + 12 + 12 + + + center + 6 + + + gtk-missing-image + + + + + 1 + 2 + + + 1 + + + + + Stream Title + 1 + end + 0 + + + + + 4 + 4 + direction + 1 + 0 + + + + + GTK_ALIGN_END + 1 + + + + + + + 3 + + + center + 1 + Mute audio + 0 + + + audio-volume-muted + normal + + + + + + + center + 1 + Lock channels together + 0 + 1 + + + changes-prevent + normal + + + + + + + + + + + center + vertical + 6 + + + + + + + + + + + + + center + + + +