From 255fe5d11d99db6b859163b4711ae6c1daa3029d Mon Sep 17 00:00:00 2001 From: audoban Date: Mon, 13 Jul 2015 21:06:47 -0500 Subject: [PATCH] Fixed 'Unknown protocol <>' in KF 5.12. --- .gitignore | 38 --------- Messages.sh | 9 ++- engine/CMakeLists.txt | 11 +-- engine/configdialog.cpp | 34 ++++---- engine/generalwidget.cpp | 22 ++--- engine/playbar.cpp | 116 ++++++++++++++------------- engine/playbarengine.cpp | 34 ++++---- engine/playbarjob.cpp | 21 ++--- engine/playbarservice.cpp | 12 +-- engine/playbarsettings.cpp | 79 +++++++++--------- plasmoid/contents/code/utils.js | 5 +- plasmoid/contents/ui/CoverArt.qml | 2 +- plasmoid/contents/ui/Mpris2.qml | 5 +- plasmoid/contents/ui/TimeLabel.qml | 2 +- plasmoid/contents/ui/TitleBar.qml | 2 +- plasmoid/contents/ui/TrackInfo.qml | 2 +- plasmoid/contents/ui/VolumeLabel.qml | 2 +- plasmoid/contents/ui/VolumeWheel.qml | 2 +- plasmoid/contents/ui/main.qml | 85 +++++++++++--------- po/plasma_applet_audoban.playbar.pot | 18 ----- 20 files changed, 234 insertions(+), 267 deletions(-) delete mode 100644 .gitignore delete mode 100644 po/plasma_applet_audoban.playbar.pot diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 24aa954..0000000 --- a/.gitignore +++ /dev/null @@ -1,38 +0,0 @@ -# Ignore hidden files -.directory - -# build directory -build/ - -# backup files -*.qml~ -*.js~ -*.xml~ -*.sh~ -*.desktop~ -*.kate-swp -.~* - -.~*.txt -.~*.h -.~*.cpp - -.*.qml~ -.*.js~ -.*.xml~ -.*.txt~ - -.*.h~ -.*.cpp~ -.*.ui~ -.*.pot~ -.*.kcfg~ -.*.kcfgc~ -*.gitignore~ - -# mo files -*.mo - -# KDevelop Project files -*.kdev4 -.kdev4/ diff --git a/Messages.sh b/Messages.sh index 3b7aba4..7fcfe3c 100755 --- a/Messages.sh +++ b/Messages.sh @@ -1,5 +1,6 @@ #! /usr/bin/env bash -extractrc `find ./engine -name \*.rc -o -name \*.ui -o -name \*.kcfg` >> rc.cpp -xgettext --force-po `find ./plasmoid ./engine -name \*.js -o -name \*.cpp` \ -rc.cpp -o ./po/plasma_applet_audoban.playbar.pot -rm -f rc.cpp +lupdate-qt5 ./plasmoid -extensions qml,js -ts out.ts +lconvert-qt5 -locations relative -i out.ts -o ./po/plasma_applet_audoban.applet.playbar.pot -of pot +extractrc `find ./engine -name \*.ui -o -name \*.kcfg` > rc.cpp +xgettext -ki18n ./rc.cpp -o po/plasma_dataengine_playbar.pot +rm -f rc.cpp out.ts diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt index 3054e70..49ad66f 100644 --- a/engine/CMakeLists.txt +++ b/engine/CMakeLists.txt @@ -15,15 +15,15 @@ add_library( plasma_engine_playbar MODULE ${playbar_engine_SRCS} ) kcoreaddons_desktop_to_json( plasma_engine_playbar plasma-dataengine-playbar.desktop ) target_link_libraries( plasma_engine_playbar + KF5::ConfigCore + KF5::ConfigGui + KF5::ConfigWidgets + KF5::GlobalAccel + KF5::I18n KF5::Plasma KF5::PlasmaQuick - KF5::ConfigWidgets - KF5::ConfigGui - KF5::ConfigCore KF5::WindowSystem KF5::XmlGui - KF5::GlobalAccel - KF5::I18n ) install(TARGETS plasma_engine_playbar @@ -37,3 +37,4 @@ install(FILES audoban.dataengine.playbar.operations install(FILES playbar.kcfg DESTINATION ${KCFG_INSTALL_DIR}) + diff --git a/engine/configdialog.cpp b/engine/configdialog.cpp index 2cf577e..09a9699 100644 --- a/engine/configdialog.cpp +++ b/engine/configdialog.cpp @@ -26,22 +26,22 @@ #include "generalwidget.h" #include "playbarsettings.h" -ConfigDialog::ConfigDialog( KActionCollection * collection , QWidget * parent ) - : KConfigDialog( parent, QLatin1String( "PlayBar Settings" ), PlayBarSettings::self() ), - m_generalPage( new GeneralWidget( this ) ) +ConfigDialog::ConfigDialog (KActionCollection *collection , QWidget *parent) + : KConfigDialog (parent, QLatin1String ("PlayBar Settings"), PlayBarSettings::self()), + m_generalPage (new GeneralWidget (this)) { - setWindowTitle( i18n( "Configure PlayBar" ) ); - m_shortcutsPage = new KShortcutsEditor( collection, this, KShortcutsEditor::GlobalAction ); - setStandardButtons( QDialogButtonBox::Apply | QDialogButtonBox::Ok | QDialogButtonBox::Cancel ); + setWindowTitle (i18n ("Configure PlayBar")); + m_shortcutsPage = new KShortcutsEditor (collection, this, KShortcutsEditor::GlobalAction); + setStandardButtons (QDialogButtonBox::Apply | QDialogButtonBox::Ok | QDialogButtonBox::Cancel); - addPage( m_generalPage, i18nc( "General config", "General" ), "applications-multimedia", i18nc( "General Config", "General" ) ); - addPage( m_shortcutsPage, i18nc( "Shortcuts config", "Shortcuts" ), "configure-shortcuts", i18n( "Shortcuts Configuration" ) ); + addPage (m_generalPage, i18nc ("General config", "General"), "applications-multimedia", i18nc ("General Config", "General")); + addPage (m_shortcutsPage, i18nc ("Shortcuts config", "Shortcuts"), "configure-shortcuts", i18n ("Shortcuts Configuration")); - connect( this, SIGNAL( accepted() ), this, SLOT( updateSettings() ) ); - QPushButton * apply = this->button( QDialogButtonBox::Apply ); - connect( apply, SIGNAL( clicked() ), this, SLOT( updateSettings() ) ); + connect (this, SIGNAL (accepted()), this, SLOT (updateSettings())); + QPushButton *apply = this->button (QDialogButtonBox::Apply); + connect (apply, SIGNAL (clicked()), this, SLOT (updateSettings())); - connect( this, SIGNAL( finished( int ) ), this, SLOT( deleteLater() ) ); + connect (this, SIGNAL (finished (int)), this, SLOT (deleteLater())); } ConfigDialog::~ConfigDialog() @@ -54,12 +54,12 @@ void ConfigDialog::updateSettings() // User clicks Ok or Apply button in configuration dialog m_shortcutsPage->save(); - PlayBarSettings * config = PlayBarSettings::self(); + PlayBarSettings *config = PlayBarSettings::self(); - config->setShowStop( m_generalPage->showStop() ); - config->setControlsOnBar( m_generalPage->controlsOnBar() ); - config->setButtonsAppearance( m_generalPage->buttonsAppearance() ); - config->setBackgroundHint( m_generalPage->backgroundHint() ); + config->setShowStop (m_generalPage->showStop()); + config->setControlsOnBar (m_generalPage->controlsOnBar()); + config->setButtonsAppearance (m_generalPage->buttonsAppearance()); + config->setBackgroundHint (m_generalPage->backgroundHint()); config->save(); qDebug() << "PlayBarEngine: config saved"; } diff --git a/engine/generalwidget.cpp b/engine/generalwidget.cpp index b2c748a..3f6c4f9 100644 --- a/engine/generalwidget.cpp +++ b/engine/generalwidget.cpp @@ -19,29 +19,29 @@ #include "generalwidget.h" -GeneralWidget::GeneralWidget( QWidget * parent ) - : QWidget( parent ) +GeneralWidget::GeneralWidget (QWidget *parent) + : QWidget (parent) { - m_ui.setupUi( this ); + m_ui.setupUi (this); - connect( m_ui.flat, SIGNAL( toggled( bool ) ), this, SLOT( setButtonsAppearance( bool ) ) ); + connect (m_ui.flat, SIGNAL (toggled (bool)), this, SLOT (setButtonsAppearance (bool))); - connect( m_ui.normal, SIGNAL( toggled( bool ) ), this, SLOT( setBackgroundHint() ) ); - connect( m_ui.translucent, SIGNAL( toggled( bool ) ), this, SLOT( setBackgroundHint() ) ); - connect( m_ui.nobackground, SIGNAL( toggled( bool ) ), this, SLOT( setBackgroundHint() ) ); + connect (m_ui.normal, SIGNAL (toggled (bool)), this, SLOT (setBackgroundHint())); + connect (m_ui.translucent, SIGNAL (toggled (bool)), this, SLOT (setBackgroundHint())); + connect (m_ui.nobackground, SIGNAL (toggled (bool)), this, SLOT (setBackgroundHint())); } -void GeneralWidget::setButtonsAppearance( bool checked ) +void GeneralWidget::setButtonsAppearance (bool checked) { - if( checked ) m_buttonsAppearance = 0; + if (checked) m_buttonsAppearance = 0; else m_buttonsAppearance = 1; } void GeneralWidget::setBackgroundHint() { - if( m_ui.normal->isChecked() ) + if (m_ui.normal->isChecked()) m_backgroundHint = 1; // standard - else if( m_ui.translucent->isChecked() ) + else if (m_ui.translucent->isChecked()) m_backgroundHint = 2; // translucent else m_backgroundHint = 0; // no background diff --git a/engine/playbar.cpp b/engine/playbar.cpp index d388eec..c134119 100644 --- a/engine/playbar.cpp +++ b/engine/playbar.cpp @@ -29,51 +29,52 @@ #include #include + #include "playbarsettings.h" using namespace Plasma; -PlayBar::PlayBar( KSharedConfigPtr &config , QObject * parent ) - : QObject( parent ), - m_configDialog( nullptr ), - m_config( config ), - m_data( new Plasma::DataEngine::Data() ) +PlayBar::PlayBar (KSharedConfigPtr &config , QObject *parent) + : QObject (parent), + m_configDialog (nullptr), + m_config (config), + m_data (new Plasma::DataEngine::Data()) { m_dc = new DataEngineConsumer(); - m_collection = new KActionCollection( this, QLatin1String( "PlayBar" ) ); - m_collection->setComponentDisplayName( QLatin1String( "PlayBar" ) ); + m_collection = new KActionCollection (this, QLatin1String ("PlayBar")); + m_collection->setComponentDisplayName (QLatin1String ("PlayBar")); - m_playpause = m_collection->addAction( QLatin1String( "play-pause" ), this, SLOT( slotPlayPause() ) ); - m_playpause->setIcon( QIcon::fromTheme( QLatin1String( "media-playback-start" ) ) ); - m_playpause->setText( i18n( "Play/Pause" ) ); - KGlobalAccel::setGlobalShortcut( m_playpause, Qt::Key_MediaPlay ); + m_playpause = m_collection->addAction (QLatin1String ("play-pause"), this, SLOT (slotPlayPause())); + m_playpause->setIcon (QIcon::fromTheme (QLatin1String ("media-playback-start"))); + m_playpause->setText (i18n ("Play/Pause")); + KGlobalAccel::setGlobalShortcut (m_playpause, Qt::Key_MediaPlay); - m_stop = m_collection->addAction( QLatin1String( "stop" ), this, SLOT( slotStop() ) ); - m_stop->setIcon( QIcon::fromTheme( QLatin1String( "media-playback-stop" ) ) ); - m_stop->setText( i18n( "Stop" ) ); - KGlobalAccel::setGlobalShortcut( m_stop, Qt::Key_MediaStop ); + m_stop = m_collection->addAction (QLatin1String ("stop"), this, SLOT (slotStop())); + m_stop->setIcon (QIcon::fromTheme (QLatin1String ("media-playback-stop"))); + m_stop->setText (i18n ("Stop")); + KGlobalAccel::setGlobalShortcut (m_stop, Qt::Key_MediaStop); - m_next = m_collection->addAction( QLatin1String( "next" ), this, SLOT( slotNext() ) ); - m_next->setIcon( QIcon::fromTheme( QLatin1String( "media-skip-forward" ) ) ); - m_next->setText( i18n( "Next track" ) ); - KGlobalAccel::setGlobalShortcut( m_next, Qt::Key_MediaNext ); + m_next = m_collection->addAction (QLatin1String ("next"), this, SLOT (slotNext())); + m_next->setIcon (QIcon::fromTheme (QLatin1String ("media-skip-forward"))); + m_next->setText (i18n ("Next track")); + KGlobalAccel::setGlobalShortcut (m_next, Qt::Key_MediaNext); - m_previous = m_collection->addAction( QLatin1String( "previous" ), this, SLOT( slotPrevious() ) ); - m_previous->setIcon( QIcon::fromTheme( QLatin1String( "media-skip-backward" ) ) ); - m_previous->setText( i18n( "Previous track" ) ); - KGlobalAccel::setGlobalShortcut( m_previous, Qt::Key_MediaPrevious ); + m_previous = m_collection->addAction (QLatin1String ("previous"), this, SLOT (slotPrevious())); + m_previous->setIcon (QIcon::fromTheme (QLatin1String ("media-skip-backward"))); + m_previous->setText (i18n ("Previous track")); + KGlobalAccel::setGlobalShortcut (m_previous, Qt::Key_MediaPrevious); - m_volumeUp = m_collection->addAction( QLatin1String( "volume-up" ), this, SLOT( slotVolumeUp() ) ); - m_volumeUp->setText( i18n( "Volume up" ) ); - KGlobalAccel::setGlobalShortcut( m_volumeUp, QKeySequence() ); + m_volumeUp = m_collection->addAction (QLatin1String ("volume-up"), this, SLOT (slotVolumeUp())); + m_volumeUp->setText (i18n ("Volume up")); + KGlobalAccel::setGlobalShortcut (m_volumeUp, QKeySequence()); - m_volumeDown = m_collection->addAction( QLatin1String( "volume-down" ), this, SLOT( slotVolumeDown() ) ); - m_volumeDown->setText( i18n( "Volume down" ) ); - KGlobalAccel::setGlobalShortcut( m_volumeDown, QKeySequence() ); + m_volumeDown = m_collection->addAction (QLatin1String ("volume-down"), this, SLOT (slotVolumeDown())); + m_volumeDown->setText (i18n ("Volume down")); + KGlobalAccel::setGlobalShortcut (m_volumeDown, QKeySequence()); - m_openMediaPlayer = m_collection->addAction( QLatin1String( "toggle-mediaplayer" ), this, SLOT( slotToggleWinMediaPlayer() ) ); - m_openMediaPlayer->setText( i18n( "Toggle window media player" ) ); - KGlobalAccel::setGlobalShortcut( m_openMediaPlayer, QKeySequence() ); + m_openMediaPlayer = m_collection->addAction (QLatin1String ("toggle-mediaplayer"), this, SLOT (slotToggleWinMediaPlayer())); + m_openMediaPlayer->setText (i18n ("Toggle window media player")); + KGlobalAccel::setGlobalShortcut (m_openMediaPlayer, QKeySequence()); //connect( m_configDialog, SIGNAL( settingsChanged( QString ) ), this, SLOT( loadSettings() ) ); } @@ -82,22 +83,22 @@ PlayBar::~PlayBar() {} void PlayBar::slotPlayPause() { - startOpOverMpris2( "PlayPause" ); + startOpOverMpris2 ("PlayPause"); } void PlayBar::slotStop() { - startOpOverMpris2( "Stop" ); + startOpOverMpris2 ("Stop"); } void PlayBar::slotNext() { - startOpOverMpris2( "Next" ); + startOpOverMpris2 ("Next"); } void PlayBar::slotPrevious() { - startOpOverMpris2( "Previous" ); + startOpOverMpris2 ("Previous"); } void PlayBar::slotVolumeUp() @@ -111,17 +112,19 @@ void PlayBar::slotVolumeDown() void PlayBar::slotToggleWinMediaPlayer() { - startOpOverMpris2( "Raise" ); + startOpOverMpris2 ("Raise"); } void PlayBar::showSettings() { - if( KConfigDialog::showDialog( ConfigDialog::CONFIG_NAME ) ) + if (KConfigDialog::showDialog (ConfigDialog::CONFIG_NAME)) return; + //Read preferences from config file. PlayBarSettings::self()->load(); - m_configDialog = new ConfigDialog( m_collection ); - connect( this, SIGNAL( destroyed( QObject * ) ), m_configDialog, SLOT( deleteLater() ) ); + Q_ASSERT (m_collection); + m_configDialog = new ConfigDialog (m_collection); + connect (this, SIGNAL (destroyed (QObject *)), m_configDialog, SLOT (deleteLater())); m_configDialog->show(); } @@ -130,25 +133,28 @@ const DataEngine::Data &PlayBar::data() auto config = PlayBarSettings::self(); // Read preferences from the KConfig object. config->read(); - for( auto item : config->items() ) { + + for (auto item : config->items()) { QString name = item->name(); - if( name == QLatin1String( "ShowStop" ) ) - m_data->insert( name, config->showStop() ); - else if( name == QLatin1String( "ControlsOnBar" ) ) - m_data->insert( name, config->controlsOnBar() ); - else if( name == QLatin1String( "ButtonsAppearance" ) ) - m_data->insert( name , config->buttonsAppearance() ); - else if( name == QLatin1String( "BackgroundHint" ) ) - m_data->insert( name, config->backgroundHint() ); + + if (name == QLatin1String ("ShowStop")) + m_data->insert (name, config->showStop()); + else if (name == QLatin1String ("ControlsOnBar")) + m_data->insert (name, config->controlsOnBar()); + else if (name == QLatin1String ("ButtonsAppearance")) + m_data->insert (name , config->buttonsAppearance()); + else if (name == QLatin1String ("BackgroundHint")) + m_data->insert (name, config->backgroundHint()); } + return *m_data; } -void PlayBar::startOpOverMpris2( const QString &name ) const +void PlayBar::startOpOverMpris2 (const QString &name) const { - DataEngine * mpris2 = m_dc->dataEngine( MPRIS2 ); - Service * serv = mpris2->serviceForSource( mpris2_source ); - const QVariantMap &op = serv->operationDescription( name ); - ServiceJob * job = serv->startOperationCall( op ); - connect( job, SIGNAL( finished( KJob * ) ), serv, SLOT( deleteLater() ) ); + DataEngine *mpris2 = m_dc->dataEngine (MPRIS2); + Service *serv = mpris2->serviceForSource (mpris2_source); + const QVariantMap &op = serv->operationDescription (name); + ServiceJob *job = serv->startOperationCall (op); + connect (job, SIGNAL (finished (KJob *)), serv, SLOT (deleteLater())); } diff --git a/engine/playbarengine.cpp b/engine/playbarengine.cpp index 4a813eb..d22b04f 100644 --- a/engine/playbarengine.cpp +++ b/engine/playbarengine.cpp @@ -26,44 +26,46 @@ #include "playbarservice.h" #include "playbarsettings.h" -PlayBarEngine::PlayBarEngine( QObject * parent, const QVariantList &args ) - : DataEngine( parent, args ) +PlayBarEngine::PlayBarEngine (QObject *parent, const QVariantList &args) + : DataEngine (parent, args) { KSharedConfigPtr config = PlayBarSettings::self()->sharedConfig(); - m_playbar = new PlayBar( config, this ); + m_playbar = new PlayBar (config, this); - setMinimumPollingInterval( 500 ); + setMinimumPollingInterval (500); - connect( PlayBarSettings::self(), SIGNAL( configChanged() ), this, SLOT( updateData() ) ); + connect (PlayBarSettings::self(), SIGNAL (configChanged()), this, SLOT (updateData())); } PlayBarEngine::~PlayBarEngine() {} -Service * PlayBarEngine::serviceForSource( const QString &source ) +Service *PlayBarEngine::serviceForSource (const QString &source) { - if( source != PROVIDER ) return nullptr; - sourceRequestEvent( PROVIDER ); - Service * service = new PlayBarService( m_playbar, this ); + if (source != PROVIDER) return nullptr; + + sourceRequestEvent (PROVIDER); + Service *service = new PlayBarService (m_playbar, this); return service; } void PlayBarEngine::updateData() { - updateSourceEvent( PROVIDER ); + updateSourceEvent (PROVIDER); } -bool PlayBarEngine::sourceRequestEvent( const QString &source ) +bool PlayBarEngine::sourceRequestEvent (const QString &source) { - if( source != PROVIDER ) return false; - updateSourceEvent( PROVIDER ); + if (source != PROVIDER) return false; + + updateSourceEvent (PROVIDER); return true; } -bool PlayBarEngine::updateSourceEvent( const QString &source ) +bool PlayBarEngine::updateSourceEvent (const QString &source) { - setData( source, m_playbar->data() ); + setData (source, m_playbar->data()); return true; } -K_EXPORT_PLASMA_DATAENGINE_WITH_JSON( playbarengine, PlayBarEngine, "plasma-dataengine-playbar.json" ) +K_EXPORT_PLASMA_DATAENGINE_WITH_JSON (playbarengine, PlayBarEngine, "plasma-dataengine-playbar.json") #include "playbarengine.moc" diff --git a/engine/playbarjob.cpp b/engine/playbarjob.cpp index 0d9cfbf..8edeff2 100644 --- a/engine/playbarjob.cpp +++ b/engine/playbarjob.cpp @@ -23,13 +23,13 @@ #include "playbar.h" -PlayBarJob::PlayBarJob( const QString &destination, - const QString &operation, - const QVariantMap ¶meters, - PlayBar * playbar, - QObject * parent ): - ServiceJob( destination, operation, parameters, parent ), - m_playbar( playbar ) +PlayBarJob::PlayBarJob (const QString &destination, + const QString &operation, + const QVariantMap ¶meters, + PlayBar *playbar, + QObject *parent) : + ServiceJob (destination, operation, parameters, parent), + m_playbar (playbar) { } @@ -41,10 +41,11 @@ PlayBarJob::~PlayBarJob() void PlayBarJob::start() { - if( operationName() == QLatin1String( "ShowSettings" ) ) + if (operationName() == QLatin1String ("ShowSettings")) m_playbar->showSettings(); - if( operationName() == QLatin1String( "SetSourceMpris2" ) ) - m_playbar->mpris2_source = parameters()["source"].toString(); + + if (operationName() == QLatin1String ("SetSourceMpris2")) + m_playbar->mpris2_source = parameters() ["source"].toString(); emitResult(); } diff --git a/engine/playbarservice.cpp b/engine/playbarservice.cpp index 70dcf6d..9c1788e 100644 --- a/engine/playbarservice.cpp +++ b/engine/playbarservice.cpp @@ -27,11 +27,11 @@ #include "Plasma/ServiceJob" -PlayBarService::PlayBarService( PlayBar * playbar, QObject * parent ) - : Service( parent ), - m_playbar( playbar ) +PlayBarService::PlayBarService (PlayBar *playbar, QObject *parent) + : Service (parent), + m_playbar (playbar) { - setName( QLatin1Literal( "audoban.dataengine.playbar" ) ); + setName (QLatin1Literal ("audoban.dataengine.playbar")); } PlayBarService::~PlayBarService() @@ -39,7 +39,7 @@ PlayBarService::~PlayBarService() qDebug() << this << "deleted"; } -ServiceJob * PlayBarService::createJob( const QString &operation, QVariantMap ¶meters ) +ServiceJob *PlayBarService::createJob (const QString &operation, QVariantMap ¶meters) { - return new PlayBarJob( destination(), operation, parameters, m_playbar, this ); + return new PlayBarJob (destination(), operation, parameters, m_playbar, this); } diff --git a/engine/playbarsettings.cpp b/engine/playbarsettings.cpp index 0e076c4..299784d 100644 --- a/engine/playbarsettings.cpp +++ b/engine/playbarsettings.cpp @@ -8,55 +8,56 @@ #include #include -class PlayBarSettingsHelper -{ - public: - PlayBarSettingsHelper() : q(0) {} - ~PlayBarSettingsHelper() { delete q; } - PlayBarSettings *q; +class PlayBarSettingsHelper { +public: + PlayBarSettingsHelper() : q (0) {} + ~PlayBarSettingsHelper() { + delete q; + } + PlayBarSettings *q; }; -K_GLOBAL_STATIC(PlayBarSettingsHelper, s_globalPlayBarSettings) +K_GLOBAL_STATIC (PlayBarSettingsHelper, s_globalPlayBarSettings) PlayBarSettings *PlayBarSettings::self() { - if (!s_globalPlayBarSettings->q) { - new PlayBarSettings; - s_globalPlayBarSettings->q->readConfig(); - } + if (!s_globalPlayBarSettings->q) { + new PlayBarSettings; + s_globalPlayBarSettings->q->readConfig(); + } - return s_globalPlayBarSettings->q; + return s_globalPlayBarSettings->q; } -PlayBarSettings::PlayBarSettings( ) - : KConfigSkeleton( QLatin1String( "playbarrc" ) ) +PlayBarSettings::PlayBarSettings() + : KConfigSkeleton (QLatin1String ("playbarrc")) { - Q_ASSERT(!s_globalPlayBarSettings->q); - s_globalPlayBarSettings->q = this; - setCurrentGroup( QLatin1String( "General" ) ); - - KConfigSkeleton::ItemBool *itemShowStop; - itemShowStop = new KConfigSkeleton::ItemBool( currentGroup(), QLatin1String( "ShowStop" ), mShowStop, true ); - itemShowStop->setLabel( i18n("Show stop button") ); - addItem( itemShowStop, QLatin1String( "ShowStop" ) ); - KConfigSkeleton::ItemBool *itemControlsOnBar; - itemControlsOnBar = new KConfigSkeleton::ItemBool( currentGroup(), QLatin1String( "ControlsOnBar" ), mControlsOnBar, true ); - itemControlsOnBar->setLabel( i18n("Controls on bar") ); - addItem( itemControlsOnBar, QLatin1String( "ControlsOnBar" ) ); - QList valuesButtonsAppearance; - KConfigSkeleton::ItemEnum *itemButtonsAppearance; - itemButtonsAppearance = new KConfigSkeleton::ItemEnum( currentGroup(), QLatin1String( "ButtonsAppearance" ), mButtonsAppearance, valuesButtonsAppearance, 0 ); - itemButtonsAppearance->setLabel( i18n("Buttons appearance") ); - addItem( itemButtonsAppearance, QLatin1String( "ButtonsAppearance" ) ); - QList valuesBackgroundHint; - KConfigSkeleton::ItemEnum *itemBackgroundHint; - itemBackgroundHint = new KConfigSkeleton::ItemEnum( currentGroup(), QLatin1String( "BackgroundHint" ), mBackgroundHint, valuesBackgroundHint, 1 ); - itemBackgroundHint->setLabel( i18n("Background hints") ); - addItem( itemBackgroundHint, QLatin1String( "BackgroundHint" ) ); + Q_ASSERT (!s_globalPlayBarSettings->q); + s_globalPlayBarSettings->q = this; + setCurrentGroup (QLatin1String ("General")); + + KConfigSkeleton::ItemBool *itemShowStop; + itemShowStop = new KConfigSkeleton::ItemBool (currentGroup(), QLatin1String ("ShowStop"), mShowStop, true); + itemShowStop->setLabel (i18n ("Show stop button")); + addItem (itemShowStop, QLatin1String ("ShowStop")); + KConfigSkeleton::ItemBool *itemControlsOnBar; + itemControlsOnBar = new KConfigSkeleton::ItemBool (currentGroup(), QLatin1String ("ControlsOnBar"), mControlsOnBar, true); + itemControlsOnBar->setLabel (i18n ("Controls on bar")); + addItem (itemControlsOnBar, QLatin1String ("ControlsOnBar")); + QList valuesButtonsAppearance; + KConfigSkeleton::ItemEnum *itemButtonsAppearance; + itemButtonsAppearance = new KConfigSkeleton::ItemEnum (currentGroup(), QLatin1String ("ButtonsAppearance"), mButtonsAppearance, valuesButtonsAppearance, 0); + itemButtonsAppearance->setLabel (i18n ("Buttons appearance")); + addItem (itemButtonsAppearance, QLatin1String ("ButtonsAppearance")); + QList valuesBackgroundHint; + KConfigSkeleton::ItemEnum *itemBackgroundHint; + itemBackgroundHint = new KConfigSkeleton::ItemEnum (currentGroup(), QLatin1String ("BackgroundHint"), mBackgroundHint, valuesBackgroundHint, 1); + itemBackgroundHint->setLabel (i18n ("Background hints")); + addItem (itemBackgroundHint, QLatin1String ("BackgroundHint")); } PlayBarSettings::~PlayBarSettings() { - if (!s_globalPlayBarSettings.isDestroyed()) { - s_globalPlayBarSettings->q = 0; - } + if (!s_globalPlayBarSettings.isDestroyed()) { + s_globalPlayBarSettings->q = 0; + } } diff --git a/plasmoid/contents/code/utils.js b/plasmoid/contents/code/utils.js index 3ef5035..8e37e04 100644 --- a/plasmoid/contents/code/utils.js +++ b/plasmoid/contents/code/utils.js @@ -43,10 +43,11 @@ function setActions(sourceActive, identity){ plasmoid.removeAction('configure') plasmoid.setAction('raise', i18n("Open %1", identity), icon) - plasmoid.setAction('quit', i18n("Quit"), 'window-close') + plasmoid.setAction('quit', i18n("Quit") ,'window-close') plasmoid.setAction('nextSource', i18n("Next multimedia source"), 'go-next') plasmoid.setActionSeparator('sep1') - plasmoid.setAction('configure', i18n("Configure PlayBar"), 'configure', "alt+d, s" ) + plasmoid.setAction('configure', i18n("Configure PlayBar"), 'configure', +"alt+d, s" ) } diff --git a/plasmoid/contents/ui/CoverArt.qml b/plasmoid/contents/ui/CoverArt.qml index b405ef6..eaeb8a1 100644 --- a/plasmoid/contents/ui/CoverArt.qml +++ b/plasmoid/contents/ui/CoverArt.qml @@ -19,7 +19,7 @@ import QtQuick 2.4 import QtQuick.Layouts 1.1 -import "plasmapackage:/code/utils.js" as Utils +import "../code/utils.js" as Utils Rectangle{ id: bg diff --git a/plasmoid/contents/ui/Mpris2.qml b/plasmoid/contents/ui/Mpris2.qml index 7d97d7c..3aefee7 100644 --- a/plasmoid/contents/ui/Mpris2.qml +++ b/plasmoid/contents/ui/Mpris2.qml @@ -19,7 +19,7 @@ import QtQuick 2.4 import org.kde.plasma.core 2.0 as PlasmaCore -import "plasmapackage:/code/utils.js" as Utils +import "../code/utils.js" as Utils PlasmaCore.DataSource{ id: mpris2 @@ -45,7 +45,8 @@ PlasmaCore.DataSource{ property var service: null - property string identity: hasSource('Identity') ? data[source]['Identity'] : i18n("No media player") + property string identity: hasSource('Identity') ? data[source]['Identity'] : +i18n("No media player") property string playbackStatus: hasSource('PlaybackStatus') ? data[source]['PlaybackStatus'] : "" diff --git a/plasmoid/contents/ui/TimeLabel.qml b/plasmoid/contents/ui/TimeLabel.qml index 257b670..7291749 100644 --- a/plasmoid/contents/ui/TimeLabel.qml +++ b/plasmoid/contents/ui/TimeLabel.qml @@ -19,7 +19,7 @@ import QtQuick 2.4 import org.kde.plasma.extras 2.0 as PlasmaExtras -import "plasmapackage:/code/utils.js" as Utils +import "../code/utils.js" as Utils PlasmaExtras.Paragraph{ id: time diff --git a/plasmoid/contents/ui/TitleBar.qml b/plasmoid/contents/ui/TitleBar.qml index db81f59..1a12cdc 100644 --- a/plasmoid/contents/ui/TitleBar.qml +++ b/plasmoid/contents/ui/TitleBar.qml @@ -22,7 +22,7 @@ import QtQuick.Layouts 1.1 import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.extras 2.0 as PlasmaExtras -import "plasmapackage:/code/utils.js" as Utils +import "../code/utils.js" as Utils RowLayout{ Layout.minimumHeight: implicitHeight + units.smallSpacing diff --git a/plasmoid/contents/ui/TrackInfo.qml b/plasmoid/contents/ui/TrackInfo.qml index 7d41d14..80e0c23 100644 --- a/plasmoid/contents/ui/TrackInfo.qml +++ b/plasmoid/contents/ui/TrackInfo.qml @@ -20,7 +20,7 @@ import QtQuick 2.4 import QtQuick.Layouts 1.1 import org.kde.plasma.extras 2.0 as PlasmaExtras -import "plasmapackage:/code/utils.js" as Utils +import "../code/utils.js" as Utils GridLayout { id: trackInfo diff --git a/plasmoid/contents/ui/VolumeLabel.qml b/plasmoid/contents/ui/VolumeLabel.qml index 7666776..49e6a32 100644 --- a/plasmoid/contents/ui/VolumeLabel.qml +++ b/plasmoid/contents/ui/VolumeLabel.qml @@ -20,7 +20,7 @@ import QtQuick 2.4 import QtQuick.Layouts 1.1 import org.kde.plasma.extras 2.0 as PlasmaExtras -import "plasmapackage:/code/utils.js" as Utils +import "../code/utils.js" as Utils PlasmaExtras.Paragraph{ id: label diff --git a/plasmoid/contents/ui/VolumeWheel.qml b/plasmoid/contents/ui/VolumeWheel.qml index 073bd70..0d85989 100644 --- a/plasmoid/contents/ui/VolumeWheel.qml +++ b/plasmoid/contents/ui/VolumeWheel.qml @@ -18,7 +18,7 @@ */ import QtQuick 2.4 -import "plasmapackage:/code/utils.js" as Utils +import "../code/utils.js" as Utils MouseArea{ id: volumeWheelArea diff --git a/plasmoid/contents/ui/main.qml b/plasmoid/contents/ui/main.qml index e999f54..5b78649 100644 --- a/plasmoid/contents/ui/main.qml +++ b/plasmoid/contents/ui/main.qml @@ -21,19 +21,53 @@ import QtQuick 2.4 import QtQuick.Layouts 1.1 import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.plasmoid 2.0 -import "plasmapackage:/code/utils.js" as Utils +import "../code/utils.js" as Utils Item { id: root + //! dataengine + PlasmaCore.DataSource{ + id: playbarEngine + engine: 'audoban.dataengine.playbar' + connectedSources: 'Provider' + + readonly property bool showStop: hasSource('ShowStop') ? data[connectedSources[0]]['ShowStop'] : true + readonly property bool controlsOnBar: hasSource('ControlsOnBar') ? data[connectedSources[0]]['ControlsOnBar'] : true + readonly property int buttonsAppearance: hasSource('ButtonsAppearance') ? data[connectedSources[0]]['ButtonsAppearance'] : 0 + readonly property int backgroundHint: hasSource('BackgroundHint') ? data[connectedSources[0]]['BackgroundHint'] : 1 + + function startOperation(name){ + var service = playbarEngine.serviceForSource('Provider') + var job = service.operationDescription(name) + service.startOperationCall(job) + } + + function setSource(name){ + var service = playbarEngine.serviceForSource('Provider') + var job = service.operationDescription('SetSourceMpris2') + job['source'] = name + service.startOperationCall(job) + } + + function hasSource(key){ + return data[connectedSources[0]] != undefined + && data[connectedSources[0]][key] != undefined + } + } + //! dataengine + Mpris2{ id: mpris2 } + property bool vertical: plasmoid.formFactor == PlasmaCore.Types.Vertical - Plasmoid.compactRepresentation: CompactApplet{ id: compact} - Plasmoid.fullRepresentation: FullApplet{id: full} + Plasmoid.compactRepresentation: CompactApplet{ id: compact } + Plasmoid.fullRepresentation: DefaultLayout{ id: full } - Plasmoid.preferredRepresentation: plasmoid.formFactor == 0 ? Plasmoid.fullRepresentation : Plasmoid.compactRepresentation + Plasmoid.preferredRepresentation: plasmoid.formFactor == 0 +? Plasmoid.fullRepresentation : Plasmoid.compactRepresentation Plasmoid.icon: internal.icon + Plasmoid.title: mpris2.identity Plasmoid.toolTipMainText: internal.title Plasmoid.toolTipSubText: internal.subText Plasmoid.backgroundHints: playbarEngine.backgroundHint @@ -74,45 +108,19 @@ Item { playbarEngine.startOperation('ShowSettings') } - Mpris2{ id: mpris2 } - - PlasmaCore.DataSource{ - id: playbarEngine - engine: 'audoban.dataengine.playbar' - connectedSources: 'Provider' - - readonly property bool showStop: hasSource('ShowStop') ? data[connectedSources[0]]['ShowStop'] : true - readonly property bool controlsOnBar: hasSource('ControlsOnBar') ? data[connectedSources[0]]['ControlsOnBar'] : true - readonly property int buttonsAppearance: hasSource('ButtonsAppearance') ? data[connectedSources[0]]['ButtonsAppearance'] : 0 - readonly property int backgroundHint: hasSource('BackgroundHint') ? data[connectedSources[0]]['BackgroundHint'] : 1 - - function startOperation(name){ - var service = playbarEngine.serviceForSource('Provider') - var job = service.operationDescription(name) - service.startOperationCall(job) - } - - function setSource(name){ - var service = playbarEngine.serviceForSource('Provider') - var job = service.operationDescription('SetSourceMpris2') - job['source'] = name - service.startOperationCall(job) - } - - function hasSource(key){ - return data[connectedSources[0]] != undefined - && data[connectedSources[0]][key] != undefined - } - } Component.onCompleted:{ + debug("Loading PlayBar ...") debug("Location: " + Plasmoid.location) + debug("title plasmoid:" + Plasmoid.title) + debug("i18n" + i18n) plasmoid.formFactorChanged() //NOTE: Init Utils Utils.plasmoid = plasmoid Utils.i18n = i18n plasmoid.removeAction('configure') - plasmoid.setAction('configure', i18n("Configure PlayBar"), 'configure', "alt+d, s") + plasmoid.setAction('configure', i18n("Configure PlayBar"), +'configure', "alt+d, s") } QtObject{ @@ -123,11 +131,12 @@ Item { property string title: mpris2.title != "" ? mpris2.title : "PlayBar" property string artist: - mpris2.artist != "" ? i18nc("ToolTip: track artist %1", "By %1, ", mpris2.artist) : "" + mpris2.artist != "" ? i18n("By %1, ", mpris2.artist) : "" property string album: - mpris2.album != ""? i18nc("ToolTip: track album %1", "On %1", mpris2.album) : "" + mpris2.album != ""? i18n("On %1", mpris2.album) : "" property string subText: - (title == "PlayBar" & artist == "" & album == "") ? i18n("Client MPRIS2, allows you to control your favorite media player") : artist + album + (title == "PlayBar" & artist == "" & album == "") ? i18n("Client +MPRIS2, allows you to control your favorite media player") : artist + album } } diff --git a/po/plasma_applet_audoban.playbar.pot b/po/plasma_applet_audoban.playbar.pot deleted file mode 100644 index 90c7cef..0000000 --- a/po/plasma_applet_audoban.playbar.pot +++ /dev/null @@ -1,18 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-08 19:28-0500\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n"