mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-03-18 23:09:42 +01:00
Fix Add Account button in factory config on OSX, and a few other osx tweaks
This commit is contained in:
parent
01fbbb6683
commit
27cde20dbf
@ -141,7 +141,6 @@ AccountFactoryWrapper::buttonClicked( QAbstractButton* button )
|
||||
{
|
||||
m_createAccount = true;
|
||||
emit createAccount( m_factory );
|
||||
// accept();
|
||||
return;
|
||||
}
|
||||
else
|
||||
|
@ -7,13 +7,16 @@
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>400</width>
|
||||
<height>178</height>
|
||||
<height>220</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Form</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<property name="margin">
|
||||
<number>4</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
|
@ -437,6 +437,13 @@ SettingsDialog::openAccountFactoryConfig( AccountFactory* factory )
|
||||
void
|
||||
SettingsDialog::createAccountFromFactory( AccountFactory* factory )
|
||||
{
|
||||
#ifdef Q_WS_MAC
|
||||
// On mac we need to close the dialog we came from before showing another dialog
|
||||
Q_ASSERT( sender() && qobject_cast< AccountFactoryWrapper* >( sender() ) );
|
||||
AccountFactoryWrapper* dialog = qobject_cast< AccountFactoryWrapper* >( sender() );
|
||||
dialog->accept();
|
||||
#endif
|
||||
|
||||
//if exited with OK, create it, if not, delete it immediately!
|
||||
Account* account = factory->createAccount();
|
||||
bool added = false;
|
||||
|
Loading…
x
Reference in New Issue
Block a user