From e8c1ef085c5313d3b9eab3438d759687140fc99d Mon Sep 17 00:00:00 2001 From: Victor Tran Date: Mon, 5 Dec 2022 19:21:00 +1100 Subject: [PATCH] Port Audio plugin to Qt 6 --- platform/translations/es.ts | 2 +- .../AccessibilityPlugin/translations/es.ts | 2 +- plugins/AudioPlugin/CMakeLists.txt | 33 ++++++++++++ plugins/AudioPlugin/audioquickwidget.cpp | 16 +++--- plugins/AudioPlugin/audioquickwidget.h | 4 +- plugins/AudioPlugin/common.cpp | 7 ++- plugins/AudioPlugin/common.h | 4 +- plugins/AudioPlugin/eventhandler.cpp | 47 +++++++++-------- plugins/AudioPlugin/micchunk.cpp | 23 ++++---- plugins/AudioPlugin/micchunk.h | 2 +- plugins/AudioPlugin/plugin.h | 5 +- plugins/AudioPlugin/quickwidgetsink.cpp | 14 ++--- plugins/AudioPlugin/quickwidgetsink.h | 4 +- plugins/AudioPlugin/quickwidgetsinkinput.cpp | 39 +++++++------- plugins/AudioPlugin/quickwidgetsinkinput.h | 4 +- plugins/AudioPlugin/translations/ar_SA.ts | 47 +++++++---------- plugins/AudioPlugin/translations/au_AU.ts | 49 ++++------------- plugins/AudioPlugin/translations/cy.ts | 49 ++++------------- plugins/AudioPlugin/translations/da.ts | 49 ++++------------- plugins/AudioPlugin/translations/de.ts | 33 +++++------- plugins/AudioPlugin/translations/en_GB.ts | 35 ++++--------- plugins/AudioPlugin/translations/en_US.ts | 49 ++++------------- plugins/AudioPlugin/translations/es.ts | 52 ++++--------------- plugins/AudioPlugin/translations/es_VE.ts | 52 ++++--------------- plugins/AudioPlugin/translations/id.ts | 51 ++++-------------- plugins/AudioPlugin/translations/ja.ts | 49 ++++------------- plugins/AudioPlugin/translations/nl.ts | 33 +++++------- plugins/AudioPlugin/translations/pt_BR.ts | 33 +++++------- plugins/AudioPlugin/translations/ro_RO.ts | 19 +++++-- plugins/AudioPlugin/translations/sv.ts | 49 ++++------------- plugins/AudioPlugin/translations/tr_TR.ts | 19 +++++-- plugins/AudioPlugin/translations/vi_VN.ts | 19 +++++-- plugins/AudioPlugin/translations/zh_CN.ts | 35 ++++--------- plugins/AudioPlugin/translations/zu_ZA.ts | 35 ++++--------- plugins/BrightnessPlugin/translations/es.ts | 2 +- plugins/CMakeLists.txt | 4 +- plugins/DefaultsPlugin/translations/es.ts | 2 +- plugins/DisplayPlugin/translations/es.ts | 2 +- plugins/InputPlugin/translations/es.ts | 2 +- plugins/NetworkPlugin/translations/es.ts | 47 +++++++++-------- .../NotificationsPlugin/translations/es.ts | 2 +- plugins/OverviewPlugin/translations/es.ts | 4 +- plugins/PowerPlugin/translations/es.ts | 3 +- plugins/ScreenshotPlugin/translations/es.ts | 2 +- plugins/ThemePlugin/translations/es.ts | 2 +- plugins/TimeDatePlugin/translations/es.ts | 2 +- startdesk/translations/es.ts | 2 +- 47 files changed, 377 insertions(+), 662 deletions(-) create mode 100644 plugins/AudioPlugin/CMakeLists.txt diff --git a/platform/translations/es.ts b/platform/translations/es.ts index 4e232ee6..fa47db8f 100644 --- a/platform/translations/es.ts +++ b/platform/translations/es.ts @@ -1,6 +1,6 @@ - + MessageDialog diff --git a/plugins/AccessibilityPlugin/translations/es.ts b/plugins/AccessibilityPlugin/translations/es.ts index 2c3aaf3e..1b963e79 100644 --- a/plugins/AccessibilityPlugin/translations/es.ts +++ b/plugins/AccessibilityPlugin/translations/es.ts @@ -1,6 +1,6 @@ - + AccessibilitySettingsPane diff --git a/plugins/AudioPlugin/CMakeLists.txt b/plugins/AudioPlugin/CMakeLists.txt new file mode 100644 index 00000000..81affc17 --- /dev/null +++ b/plugins/AudioPlugin/CMakeLists.txt @@ -0,0 +1,33 @@ +cmake_minimum_required(VERSION 3.4.0) + +find_package(Qt6 REQUIRED COMPONENTS Widgets) +find_package(libcontemporary) +find_package(KF5PulseAudioQt REQUIRED) + +set(SOURCES + audiochunk.cpp + audioquickwidget.cpp + common.cpp + eventhandler.cpp + micchunk.cpp + plugin.cpp + quickwidgetsink.cpp + quickwidgetsinkinput.cpp +) + +set(HEADERS + audiochunk.h + audioquickwidget.h + common.h + eventhandler.h + micchunk.h + plugin.h + quickwidgetsink.h + quickwidgetsinkinput.h +) + +set(PLUGIN_NAME pulseaudio) +add_plugin_td(${PLUGIN_NAME}) +target_sources(plugin-${PLUGIN_NAME} PRIVATE ${SOURCES} ${HEADERS}) + +target_link_libraries(plugin-${PLUGIN_NAME} Qt6::Widgets KF5::PulseAudioQt libcontemporary libthedesk) diff --git a/plugins/AudioPlugin/audioquickwidget.cpp b/plugins/AudioPlugin/audioquickwidget.cpp index 814d7f8e..dbc3ce4c 100644 --- a/plugins/AudioPlugin/audioquickwidget.cpp +++ b/plugins/AudioPlugin/audioquickwidget.cpp @@ -20,20 +20,20 @@ #include "audioquickwidget.h" #include "ui_audioquickwidget.h" -#include -#include #include #include +#include +#include -#include #include "quickwidgetsink.h" #include "quickwidgetsinkinput.h" +#include struct AudioQuickWidgetPrivate { - QScreen* primaryScreen = nullptr; + QScreen* primaryScreen = nullptr; - QMap sinkWidgets; - QMap sinkInputWidgets; + QMap sinkWidgets; + QMap sinkInputWidgets; }; AudioQuickWidget::AudioQuickWidget(QWidget* parent) : @@ -59,12 +59,12 @@ AudioQuickWidget::AudioQuickWidget(QWidget* parent) : button->setCheckable(true); button->setAutoExclusive(true); button->setChecked(StateManager::quietModeManager()->currentMode() == m); - connect(button, &QPushButton::toggled, this, [ = ](bool checked) { + connect(button, &QPushButton::toggled, this, [=](bool checked) { if (checked) { StateManager::quietModeManager()->setQuietMode(m); } }); - connect(StateManager::quietModeManager(), &QuietModeManagerTd::quietModeChanged, this, [ = ](QuietModeManagerTd::QuietMode newMode, QuietModeManagerTd::QuietMode oldMode) { + connect(StateManager::quietModeManager(), &QuietModeManagerTd::quietModeChanged, this, [=](QuietModeManagerTd::QuietMode newMode, QuietModeManagerTd::QuietMode oldMode) { Q_UNUSED(oldMode); button->setChecked(newMode == m); }); diff --git a/plugins/AudioPlugin/audioquickwidget.h b/plugins/AudioPlugin/audioquickwidget.h index d0313f70..e55b950d 100644 --- a/plugins/AudioPlugin/audioquickwidget.h +++ b/plugins/AudioPlugin/audioquickwidget.h @@ -20,9 +20,9 @@ #ifndef AUDIOQUICKWIDGET_H #define AUDIOQUICKWIDGET_H +#include +#include #include -#include -#include namespace Ui { class AudioQuickWidget; diff --git a/plugins/AudioPlugin/common.cpp b/plugins/AudioPlugin/common.cpp index ce5c2634..04942bcb 100644 --- a/plugins/AudioPlugin/common.cpp +++ b/plugins/AudioPlugin/common.cpp @@ -19,7 +19,7 @@ * *************************************/ #include "common.h" -#include +#include #include Common::DevicePort Common::portForSink(PulseAudioQt::Sink* sink) { @@ -32,7 +32,7 @@ Common::DevicePort Common::portForSink(PulseAudioQt::Sink* sink) { PulseAudioQt::Port* port = sink->ports().at(sink->activePortIndex()); if (port->availability() == PulseAudioQt::Port::Unavailable) { - //Weird thing? Use a workaround here + // Weird thing? Use a workaround here QList availablePorts; for (PulseAudioQt::Port* port : sink->ports()) { if (port->availability() != PulseAudioQt::Port::Unavailable) availablePorts.append(port); @@ -45,14 +45,13 @@ Common::DevicePort Common::portForSink(PulseAudioQt::Sink* sink) { } } - if (port != nullptr) { QString newPort; if (port->name().contains("headphones", Qt::CaseInsensitive)) { return Headphones; } else if (port->name().contains("speaker", Qt::CaseInsensitive)) { return Speakers; - } else if (port->name().contains("lineout", Qt::CaseInsensitive)) { + } else if (port->name().contains("lineout", Qt::CaseInsensitive)) { return LineOut; } } diff --git a/plugins/AudioPlugin/common.h b/plugins/AudioPlugin/common.h index babceb24..4cc555c3 100644 --- a/plugins/AudioPlugin/common.h +++ b/plugins/AudioPlugin/common.h @@ -20,7 +20,7 @@ #ifndef COMMON_H #define COMMON_H -#include +#include namespace Common { enum DevicePort { @@ -33,6 +33,6 @@ namespace Common { DevicePort portForSink(PulseAudioQt::Sink* sink); QString nameForSink(PulseAudioQt::Sink* sink); -} +} // namespace Common #endif // COMMON_H diff --git a/plugins/AudioPlugin/eventhandler.cpp b/plugins/AudioPlugin/eventhandler.cpp index 3a9b0cc7..0975b0e6 100644 --- a/plugins/AudioPlugin/eventhandler.cpp +++ b/plugins/AudioPlugin/eventhandler.cpp @@ -21,27 +21,28 @@ #include "common.h" #include -#include #include -#include #include +#include +#include -#include -#include +#include +#include #include struct EventHandlerPrivate { - KeyGrab* volumeUp; - KeyGrab* volumeDown; - KeyGrab* volumeMute; + KeyGrab* volumeUp; + KeyGrab* volumeDown; + KeyGrab* volumeMute; - PulseAudioQt::Sink* defaultSink = nullptr; - bool firstSink = true; + PulseAudioQt::Sink* defaultSink = nullptr; + bool firstSink = true; - quint32 oldActivePortIndex; + quint32 oldActivePortIndex; }; -EventHandler::EventHandler(QObject* parent) : QObject(parent) { +EventHandler::EventHandler(QObject* parent) : + QObject(parent) { d = new EventHandlerPrivate(); connect(PulseAudioQt::Context::instance()->server(), &PulseAudioQt::Server::defaultSinkChanged, this, &EventHandler::defaultSinkChanged); @@ -50,20 +51,20 @@ EventHandler::EventHandler(QObject* parent) : QObject(parent) { d->volumeUp = new KeyGrab(QKeySequence(Qt::Key_VolumeUp), "volumeUp"); d->volumeDown = new KeyGrab(QKeySequence(Qt::Key_VolumeDown), "volumeDown"); d->volumeMute = new KeyGrab(QKeySequence(Qt::Key_VolumeMute), "volumeMute"); - connect(d->volumeUp, &KeyGrab::activated, this, [ = ] { + connect(d->volumeUp, &KeyGrab::activated, this, [=] { this->adjustVolume(5); }); - connect(d->volumeDown, &KeyGrab::activated, this, [ = ] { + connect(d->volumeDown, &KeyGrab::activated, this, [=] { this->adjustVolume(-5); }); - connect(d->volumeMute, &KeyGrab::activated, this, [ = ] { + connect(d->volumeMute, &KeyGrab::activated, this, [=] { QuietModeManagerTd::QuietMode newMode = StateManager::quietModeManager()->nextQuietMode(); StateManager::quietModeManager()->setQuietMode(newMode); StateManager::instance()->hudManager()->showHud({ - {"icon", StateManager::quietModeManager()->icon(newMode)}, - {"title", StateManager::quietModeManager()->name(newMode)}, - {"text", StateManager::quietModeManager()->description(newMode)} + {"icon", StateManager::quietModeManager()->icon(newMode) }, + {"title", StateManager::quietModeManager()->name(newMode) }, + {"text", StateManager::quietModeManager()->description(newMode)} }); }); @@ -84,11 +85,11 @@ void EventHandler::adjustVolume(int percentageChange) { return; } - //Get the default sink and find the widget for this sink + // Get the default sink and find the widget for this sink PulseAudioQt::Sink* sink = PulseAudioQt::Context::instance()->server()->defaultSink(); if (!sink) { StateManager::instance()->hudManager()->showHud({ - {"icon", "audio-volume-muted"}, + {"icon", "audio-volume-muted" }, {"title", tr("No Audio Devices")} }); return; @@ -110,7 +111,7 @@ void EventHandler::defaultSinkChanged(PulseAudioQt::Sink* defaultSink) { } d->defaultSink = defaultSink; if (defaultSink) { - connect(defaultSink, &PulseAudioQt::Sink::activePortIndexChanged, this, [ = ] { + connect(defaultSink, &PulseAudioQt::Sink::activePortIndexChanged, this, [=] { if (d->oldActivePortIndex != defaultSink->activePortIndex()) { d->oldActivePortIndex = defaultSink->activePortIndex(); showHud(defaultSink); @@ -129,9 +130,9 @@ void EventHandler::defaultSinkChanged(PulseAudioQt::Sink* defaultSink) { void EventHandler::showHud(PulseAudioQt::Sink* sink, qint64 volume) { if (StateManager::quietModeManager()->currentMode() == QuietModeManagerTd::Mute) { StateManager::instance()->hudManager()->showHud({ - {"icon", StateManager::quietModeManager()->icon(QuietModeManagerTd::Mute)}, - {"title", tr("Mute")}, - {"text", tr("Unmute Quiet Mode before changing the volume")} + {"icon", StateManager::quietModeManager()->icon(QuietModeManagerTd::Mute)}, + {"title", tr("Mute") }, + {"text", tr("Unmute Quiet Mode before changing the volume") } }); return; } diff --git a/plugins/AudioPlugin/micchunk.cpp b/plugins/AudioPlugin/micchunk.cpp index 4acefc9d..d4f2ebef 100644 --- a/plugins/AudioPlugin/micchunk.cpp +++ b/plugins/AudioPlugin/micchunk.cpp @@ -19,14 +19,15 @@ * *************************************/ #include "micchunk.h" -#include -#include -#include -#include +#include +#include #include -#include +#include +#include +#include -MicChunk::MicChunk() : IconTextChunk("audio-mic") { +MicChunk::MicChunk() : + IconTextChunk("audio-mic") { connect(PulseAudioQt::Context::instance(), &PulseAudioQt::Context::sourceOutputAdded, this, &MicChunk::sourceOutputAdded); connect(PulseAudioQt::Context::instance(), &PulseAudioQt::Context::sourceOutputRemoved, this, &MicChunk::updateSourceOutputs); for (PulseAudioQt::SourceOutput* output : PulseAudioQt::Context::instance()->sourceOutputs()) sourceOutputAdded(output); @@ -47,11 +48,11 @@ void MicChunk::updateSourceOutputs() { if (!output->isMuted()) micMuted = false; micClients.append(output->properties().value("application.name").toString()); -// if (output->client()) { -// micClients.append(output->client()->name()); -// } else { -// micClients.append(this->fontMetrics().elidedText(output->name(), Qt::ElideRight, SC_DPI(100))); -// } + // if (output->client()) { + // micClients.append(output->client()->name()); + // } else { + // micClients.append(this->fontMetrics().elidedText(output->name(), Qt::ElideRight, SC_DPI(100))); + // } } micClients.removeDuplicates(); diff --git a/plugins/AudioPlugin/micchunk.h b/plugins/AudioPlugin/micchunk.h index 968f8b7c..9b564f43 100644 --- a/plugins/AudioPlugin/micchunk.h +++ b/plugins/AudioPlugin/micchunk.h @@ -20,8 +20,8 @@ #ifndef MICCHUNK_H #define MICCHUNK_H +#include #include -#include class MicChunk : public IconTextChunk { Q_OBJECT diff --git a/plugins/AudioPlugin/plugin.h b/plugins/AudioPlugin/plugin.h index 4cc1e17f..aaeb2880 100644 --- a/plugins/AudioPlugin/plugin.h +++ b/plugins/AudioPlugin/plugin.h @@ -20,10 +20,11 @@ #ifndef PLUGIN_H #define PLUGIN_H -#include "plugininterface.h" +#include "plugins/plugininterface.h" struct PluginPrivate; -class Plugin : public QObject, public PluginInterface { +class Plugin : public QObject, + public PluginInterface { Q_OBJECT Q_PLUGIN_METADATA(IID PluginInterface_iid FILE "Plugin.json") Q_INTERFACES(PluginInterface) diff --git a/plugins/AudioPlugin/quickwidgetsink.cpp b/plugins/AudioPlugin/quickwidgetsink.cpp index e5b85b3d..ab6a79cf 100644 --- a/plugins/AudioPlugin/quickwidgetsink.cpp +++ b/plugins/AudioPlugin/quickwidgetsink.cpp @@ -20,17 +20,17 @@ #include "quickwidgetsink.h" #include "ui_quickwidgetsink.h" -#include -#include -#include -#include #include "common.h" +#include +#include +#include +#include struct QuickWidgetSinkPrivate { - PulseAudioQt::Sink* sink; - bool changingVolume = false; + PulseAudioQt::Sink* sink; + bool changingVolume = false; - QMenu* menu; + QMenu* menu; }; QuickWidgetSink::QuickWidgetSink(PulseAudioQt::Sink* sink, QWidget* parent) : diff --git a/plugins/AudioPlugin/quickwidgetsink.h b/plugins/AudioPlugin/quickwidgetsink.h index fcfdbeb2..fc84483a 100644 --- a/plugins/AudioPlugin/quickwidgetsink.h +++ b/plugins/AudioPlugin/quickwidgetsink.h @@ -20,9 +20,9 @@ #ifndef QUICKWIDGETSINK_H #define QUICKWIDGETSINK_H +#include +#include #include -#include -#include namespace Ui { class QuickWidgetSink; diff --git a/plugins/AudioPlugin/quickwidgetsinkinput.cpp b/plugins/AudioPlugin/quickwidgetsinkinput.cpp index 5e5557d7..4c5b89bc 100644 --- a/plugins/AudioPlugin/quickwidgetsinkinput.cpp +++ b/plugins/AudioPlugin/quickwidgetsinkinput.cpp @@ -20,23 +20,24 @@ #include "quickwidgetsinkinput.h" #include "ui_quickwidgetsinkinput.h" -#include -#include +#include "common.h" +#include +#include #include #include -#include "common.h" +#include struct QuickWidgetSinkInputPrivate { - bool changingVolume = false; - PulseAudioQt::SinkInput* sinkInput; + bool changingVolume = false; + PulseAudioQt::SinkInput* sinkInput; - QString pid; - static QMultiMap sinkInputsByPid; + QString pid; + static QMultiMap sinkInputsByPid; - QMenu* menu; - QMenu* devicesMenu; - QMap sinkActions; - QActionGroup* devicesGroup; + QMenu* menu; + QMenu* devicesMenu; + QMap sinkActions; + QActionGroup* devicesGroup; }; QMultiMap QuickWidgetSinkInputPrivate::sinkInputsByPid = QMultiMap(); @@ -90,11 +91,11 @@ void QuickWidgetSinkInput::updateVolume() { void QuickWidgetSinkInput::updateClient() { QString name = d->sinkInput->properties().value("application.name", d->sinkInput->name()).toString(); -// if (d->sinkInput->client()) { -// name = d->sinkInput->client()->name(); -// } else { -// name = d->sinkInput->name(); -// } + // if (d->sinkInput->client()) { + // name = d->sinkInput->client()->name(); + // } else { + // name = d->sinkInput->name(); + // } ui->nameLabel->setText(this->fontMetrics().elidedText(name, Qt::ElideRight, SC_DPI(200))); } @@ -130,17 +131,17 @@ void QuickWidgetSinkInput::sinkAdded(PulseAudioQt::Sink* sink) { QAction* action = new QAction(this); action->setCheckable(true); - connect(sink, &PulseAudioQt::Sink::propertiesChanged, action, [ = ] { + connect(sink, &PulseAudioQt::Sink::propertiesChanged, action, [=] { action->setText(Common::nameForSink(sink)); }); action->setText(Common::nameForSink(sink)); - connect(d->sinkInput, &PulseAudioQt::SinkInput::deviceIndexChanged, action, [ = ] { + connect(d->sinkInput, &PulseAudioQt::SinkInput::deviceIndexChanged, action, [=] { action->setChecked(sink->index() == d->sinkInput->deviceIndex()); }); action->setChecked(sink->index() == d->sinkInput->deviceIndex()); - connect(action, &QAction::toggled, this, [ = ](bool checked) { + connect(action, &QAction::toggled, this, [=](bool checked) { if (checked) { for (QuickWidgetSinkInput* sinkInputWidget : d->sinkInputsByPid.values(d->pid)) sinkInputWidget->d->sinkInput->setDeviceIndex(sink->index()); } diff --git a/plugins/AudioPlugin/quickwidgetsinkinput.h b/plugins/AudioPlugin/quickwidgetsinkinput.h index 5d7b388d..3a923225 100644 --- a/plugins/AudioPlugin/quickwidgetsinkinput.h +++ b/plugins/AudioPlugin/quickwidgetsinkinput.h @@ -20,9 +20,9 @@ #ifndef QUICKWIDGETSINKINPUT_H #define QUICKWIDGETSINKINPUT_H +#include +#include #include -#include -#include namespace Ui { class QuickWidgetSinkInput; diff --git a/plugins/AudioPlugin/translations/ar_SA.ts b/plugins/AudioPlugin/translations/ar_SA.ts index 99bf7858..fba8e590 100644 --- a/plugins/AudioPlugin/translations/ar_SA.ts +++ b/plugins/AudioPlugin/translations/ar_SA.ts @@ -1,58 +1,55 @@ - + AudioQuickWidget - VOLUME - الصوت + الصوت - APPLICATIONS - التطبيقات + التطبيقات - QUIET MODE - الوضع الصامت + الوضع الصامت EventHandler - + No Audio Devices لا يوجد أجهزة صوت - + Mute صامت - + Unmute Quiet Mode before changing the volume - + Speakers - + Headphones - + Line Out - + Volume @@ -60,30 +57,22 @@ MicChunk - + %n applications + + + + + - - QuickWidgetSink - - - Make Default - - - - - Use for All Applications - - - QuickWidgetSinkInput - + Play on diff --git a/plugins/AudioPlugin/translations/au_AU.ts b/plugins/AudioPlugin/translations/au_AU.ts index 286351ed..106309bb 100644 --- a/plugins/AudioPlugin/translations/au_AU.ts +++ b/plugins/AudioPlugin/translations/au_AU.ts @@ -1,58 +1,40 @@ - - AudioQuickWidget - - - VOLUME - - - - - APPLICATIONS - - - - - QUIET MODE - - - EventHandler - + No Audio Devices - + Mute - + Unmute Quiet Mode before changing the volume - + Speakers - + Headphones - + Line Out - + Volume @@ -60,30 +42,17 @@ MicChunk - + %n applications - - QuickWidgetSink - - - Make Default - - - - - Use for All Applications - - - QuickWidgetSinkInput - + Play on diff --git a/plugins/AudioPlugin/translations/cy.ts b/plugins/AudioPlugin/translations/cy.ts index aa85dc1a..0d255898 100644 --- a/plugins/AudioPlugin/translations/cy.ts +++ b/plugins/AudioPlugin/translations/cy.ts @@ -1,58 +1,40 @@ - - AudioQuickWidget - - - VOLUME - - - - - APPLICATIONS - - - - - QUIET MODE - - - EventHandler - + No Audio Devices - + Mute - + Unmute Quiet Mode before changing the volume - + Speakers - + Headphones - + Line Out - + Volume @@ -60,7 +42,7 @@ MicChunk - + %n applications @@ -71,23 +53,10 @@ - - QuickWidgetSink - - - Make Default - - - - - Use for All Applications - - - QuickWidgetSinkInput - + Play on diff --git a/plugins/AudioPlugin/translations/da.ts b/plugins/AudioPlugin/translations/da.ts index 402c40c6..194f2dd5 100644 --- a/plugins/AudioPlugin/translations/da.ts +++ b/plugins/AudioPlugin/translations/da.ts @@ -1,58 +1,40 @@ - - AudioQuickWidget - - - VOLUME - - - - - APPLICATIONS - - - - - QUIET MODE - - - EventHandler - + No Audio Devices - + Mute - + Unmute Quiet Mode before changing the volume - + Speakers - + Headphones - + Line Out - + Volume @@ -60,7 +42,7 @@ MicChunk - + %n applications @@ -68,23 +50,10 @@ - - QuickWidgetSink - - - Make Default - - - - - Use for All Applications - - - QuickWidgetSinkInput - + Play on diff --git a/plugins/AudioPlugin/translations/de.ts b/plugins/AudioPlugin/translations/de.ts index e67a5ba5..8f270668 100644 --- a/plugins/AudioPlugin/translations/de.ts +++ b/plugins/AudioPlugin/translations/de.ts @@ -4,55 +4,52 @@ AudioQuickWidget - VOLUME - LAUTSTÄRKE + LAUTSTÄRKE - APPLICATIONS - ANWENDUNGEN + ANWENDUNGEN - QUIET MODE - STILLER MODUS + STILLER MODUS EventHandler - + No Audio Devices Keine Audiogeräte - + Mute Stumm - + Unmute Quiet Mode before changing the volume - + Speakers Lautsprecher - + Headphones Kopfhörer - + Line Out Line Out - + Volume Lautstärke @@ -60,7 +57,7 @@ MicChunk - + %n applications %n Anwendung @@ -71,20 +68,18 @@ QuickWidgetSink - Make Default - Als Standard festlegen + Als Standard festlegen - Use for All Applications - Für alle Anwendungen verwenden + Für alle Anwendungen verwenden QuickWidgetSinkInput - + Play on Abspielen auf diff --git a/plugins/AudioPlugin/translations/en_GB.ts b/plugins/AudioPlugin/translations/en_GB.ts index d0fdcb96..3c17e0f8 100644 --- a/plugins/AudioPlugin/translations/en_GB.ts +++ b/plugins/AudioPlugin/translations/en_GB.ts @@ -1,48 +1,40 @@ - - AudioQuickWidget - - VOLUME - - - - QUIET MODE - - - - APPLICATIONS - - - EventHandler + No Audio Devices No Audio Devices + Speakers Speakers + Headphones Headphones + Volume Volume + Mute Mute + Unmute Quiet Mode before changing the volume Unmute Quiet Mode before changing the volume + Line Out @@ -50,6 +42,7 @@ MicChunk + %n applications @@ -57,20 +50,10 @@ - - QuickWidgetSink - - Make Default - - - - Use for All Applications - - - QuickWidgetSinkInput + Play on diff --git a/plugins/AudioPlugin/translations/en_US.ts b/plugins/AudioPlugin/translations/en_US.ts index b02d3ff1..25521c4b 100644 --- a/plugins/AudioPlugin/translations/en_US.ts +++ b/plugins/AudioPlugin/translations/en_US.ts @@ -1,58 +1,40 @@ - - AudioQuickWidget - - - VOLUME - - - - - APPLICATIONS - - - - - QUIET MODE - - - EventHandler - + No Audio Devices - + Mute - + Unmute Quiet Mode before changing the volume - + Speakers - + Headphones - + Line Out - + Volume @@ -60,30 +42,17 @@ MicChunk - + %n applications - - QuickWidgetSink - - - Make Default - - - - - Use for All Applications - - - QuickWidgetSinkInput - + Play on diff --git a/plugins/AudioPlugin/translations/es.ts b/plugins/AudioPlugin/translations/es.ts index 65d4c2b4..e10196ad 100644 --- a/plugins/AudioPlugin/translations/es.ts +++ b/plugins/AudioPlugin/translations/es.ts @@ -1,58 +1,40 @@ - - - AudioQuickWidget - - - VOLUME - - - - - APPLICATIONS - - - - - QUIET MODE - - - + EventHandler - + No Audio Devices - + Mute - + Unmute Quiet Mode before changing the volume - + Speakers - + Headphones - + Line Out - + Volume @@ -60,30 +42,18 @@ MicChunk - + %n applications + - - QuickWidgetSink - - - Make Default - - - - - Use for All Applications - - - QuickWidgetSinkInput - + Play on diff --git a/plugins/AudioPlugin/translations/es_VE.ts b/plugins/AudioPlugin/translations/es_VE.ts index 55e130fb..5cf3bf21 100644 --- a/plugins/AudioPlugin/translations/es_VE.ts +++ b/plugins/AudioPlugin/translations/es_VE.ts @@ -1,58 +1,40 @@ - - - AudioQuickWidget - - - VOLUME - - - - - APPLICATIONS - - - - - QUIET MODE - - - + EventHandler - + No Audio Devices - + Mute - + Unmute Quiet Mode before changing the volume - + Speakers - + Headphones - + Line Out - + Volume @@ -60,30 +42,18 @@ MicChunk - + %n applications + - - QuickWidgetSink - - - Make Default - - - - - Use for All Applications - - - QuickWidgetSinkInput - + Play on diff --git a/plugins/AudioPlugin/translations/id.ts b/plugins/AudioPlugin/translations/id.ts index 796a1260..37f376de 100644 --- a/plugins/AudioPlugin/translations/id.ts +++ b/plugins/AudioPlugin/translations/id.ts @@ -1,58 +1,40 @@ - - - AudioQuickWidget - - - VOLUME - - - - - APPLICATIONS - - - - - QUIET MODE - - - + EventHandler - + No Audio Devices - + Mute - + Unmute Quiet Mode before changing the volume - + Speakers - + Headphones - + Line Out - + Volume @@ -60,30 +42,17 @@ MicChunk - + %n applications - - QuickWidgetSink - - - Make Default - - - - - Use for All Applications - - - QuickWidgetSinkInput - + Play on diff --git a/plugins/AudioPlugin/translations/ja.ts b/plugins/AudioPlugin/translations/ja.ts index 1f7042df..64d33158 100644 --- a/plugins/AudioPlugin/translations/ja.ts +++ b/plugins/AudioPlugin/translations/ja.ts @@ -1,58 +1,40 @@ - - AudioQuickWidget - - - VOLUME - - - - - APPLICATIONS - - - - - QUIET MODE - - - EventHandler - + No Audio Devices - + Mute - + Unmute Quiet Mode before changing the volume - + Speakers - + Headphones - + Line Out - + Volume @@ -60,30 +42,17 @@ MicChunk - + %n applications - - QuickWidgetSink - - - Make Default - - - - - Use for All Applications - - - QuickWidgetSinkInput - + Play on diff --git a/plugins/AudioPlugin/translations/nl.ts b/plugins/AudioPlugin/translations/nl.ts index f941d570..4060b4e8 100644 --- a/plugins/AudioPlugin/translations/nl.ts +++ b/plugins/AudioPlugin/translations/nl.ts @@ -4,55 +4,52 @@ AudioQuickWidget - VOLUME - VOLUME + VOLUME - APPLICATIONS - APPLICATIES + APPLICATIES - QUIET MODE - STILTEMODUS + STILTEMODUS EventHandler - + No Audio Devices Geen Audio-apparaten - + Mute Stil - + Unmute Quiet Mode before changing the volume Zet Stiltemodus uit voordat je het volume aanpast - + Speakers Speakers - + Headphones Koptelefoons - + Line Out Lijn Uit - + Volume Volume @@ -60,7 +57,7 @@ MicChunk - + %n applications %n applicatie @@ -71,20 +68,18 @@ QuickWidgetSink - Make Default - Standaard Maken + Standaard Maken - Use for All Applications - Voor Alle Applicaties Gebruiken + Voor Alle Applicaties Gebruiken QuickWidgetSinkInput - + Play on diff --git a/plugins/AudioPlugin/translations/pt_BR.ts b/plugins/AudioPlugin/translations/pt_BR.ts index 248f3f79..e95504de 100644 --- a/plugins/AudioPlugin/translations/pt_BR.ts +++ b/plugins/AudioPlugin/translations/pt_BR.ts @@ -4,55 +4,52 @@ AudioQuickWidget - VOLUME - VOLUME + VOLUME - APPLICATIONS - APLICAÇÕES + APLICAÇÕES - QUIET MODE - MODO SILENCIOSO + MODO SILENCIOSO EventHandler - + No Audio Devices Nenhum dispositivo de áudio - + Mute Mudo - + Unmute Quiet Mode before changing the volume Desative o modo silencioso antes de mudar o volume - + Speakers Alto-falantes - + Headphones Fones de ouvido - + Line Out Saída de linha (Line Out) - + Volume Volume @@ -60,7 +57,7 @@ MicChunk - + %n applications %n aplicativo @@ -71,20 +68,18 @@ QuickWidgetSink - Make Default - Tornar padrão + Tornar padrão - Use for All Applications - Usar para todos os aplicativos + Usar para todos os aplicativos QuickWidgetSinkInput - + Play on Reproduzir em diff --git a/plugins/AudioPlugin/translations/ro_RO.ts b/plugins/AudioPlugin/translations/ro_RO.ts index 2b9edb8f..1c8b5813 100644 --- a/plugins/AudioPlugin/translations/ro_RO.ts +++ b/plugins/AudioPlugin/translations/ro_RO.ts @@ -5,44 +5,51 @@ AudioQuickWidget VOLUME - VOLUM + VOLUM QUIET MODE - MOD SILENȚIOS + MOD SILENȚIOS APPLICATIONS - APLICAȚII + APLICAȚII EventHandler + No Audio Devices Niciun dispozitiv audio conectat + Speakers Boxe + Headphones Căști + Volume Volum + Mute Mut + Unmute Quiet Mode before changing the volume Dezactivați modul silențios înainte de a schimba volumul + Line Out Mufă căști/boxe @@ -50,6 +57,7 @@ MicChunk + %n applications o aplicație @@ -62,16 +70,17 @@ QuickWidgetSink Make Default - Setează ca implicit + Setează ca implicit Use for All Applications - Folosiți pentru toate aplicații + Folosiți pentru toate aplicații QuickWidgetSinkInput + Play on Redă pe diff --git a/plugins/AudioPlugin/translations/sv.ts b/plugins/AudioPlugin/translations/sv.ts index f4cbc8a0..2c81c13e 100644 --- a/plugins/AudioPlugin/translations/sv.ts +++ b/plugins/AudioPlugin/translations/sv.ts @@ -1,58 +1,40 @@ - - AudioQuickWidget - - - VOLUME - - - - - APPLICATIONS - - - - - QUIET MODE - - - EventHandler - + No Audio Devices - + Mute - + Unmute Quiet Mode before changing the volume - + Speakers - + Headphones - + Line Out - + Volume @@ -60,7 +42,7 @@ MicChunk - + %n applications @@ -68,23 +50,10 @@ - - QuickWidgetSink - - - Make Default - - - - - Use for All Applications - - - QuickWidgetSinkInput - + Play on diff --git a/plugins/AudioPlugin/translations/tr_TR.ts b/plugins/AudioPlugin/translations/tr_TR.ts index 3ff04387..00e0023f 100644 --- a/plugins/AudioPlugin/translations/tr_TR.ts +++ b/plugins/AudioPlugin/translations/tr_TR.ts @@ -5,44 +5,51 @@ AudioQuickWidget VOLUME - SES + SES QUIET MODE - SESSİZ MOD + SESSİZ MOD APPLICATIONS - UYGULAMALAR + UYGULAMALAR EventHandler + No Audio Devices Ses Cihazı Yok + Speakers Hoparlörler + Headphones Kulaklıklar + Volume Ses + Mute Sessiz + Unmute Quiet Mode before changing the volume Sesi değiştirmeden önce Sessiz Modu Açın + Line Out Hat Çıkışı @@ -50,6 +57,7 @@ MicChunk + %n applications @@ -60,16 +68,17 @@ QuickWidgetSink Make Default - Varsayılan Yap + Varsayılan Yap Use for All Applications - Tüm uygulamalar için kullan + Tüm uygulamalar için kullan QuickWidgetSinkInput + Play on Oynamak diff --git a/plugins/AudioPlugin/translations/vi_VN.ts b/plugins/AudioPlugin/translations/vi_VN.ts index 80ada019..1289273b 100644 --- a/plugins/AudioPlugin/translations/vi_VN.ts +++ b/plugins/AudioPlugin/translations/vi_VN.ts @@ -5,44 +5,51 @@ AudioQuickWidget VOLUME - ÂM LƯỢNG + ÂM LƯỢNG QUIET MODE - CHẾ ĐỘ IM + CHẾ ĐỘ IM APPLICATIONS - ỨNG DỤNG + ỨNG DỤNG EventHandler + No Audio Devices Không có thiết bị âm thanh + Speakers Loa + Headphones Tai nghe + Volume Âm lượng + Mute Im lặng + Unmute Quiet Mode before changing the volume Đổi khỏi chế độ im lặng trước khi đổi âm lượng + Line Out Dòng ra @@ -50,6 +57,7 @@ MicChunk + %n applications %n ứng dụng @@ -60,16 +68,17 @@ QuickWidgetSink Make Default - Đặt thành mặc định + Đặt thành mặc định Use for All Applications - Sử dụng cho các ứng dụng + Sử dụng cho các ứng dụng QuickWidgetSinkInput + Play on Phát trên diff --git a/plugins/AudioPlugin/translations/zh_CN.ts b/plugins/AudioPlugin/translations/zh_CN.ts index 3be5e5c9..b5bc465b 100644 --- a/plugins/AudioPlugin/translations/zh_CN.ts +++ b/plugins/AudioPlugin/translations/zh_CN.ts @@ -1,48 +1,40 @@ - - AudioQuickWidget - - VOLUME - - - - QUIET MODE - - - - APPLICATIONS - - - EventHandler + No Audio Devices 未找到音频设备 + Speakers 音响 + Headphones 耳机 + Volume 音量 + Mute 静音 + Unmute Quiet Mode before changing the volume 在更改音量之前请解除安静模式 + Line Out @@ -50,26 +42,17 @@ MicChunk + %n applications - - QuickWidgetSink - - Make Default - - - - Use for All Applications - - - QuickWidgetSinkInput + Play on diff --git a/plugins/AudioPlugin/translations/zu_ZA.ts b/plugins/AudioPlugin/translations/zu_ZA.ts index 474e0ca4..177ba83a 100644 --- a/plugins/AudioPlugin/translations/zu_ZA.ts +++ b/plugins/AudioPlugin/translations/zu_ZA.ts @@ -1,48 +1,40 @@ - - AudioQuickWidget - - VOLUME - - - - QUIET MODE - - - - APPLICATIONS - - - EventHandler + No Audio Devices + Speakers + Headphones + Volume + Mute + Unmute Quiet Mode before changing the volume + Line Out @@ -50,26 +42,17 @@ MicChunk + %n applications - - QuickWidgetSink - - Make Default - - - - Use for All Applications - - - QuickWidgetSinkInput + Play on diff --git a/plugins/BrightnessPlugin/translations/es.ts b/plugins/BrightnessPlugin/translations/es.ts index aa59064c..2a1af942 100644 --- a/plugins/BrightnessPlugin/translations/es.ts +++ b/plugins/BrightnessPlugin/translations/es.ts @@ -1,6 +1,6 @@ - + Plugin diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index c617784d..8c78aeab 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -24,9 +24,9 @@ add_subdirectory(TimeDatePlugin) add_subdirectory(AccessibilityPlugin) # TODO: Port when KF6 is available: -# add_subdirectory(AudioPlugin) +add_subdirectory(AudioPlugin) # add_subdirectory(BluetoothPlugin) add_subdirectory(NetworkPlugin) # TODO: Check that PolkitQt works when KF6 is available -add_subdirectory(UsersPlugin) +#add_subdirectory(UsersPlugin) diff --git a/plugins/DefaultsPlugin/translations/es.ts b/plugins/DefaultsPlugin/translations/es.ts index fed9ce71..18f41b6e 100644 --- a/plugins/DefaultsPlugin/translations/es.ts +++ b/plugins/DefaultsPlugin/translations/es.ts @@ -1,6 +1,6 @@ - + DefaultsPane diff --git a/plugins/DisplayPlugin/translations/es.ts b/plugins/DisplayPlugin/translations/es.ts index 9a3d2bbf..c5cb676c 100644 --- a/plugins/DisplayPlugin/translations/es.ts +++ b/plugins/DisplayPlugin/translations/es.ts @@ -1,6 +1,6 @@ - + ArrangeWidget diff --git a/plugins/InputPlugin/translations/es.ts b/plugins/InputPlugin/translations/es.ts index 62003f98..d7293abf 100644 --- a/plugins/InputPlugin/translations/es.ts +++ b/plugins/InputPlugin/translations/es.ts @@ -1,6 +1,6 @@ - + InputSettingsLeftPane diff --git a/plugins/NetworkPlugin/translations/es.ts b/plugins/NetworkPlugin/translations/es.ts index b6bf4051..0ea96924 100644 --- a/plugins/NetworkPlugin/translations/es.ts +++ b/plugins/NetworkPlugin/translations/es.ts @@ -1,6 +1,6 @@ - + CellularPane @@ -50,6 +50,7 @@ + Cellular @@ -64,75 +65,75 @@ - + No SIM Card - + Insert a SIM card to connect to cellular services. - + No SIM - + Unavailable - + This network is unavailable because %2. - + Connection Failure - + Connecting to the network failed because %2. - - - + + + Enter SIM PIN - - - + + + SIM PIN Required - + A SIM PIN is required to connect to the cellular network. - - - + + + Enter SIM PUK - - - + + + SIM PUK Required - + A SIM PUK is required to connect to the cellular network. @@ -807,6 +808,7 @@ You have %n remaining tries + @@ -935,6 +937,7 @@ You'll need to contact your carrier for a new SIM card. You have %n remaining tries + diff --git a/plugins/NotificationsPlugin/translations/es.ts b/plugins/NotificationsPlugin/translations/es.ts index 5124f4b6..39333a56 100644 --- a/plugins/NotificationsPlugin/translations/es.ts +++ b/plugins/NotificationsPlugin/translations/es.ts @@ -1,6 +1,6 @@ - + MprisChunk diff --git a/plugins/OverviewPlugin/translations/es.ts b/plugins/OverviewPlugin/translations/es.ts index bccfc204..b27d92c8 100644 --- a/plugins/OverviewPlugin/translations/es.ts +++ b/plugins/OverviewPlugin/translations/es.ts @@ -1,6 +1,6 @@ - + OverviewPane @@ -33,6 +33,7 @@ Daylight Savings Time is ending on %2. The clock will automatically shift backwards by %n hour(s). + @@ -40,6 +41,7 @@ Daylight Savings Time is starting on %2. The clock will automatically shift forwards by %n hour(s). + diff --git a/plugins/PowerPlugin/translations/es.ts b/plugins/PowerPlugin/translations/es.ts index d4cdaeb9..e9a1bc6d 100644 --- a/plugins/PowerPlugin/translations/es.ts +++ b/plugins/PowerPlugin/translations/es.ts @@ -1,6 +1,6 @@ - + EventHandler @@ -18,6 +18,7 @@ %n seconds + diff --git a/plugins/ScreenshotPlugin/translations/es.ts b/plugins/ScreenshotPlugin/translations/es.ts index 6d46f331..60773458 100644 --- a/plugins/ScreenshotPlugin/translations/es.ts +++ b/plugins/ScreenshotPlugin/translations/es.ts @@ -1,6 +1,6 @@ - + PenButton diff --git a/plugins/ThemePlugin/translations/es.ts b/plugins/ThemePlugin/translations/es.ts index 51ce207b..7073b429 100644 --- a/plugins/ThemePlugin/translations/es.ts +++ b/plugins/ThemePlugin/translations/es.ts @@ -1,6 +1,6 @@ - + OnboardingTheme diff --git a/plugins/TimeDatePlugin/translations/es.ts b/plugins/TimeDatePlugin/translations/es.ts index 043e47e7..33e773b9 100644 --- a/plugins/TimeDatePlugin/translations/es.ts +++ b/plugins/TimeDatePlugin/translations/es.ts @@ -1,6 +1,6 @@ - + DateTimePane diff --git a/startdesk/translations/es.ts b/startdesk/translations/es.ts index bcb09390..f5cbd5c6 100644 --- a/startdesk/translations/es.ts +++ b/startdesk/translations/es.ts @@ -1,6 +1,6 @@ - + BacktraceDialog