1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-09 23:57:34 +02:00

Show inline error instead of error popup

This commit is contained in:
Dominik Schmidt
2014-12-10 21:37:13 +01:00
parent 132c7d4cd2
commit d5c5eb1e44
2 changed files with 12 additions and 1 deletions

View File

@@ -22,6 +22,7 @@
#include "../utils/Logger.h"
#include <QMessageBox>
#include <QLabel>
DelegateConfigWrapper::DelegateConfigWrapper( Tomahawk::Accounts::Account* account, QWidget* parent, Qt::WindowFlags flags )
@@ -32,6 +33,7 @@ DelegateConfigWrapper::DelegateConfigWrapper( Tomahawk::Accounts::Account* accou
, m_buttons( nullptr )
, m_okButton( nullptr )
, m_deleteButton( nullptr )
, m_errorLabel( new QLabel( this ) )
, m_deleted( false )
{
setWindowTitle( tr("%1 Config" ).arg( account->accountFriendlyName() ) );
@@ -65,6 +67,9 @@ DelegateConfigWrapper::DelegateConfigWrapper( Tomahawk::Accounts::Account* accou
else if ( m_widget )
h->setContentsMargins( m_widget->contentsMargins() );
m_errorLabel->setAlignment( Qt::AlignCenter );
v->addWidget( m_errorLabel );
v->addLayout( h );
setLayout( v );
@@ -119,6 +124,7 @@ DelegateConfigWrapper::closed( QAbstractButton* b )
return;
}
m_errorLabel->setText( "" );
m_account->testConfig();
}
else if ( b == m_deleteButton )
@@ -182,12 +188,13 @@ DelegateConfigWrapper::onConfigTestResult( Tomahawk::Accounts::ConfigTestResultT
if( result == Tomahawk::Accounts::ConfigTestResultSuccess )
{
m_errorLabel->setText( "" );
closeDialog( QDialog::Accepted );
}
else
{
// TODO: make this nicer
QMessageBox::critical( this, tr( "Error" ), tr( "Your config is invalid and can't be saved." ) );
m_errorLabel->setText( QString( "<font color='red'>%1</font>" ).arg( tr( "Your config is invalid." ) ) );
}
}

View File

@@ -26,8 +26,11 @@
#include <QPushButton>
#include <QDebug>
class AccountConfigWidget;
class QLabel;
class DelegateConfigWrapper : public QDialog
{
Q_OBJECT
@@ -64,6 +67,7 @@ private:
QWidget* m_aboutW;
QDialogButtonBox* m_buttons;
QPushButton *m_okButton, *m_deleteButton;
QLabel* m_errorLabel;
bool m_deleted;
};