diff --git a/src/GetNewStuffDialog.cpp b/src/GetNewStuffDialog.cpp index 3a5997b26..da3f0891f 100644 --- a/src/GetNewStuffDialog.cpp +++ b/src/GetNewStuffDialog.cpp @@ -22,7 +22,7 @@ #include "GetNewStuffDelegate.h" #include "GetNewStuffModel.h" -GetNewStuffDialog::GetNewStuffDialog( QWidget *parent, Qt::WindowFlags f ) +GetNewStuffDialog::GetNewStuffDialog( QWidget* parent, Qt::WindowFlags f ) : QDialog( parent, f ) , ui( new Ui::GetNewStuffDialog ) , m_model( new GetNewStuffModel( this ) ) @@ -37,16 +37,17 @@ GetNewStuffDialog::GetNewStuffDialog( QWidget *parent, Qt::WindowFlags f ) ui->listView->setMouseTracking( true ); + setMinimumSize( 560, 350 ); + #ifdef Q_WS_MAC - setMinimumSize( 510, 350 ); - setMaximumSize( 510, 350 ); + setMaximumSize( 560, 350 ); setSizeGripEnabled( false ); ui->listView->setAttribute( Qt::WA_MacShowFocusRect, false ); #endif - } + GetNewStuffDialog::~GetNewStuffDialog() { delete ui; diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp index 2591cae71..891620857 100644 --- a/src/settingsdialog.cpp +++ b/src/settingsdialog.cpp @@ -473,6 +473,7 @@ SettingsDialog::onLastFmFinished() #endif } + void SettingsDialog::addScriptResolver() { @@ -501,13 +502,13 @@ SettingsDialog::removeScriptResolver() } } + void SettingsDialog::getMoreResolvers() { #if defined(Q_WS_MAC) && defined(LIBATTICA_FOUND) GetNewStuffDialog* diag = new GetNewStuffDialog( this, Qt::Sheet ); - connect( diag, SIGNAL( finished( int ) ), this, SLOT( getMoreResolversFinished(int))); - + connect( diag, SIGNAL( finished( int ) ), this, SLOT( getMoreResolversFinished( int ) ) ); diag->show(); #elif defined(LIBATTICA_FOUND) GetNewStuffDialog diag( this ); @@ -517,6 +518,7 @@ SettingsDialog::getMoreResolvers() } + #ifdef LIBATTICA_FOUND void SettingsDialog::atticaResolverInstalled( const QString& resolverId ) @@ -524,6 +526,7 @@ SettingsDialog::atticaResolverInstalled( const QString& resolverId ) m_resolversModel->atticaResolverInstalled( resolverId ); } + void SettingsDialog::atticaResolverUninstalled ( const QString& resolverId ) { @@ -531,6 +534,7 @@ SettingsDialog::atticaResolverUninstalled ( const QString& resolverId ) } #endif + void SettingsDialog::scriptSelectionChanged() { @@ -544,6 +548,7 @@ SettingsDialog::scriptSelectionChanged() } } + void SettingsDialog::getMoreResolversFinished( int ret ) { @@ -574,7 +579,6 @@ SettingsDialog::openResolverConfig( const QString& resolver ) dialog->show(); #endif - } } @@ -695,7 +699,8 @@ SettingsDialog::sipFactoryClicked( SipPluginFactory* factory ) handleSipPluginAdded( p, added ); #endif - } else + } + else { // no config, so just add it added = true;