mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-08-05 13:47:26 +02:00
Use regular QDialog on OSX.
This commit is contained in:
@@ -465,7 +465,7 @@ IF( APPLE )
|
|||||||
list(APPEND libSources
|
list(APPEND libSources
|
||||||
thirdparty/Qocoa/qbutton_mac.mm
|
thirdparty/Qocoa/qbutton_mac.mm
|
||||||
thirdparty/Qocoa/qsearchfield_mac.mm
|
thirdparty/Qocoa/qsearchfield_mac.mm
|
||||||
thirdparty/Qocoa/qtoolbartabdialog_mac.mm
|
thirdparty/Qocoa/qtoolbartabdialog.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
SET_SOURCE_FILES_PROPERTIES(utils/TomahawkUtils_Mac.mm PROPERTIES COMPILE_FLAGS "-fvisibility=default")
|
SET_SOURCE_FILES_PROPERTIES(utils/TomahawkUtils_Mac.mm PROPERTIES COMPILE_FLAGS "-fvisibility=default")
|
||||||
|
@@ -31,6 +31,8 @@
|
|||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
#include <QPointer>
|
#include <QPointer>
|
||||||
|
|
||||||
|
#include "utils/TomahawkUtilsGui.h"
|
||||||
|
|
||||||
class QToolbarTabDialogPrivate : public QObject {
|
class QToolbarTabDialogPrivate : public QObject {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
@@ -85,14 +87,16 @@ QToolbarTabDialog::QToolbarTabDialog() :
|
|||||||
QObject(0),
|
QObject(0),
|
||||||
pimpl(new QToolbarTabDialogPrivate(this))
|
pimpl(new QToolbarTabDialogPrivate(this))
|
||||||
{
|
{
|
||||||
pimpl->dialog = new QDialog;
|
pimpl->dialog = new QDialog();
|
||||||
|
#ifndef Q_OS_MAC
|
||||||
pimpl->dialog.data()->setModal(true);
|
pimpl->dialog.data()->setModal(true);
|
||||||
|
#endif
|
||||||
|
|
||||||
pimpl->toolbar = new QToolBar(pimpl->dialog.data());
|
pimpl->toolbar = new QToolBar(pimpl->dialog.data());
|
||||||
pimpl->toolbar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
|
pimpl->toolbar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
|
||||||
#ifdef Q_OS_WIN
|
//#ifdef Q_OS_WIN
|
||||||
pimpl->toolbar->setStyleSheet( "QToolBar { border: 0px; }" );
|
pimpl->toolbar->setStyleSheet( "QToolBar { border: 0px; }" );
|
||||||
#endif
|
//#endif
|
||||||
|
|
||||||
pimpl->stack = new QStackedWidget(pimpl->dialog.data());
|
pimpl->stack = new QStackedWidget(pimpl->dialog.data());
|
||||||
|
|
||||||
@@ -120,7 +124,11 @@ QToolbarTabDialog::QToolbarTabDialog() :
|
|||||||
pimpl->rightSpacer = pimpl->toolbar->addWidget(rightSpacer);
|
pimpl->rightSpacer = pimpl->toolbar->addWidget(rightSpacer);
|
||||||
|
|
||||||
pimpl->layout = new QVBoxLayout;
|
pimpl->layout = new QVBoxLayout;
|
||||||
|
|
||||||
pimpl->layout->setContentsMargins( 4, 4, 4, 4 );
|
pimpl->layout->setContentsMargins( 4, 4, 4, 4 );
|
||||||
|
#ifdef Q_OS_MAC
|
||||||
|
TomahawkUtils::unmarginLayout( pimpl->layout );
|
||||||
|
#endif
|
||||||
pimpl->layout->addWidget(pimpl->toolbar);
|
pimpl->layout->addWidget(pimpl->toolbar);
|
||||||
pimpl->layout->addWidget(pimpl->separator);
|
pimpl->layout->addWidget(pimpl->separator);
|
||||||
pimpl->layout->addWidget(pimpl->stack);
|
pimpl->layout->addWidget(pimpl->stack);
|
||||||
|
Reference in New Issue
Block a user