From 23d14bd4764c0e4ff55e7c96dcb40cc64153a8aa Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Fri, 10 Feb 2012 17:22:59 -0500 Subject: [PATCH] bit of osx tweaks --- src/AccountFactoryWrapper.cpp | 11 ++++++++--- src/settingsdialog.cpp | 3 --- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/AccountFactoryWrapper.cpp b/src/AccountFactoryWrapper.cpp index 86e824512..ce0b3de55 100644 --- a/src/AccountFactoryWrapper.cpp +++ b/src/AccountFactoryWrapper.cpp @@ -48,10 +48,10 @@ AccountFactoryWrapper::AccountFactoryWrapper( AccountFactory* factory, QWidget* load(); - connect( m_ui->buttonBox, SIGNAL( rejected() ), this, SLOT( reject() ) ); connect( m_ui->buttonBox, SIGNAL( accepted() ), this, SLOT( accept() ) ); - connect( m_ui->buttonBox, SIGNAL( clicked( QAbstractButton*) ), this, SLOT( buttonClicked() ) ); + connect( m_ui->buttonBox, SIGNAL( clicked( QAbstractButton*) ), this, SLOT( buttonClicked( QAbstractButton* ) ) ); + #ifdef Q_OS_MAC setContentsMargins( 0, 0, 0, 0 ); m_ui->verticalLayout->setSpacing( 4 ); @@ -70,8 +70,13 @@ AccountFactoryWrapper::load() item->setData( 0, AccountRole, QVariant::fromValue< QObject *>( acc ) ); } } +#ifndef Q_OS_MAC + const int padding = 7; +#else + const int padding = 8; +#endif + const int height = m_ui->accountsList->model()->rowCount( QModelIndex() ) * ACCOUNT_ROW_HEIGHT + padding; - const int height = m_ui->accountsList->model()->rowCount( QModelIndex() ) * ACCOUNT_ROW_HEIGHT + 7; m_ui->accountsList->setFixedHeight( height ); } diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp index 1e089eac4..545e4ca00 100644 --- a/src/settingsdialog.cpp +++ b/src/settingsdialog.cpp @@ -119,9 +119,6 @@ SettingsDialog::SettingsDialog( QWidget *parent ) connect( m_accountModel, SIGNAL( createAccount( Tomahawk::Accounts::AccountFactory* ) ), this, SLOT( createAccountFromFactory( Tomahawk::Accounts::AccountFactory* ) ) ); - connect( AtticaManager::instance(), SIGNAL( resolverInstalled( QString ) ), this, SLOT( accountAdded( Tomahawk::Accounts::Account* ) ) ); - connect( AtticaManager::instance(), SIGNAL( resolverUninstalled( QString ) ), this, SLOT( accountUninstalled( QString ) ) ); - connect( ui->accountsView->selectionModel(), SIGNAL( selectionChanged( QItemSelection,QItemSelection ) ), this, SLOT( accountsSelectionChanged() ) ); if ( !Servent::instance()->isReady() )