dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix macos build

Browse Source
This commit is contained in:
Jonas Kvinge
2018-07-01 22:26:46 +02:00
parent c4e75dea65
commit ada7325a04
51 changed files with 453 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/settings/behavioursettingspage.cpp
View File

@@ -43,9 +43,9 @@ BehaviourSettingsPage::BehaviourSettingsPage(SettingsDialog *dialog) : SettingsP
connect(ui_->checkbox_showtrayicon, SIGNAL(toggled(bool)), SLOT(ShowTrayIconToggled(bool)));
#ifdef Q_OS_DARWIN
#ifdef Q_OS_MACOS
ui_->checkbox_showtrayicon->setEnabled(false);
ui_->startup_group->setEnabled(false);
ui_->groupbox_startup->setEnabled(false);
#endif
}

6
src/settings/behavioursettingspage.ui
View File

@@ -52,7 +52,7 @@
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupbox_startupgroup">
<widget class="QGroupBox" name="groupbox_startup">
<property name="title">
<string>When Strawberry starts</string>
</property>
@@ -60,14 +60,14 @@
<item>
<widget class="QRadioButton" name="radiobutton_alwaysshow">
<property name="text">
<string>Always show the main window</string>
<string>Always show the &amp;main window</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radiobutton_alwayshide">
<property name="text">
<string>Always hide the main window</string>
<string>Alwa&amp;ys hide the main window</string>
</property>
</widget>
</item>

4
src/settings/notificationssettingspage.cpp
View File

@@ -175,7 +175,7 @@ void NotificationsSettingsPage::Load() {
ui_->notifications_custom_text2->setText(s.value("CustomText2").toString());
s.endGroup();
#ifdef Q_OS_DARWIN
#ifdef Q_OS_MACOS
ui_->notifications_options->setEnabled(ui_->notifications_pretty->isChecked());
#endif
@@ -339,7 +339,7 @@ void NotificationsSettingsPage::NotificationTypeChanged() {
ui_->notifications_pretty_group->setEnabled(pretty);
ui_->notifications_custom_text_group->setEnabled(enabled);
#ifdef Q_OS_DARWIN
#ifdef Q_OS_MACOS
ui_->notifications_options->setEnabled(pretty);
#endif
ui_->notifications_duration->setEnabled(!pretty || (pretty && !ui_->notifications_disable_duration->isChecked()));

5
src/settings/shortcutssettingspage.cpp
View File

@@ -38,6 +38,7 @@
#include <QRadioButton>
#include "core/iconloader.h"
#include "core/utilities.h"
#include "globalshortcuts/globalshortcutgrabber.h"
#include "globalshortcuts/globalshortcuts.h"
#include "settingspage.h"
@@ -119,11 +120,11 @@ void GlobalShortcutsSettingsPage::Load() {
}
ui_->mac_container->setVisible(!manager->IsMacAccessibilityEnabled());
#ifdef Q_OS_DARWIN
#ifdef Q_OS_MACOS
qint32 mac_version = Utilities::GetMacVersion();
ui_->mac_label->setVisible(mac_version < 9);
ui_->mac_label_mavericks->setVisible(mac_version >= 9);
#endif // Q_OS_DARWIN
#endif // Q_OS_MACOS
}