[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [amarok/spotify] src/core-impl/collections/spotifycollection: Rename and sanitize SpotifySettingsDia
From: Bart Cerneels <bart.cerneels () kde ! org>
Date: 2012-11-06 20:22:52
Message-ID: 20121106202252.A04CDA60C8 () git ! kde ! org
[Download RAW message or body]
Git commit eec830c7fe9a737378df01e26c2e7a942237b8d9 by Bart Cerneels.
Committed on 06/11/2012 at 12:51.
Pushed by shanachie into branch 'spotify'.
Rename and sanitize SpotifySettingsDialog.
M +2 -2 src/core-impl/collections/spotifycollection/CMakeLists.txt
M +2 -2 src/core-impl/collections/spotifycollection/SpotifyCollection.cpp
R +45 -54 src/core-impl/collections/spotifycollection/SpotifySettingsDialog.cpp \
[from: src/core-impl/collections/spotifycollection/SpotifySettings.cpp - 073% \
similarity] R +9 -5 \
src/core-impl/collections/spotifycollection/SpotifySettingsDialog.h [from: \
src/core-impl/collections/spotifycollection/SpotifySettings.h - 084% similarity] R \
+2 -2 src/core-impl/collections/spotifycollection/SpotifySettingsWidget.ui \
[from: src/core-impl/collections/spotifycollection/SpotifyConfigWidget.ui - 095% \
similarity]
http://commits.kde.org/amarok/eec830c7fe9a737378df01e26c2e7a942237b8d9
diff --git a/src/core-impl/collections/spotifycollection/CMakeLists.txt \
b/src/core-impl/collections/spotifycollection/CMakeLists.txt index 8cc7c35..c9820fc \
100644
--- a/src/core-impl/collections/spotifycollection/CMakeLists.txt
+++ b/src/core-impl/collections/spotifycollection/CMakeLists.txt
@@ -11,14 +11,14 @@ set( amarok_collection-spotifycollection_PART_SRCS
SpotifyQueryMaker.cpp
SpotifyMeta.cpp
SpotifyConfig.cpp
- SpotifySettings.cpp
+ SpotifySettingsDialog.cpp
SpotifyDownloadDialog.cpp
support/TrackProxy.cpp
support/Query.cpp
support/Controller.cpp )
kde4_add_ui_files( amarok_collection-spotifycollection_PART_SRCS
- SpotifyConfigWidget.ui
+ SpotifySettingsWidget.ui
SpotifyDownloadDialog.ui
)
diff --git a/src/core-impl/collections/spotifycollection/SpotifyCollection.cpp \
b/src/core-impl/collections/spotifycollection/SpotifyCollection.cpp index \
4ec1f39..3b47a67 100644
--- a/src/core-impl/collections/spotifycollection/SpotifyCollection.cpp
+++ b/src/core-impl/collections/spotifycollection/SpotifyCollection.cpp
@@ -20,7 +20,7 @@
#include "SpotifyCollection.h"
#include "SpotifyQueryMaker.h"
-#include "SpotifySettings.h"
+#include "SpotifySettingsDialog.h"
#include "support/Controller.h"
#include "support/TrackProxy.h"
@@ -401,7 +401,7 @@ namespace Collections
SpotifyCollection::slotConfigure()
{
// settingDialog will be deleted after closed
- SpotifySettings* settingDialog = new SpotifySettings;
+ SpotifySettingsDialog* settingDialog = new SpotifySettingsDialog;
settingDialog->setModal( true );
// This will return immediately
settingDialog->show();
diff --git a/src/core-impl/collections/spotifycollection/SpotifySettings.cpp \
b/src/core-impl/collections/spotifycollection/SpotifySettingsDialog.cpp similarity \
index 73% rename from src/core-impl/collections/spotifycollection/SpotifySettings.cpp
rename to src/core-impl/collections/spotifycollection/SpotifySettingsDialog.cpp
index f4284e1..82a0fc8 100644
--- a/src/core-impl/collections/spotifycollection/SpotifySettings.cpp
+++ b/src/core-impl/collections/spotifycollection/SpotifySettingsDialog.cpp
@@ -15,9 +15,10 @@
****************************************************************************************/
#define DEBUG_PREFIX "SpotifySettings"
-#include "SpotifySettings.h"
+#include "SpotifySettingsDialog.h"
-#include "ui_SpotifyConfigWidget.h"
+#include "ui_SpotifySettingsWidget.h"
+#include "ui_SpotifyDownloadDialog.h"
#include "core/support/Debug.h"
#include "network/NetworkAccessManagerProxy.h"
@@ -32,7 +33,7 @@
#include <QScopedPointer>
#include <QtGlobal>
-SpotifySettings::SpotifySettings( QWidget* parent, const QVariantList& args )
+SpotifySettingsDialog::SpotifySettingsDialog( QWidget* parent, const QVariantList& \
args ) : KDialog( parent )
, m_downloadReply( 0 )
{
@@ -46,12 +47,9 @@ SpotifySettings::SpotifySettings( QWidget* parent, const \
QVariantList& args )
setButtons( KDialog::Ok | KDialog::Cancel | KDialog::Apply | KDialog::Default );
enableButtonApply( false );
- QWidget* w = new QWidget;
- m_configWidget = new Ui::SpotifyConfigWidget;
- m_configWidget->setupUi( w );
-
- m_configWidget->progDownload->hide();
-
+ QWidget *w = new QWidget(this);
+ m_settingsWidget = new Ui::SpotifySettingsWidget;
+ m_settingsWidget->setupUi( w );
setMainWidget( w );
connect( this, SIGNAL( okClicked() ),
@@ -63,11 +61,11 @@ SpotifySettings::SpotifySettings( QWidget* parent, const \
QVariantList& args ) connect( this, SIGNAL( defaultClicked() ),
this, SLOT( defaults() ) );
- connect( m_configWidget->lineUsername, SIGNAL( textChanged( const QString& ) ),
+ connect( m_settingsWidget->lineUsername, SIGNAL( textChanged( const QString& ) \
), this, SLOT( slotSettingsChanged() ) );
- connect( m_configWidget->linePassword, SIGNAL( textChanged( const QString& ) ),
+ connect( m_settingsWidget->linePassword, SIGNAL( textChanged( const QString& ) \
), this, SLOT( slotSettingsChanged() ) );
- connect( m_configWidget->checkHighQuality, SIGNAL( clicked() ),
+ connect( m_settingsWidget->checkHighQuality, SIGNAL( clicked() ),
this, SLOT( slotSettingsChanged() ) );
connect( this, SIGNAL( changed( bool ) ), this, SLOT( enableButtonApply( bool ) \
) ); @@ -105,42 +103,42 @@ SpotifySettings::SpotifySettings( QWidget* parent, const \
QVariantList& args ) }
}
-SpotifySettings::~SpotifySettings()
+SpotifySettingsDialog::~SpotifySettingsDialog()
{
- delete m_configWidget;
+ delete m_settingsWidget;
}
void
-SpotifySettings::load()
+SpotifySettingsDialog::load()
{
DEBUG_BLOCK
m_config.load();
- m_configWidget->lineUsername->setText( m_config.username() );
- m_configWidget->linePassword->setText( m_config.password() );
- m_configWidget->checkHighQuality->setChecked( m_config.highQuality() );
+ m_settingsWidget->lineUsername->setText( m_config.username() );
+ m_settingsWidget->linePassword->setText( m_config.password() );
+ m_settingsWidget->checkHighQuality->setChecked( m_config.highQuality() );
}
void
-SpotifySettings::save()
+SpotifySettingsDialog::save()
{
DEBUG_BLOCK
- m_config.setUsername( m_configWidget->lineUsername->text() );
- m_config.setPassword( m_configWidget->linePassword->text() );
- m_config.setHighQuality( m_configWidget->checkHighQuality->isChecked() );
+ m_config.setUsername( m_settingsWidget->lineUsername->text() );
+ m_config.setPassword( m_settingsWidget->linePassword->text() );
+ m_config.setHighQuality( m_settingsWidget->checkHighQuality->isChecked() );
m_config.save();
}
void
-SpotifySettings::defaults()
+SpotifySettingsDialog::defaults()
{
m_config.reset();
- m_configWidget->lineUsername->setText( m_config.username() );
- m_configWidget->linePassword->setText( m_config.password() );
- m_configWidget->checkHighQuality->setChecked( m_config.highQuality() );
+ m_settingsWidget->lineUsername->setText( m_config.username() );
+ m_settingsWidget->linePassword->setText( m_config.password() );
+ m_settingsWidget->checkHighQuality->setChecked( m_config.highQuality() );
}
void
-SpotifySettings::slotTryLogin()
+SpotifySettingsDialog::slotTryLogin()
{
DEBUG_BLOCK
Spotify::Controller* controller = The::SpotifyController();
@@ -153,14 +151,14 @@ SpotifySettings::slotTryLogin()
controller->start();
}
- controller->login( m_configWidget->lineUsername->text(),
- m_configWidget->linePassword->text(),
- m_configWidget->checkHighQuality->isChecked() );
+ controller->login( m_settingsWidget->lineUsername->text(),
+ m_settingsWidget->linePassword->text(),
+ m_settingsWidget->checkHighQuality->isChecked() );
save();
}
void
-SpotifySettings::tryDownloadResolver()
+SpotifySettingsDialog::tryDownloadResolver()
{
DEBUG_BLOCK
@@ -181,16 +179,11 @@ SpotifySettings::tryDownloadResolver()
connect( reply, SIGNAL( finished() ),
this, SLOT( slotDownloadFinished() ) );
- //TODO: move the progress bar to the dialog requesting download
- // Show progress bar
- m_configWidget->progDownload->setMinimum( 0 );
- m_configWidget->progDownload->setMaximum( 1000 );
- m_configWidget->progDownload->setValue( 0 );
- m_configWidget->progDownload->show();
-
- // Hide settings
- m_configWidget->frameMain->hide();
- m_configWidget->lblNote->hide();
+ //set-up progress bar
+ m_downloadDialog->progDownload->setMinimum( 0 );
+ m_downloadDialog->progDownload->setMaximum( 1000 );
+ m_downloadDialog->progDownload->setValue( 0 );
+ m_downloadDialog->progDownload->show();
enableButtonApply( false );
enableButtonOk( false );
@@ -198,7 +191,7 @@ SpotifySettings::tryDownloadResolver()
}
void
-SpotifySettings::slotDownloadError( QNetworkReply::NetworkError error )
+SpotifySettingsDialog::slotDownloadError( QNetworkReply::NetworkError error )
{
Q_UNUSED( error )
@@ -208,15 +201,15 @@ SpotifySettings::slotDownloadError( QNetworkReply::NetworkError \
error ) }
void
-SpotifySettings::slotDownloadProgress( qint64 current, qint64 total )
+SpotifySettingsDialog::slotDownloadProgress( qint64 current, qint64 total )
{
- int value = (double)current/total * m_configWidget->progDownload->maximum();
+ int value = (double)current/total * m_downloadDialog->progDownload->maximum();
- m_configWidget->progDownload->setValue( value );
+ m_downloadDialog->progDownload->setValue( value );
}
void
-SpotifySettings::slotDownloadFinished()
+SpotifySettingsDialog::slotDownloadFinished()
{
DEBUG_BLOCK
@@ -234,7 +227,7 @@ SpotifySettings::slotDownloadFinished()
debug() << "Download finished.";
- m_configWidget->progDownload->hide();
+ m_downloadDialog->progDownload->hide();
QByteArray data( m_downloadReply->readAll() );
QScopedPointer<QBuffer> data_buffer(new QBuffer(&data));
@@ -266,9 +259,9 @@ SpotifySettings::slotDownloadFinished()
controller->reload();
// Restore widgets
- m_configWidget->progDownload->hide();
- m_configWidget->frameMain->show();
- m_configWidget->lblNote->show();
+ m_downloadDialog->progDownload->hide();
+ m_settingsWidget->frameMain->show();
+ m_settingsWidget->lblNote->show();
enableButtonOk( true );
enableButton( Default, true );
@@ -277,13 +270,13 @@ SpotifySettings::slotDownloadFinished()
}
void
-SpotifySettings::slotSettingsChanged()
+SpotifySettingsDialog::slotSettingsChanged()
{
emit changed( true );
}
void
-SpotifySettings::slotCancel()
+SpotifySettingsDialog::slotCancel()
{
close();
@@ -292,5 +285,3 @@ SpotifySettings::slotCancel()
deleteLater();
}
-
-#include "SpotifySettings.moc"
diff --git a/src/core-impl/collections/spotifycollection/SpotifySettings.h \
b/src/core-impl/collections/spotifycollection/SpotifySettingsDialog.h similarity \
index 84% rename from src/core-impl/collections/spotifycollection/SpotifySettings.h
rename to src/core-impl/collections/spotifycollection/SpotifySettingsDialog.h
index a4e9db1..b0491e7 100644
--- a/src/core-impl/collections/spotifycollection/SpotifySettings.h
+++ b/src/core-impl/collections/spotifycollection/SpotifySettingsDialog.h
@@ -22,15 +22,18 @@
#include <QNetworkReply>
-namespace Ui { class SpotifyConfigWidget; }
+namespace Ui {
+ class SpotifySettingsWidget;
+ class SpotifyDownloadDialog;
+}
-class SpotifySettings: public KDialog
+class SpotifySettingsDialog: public KDialog
{
Q_OBJECT
public:
- explicit SpotifySettings( QWidget *parent = 0, const QVariantList &args = \
QVariantList() );
- virtual ~SpotifySettings();
+ explicit SpotifySettingsDialog( QWidget *parent = 0, const QVariantList &args = \
QVariantList() ); + virtual ~SpotifySettingsDialog();
signals:
void changed( bool );
@@ -50,7 +53,8 @@ private Q_SLOTS:
private:
void tryDownloadResolver();
- Ui::SpotifyConfigWidget *m_configWidget;
+ Ui::SpotifySettingsWidget *m_settingsWidget;
+ Ui::SpotifyDownloadDialog *m_downloadDialog;
SpotifyConfig m_config;
QNetworkReply* m_downloadReply;
};
diff --git a/src/core-impl/collections/spotifycollection/SpotifyConfigWidget.ui \
b/src/core-impl/collections/spotifycollection/SpotifySettingsWidget.ui similarity \
index 95% rename from \
src/core-impl/collections/spotifycollection/SpotifyConfigWidget.ui rename to \
src/core-impl/collections/spotifycollection/SpotifySettingsWidget.ui index \
cc6aeb9..167c233 100644
--- a/src/core-impl/collections/spotifycollection/SpotifyConfigWidget.ui
+++ b/src/core-impl/collections/spotifycollection/SpotifySettingsWidget.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>SpotifyConfigWidget</class>
- <widget class="QWidget" name="SpotifyConfigWidget">
+ <class>SpotifySettingsWidget</class>
+ <widget class="QWidget" name="SpotifySettingsWidget">
<property name="geometry">
<rect>
<x>0</x>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic