From 2307b7a40a411ef2b0ba41aa1e90f84498156f6f Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Sun, 29 Jul 2012 00:10:18 +0000 Subject: [PATCH] fixed: removed use of missing controls on mac and made window bigger (to make room for new controls) --- src/gui/src/MainWindow.cpp | 6 ++++++ src/gui/src/SetupWizard.cpp | 7 ------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp index 716925e6..ba05f2e6 100644 --- a/src/gui/src/MainWindow.cpp +++ b/src/gui/src/MainWindow.cpp @@ -92,6 +92,12 @@ MainWindow::MainWindow(QSettings& settings, AppConfig& appConfig) : // elevate checkbox is only useful on ms windows. m_pElevateCheckBox->hide(); #endif + +#if defined(Q_OS_MAC) + // fonts on mac are bigger, so window needs to be bigger. + resize(720, 550); + setMinimumSize(size()); +#endif } MainWindow::~MainWindow() diff --git a/src/gui/src/SetupWizard.cpp b/src/gui/src/SetupWizard.cpp index 6c33f97c..5e8e7d05 100644 --- a/src/gui/src/SetupWizard.cpp +++ b/src/gui/src/SetupWizard.cpp @@ -28,13 +28,6 @@ SetupWizard::SetupWizard(MainWindow& mainWindow, bool startMain) : #endif -#if !defined(Q_OS_WIN) - m_pServiceRadioButton->setEnabled(false); - m_pServiceRadioButton->setText(tr("Service (Windows only)")); - m_pServiceLabel->setEnabled(false); - m_pDesktopRadioButton->setChecked(true); -#endif - connect(this, SIGNAL(finished(int)), this, SLOT(handlefinished())); connect(m_pServerRadioButton, SIGNAL(toggled(bool)), m_MainWindow.m_pGroupServer, SLOT(setChecked(bool))); connect(m_pClientRadioButton, SIGNAL(toggled(bool)), m_MainWindow.m_pGroupClient, SLOT(setChecked(bool)));