| @@ -36,6 +36,7 @@ rm -rf ./data/macos/Carla | |||||
| cp ./source/carla ./source/carla.pyw | cp ./source/carla ./source/carla.pyw | ||||
| # python3 ./data/macos/bundle.py bdist_mac --bundle-name=Carla | # python3 ./data/macos/bundle.py bdist_mac --bundle-name=Carla | ||||
| $CXFREEZE --include-modules=re,sip,subprocess,inspect --target-dir=./data/macos/Carla ./source/carla.pyw | $CXFREEZE --include-modules=re,sip,subprocess,inspect --target-dir=./data/macos/Carla ./source/carla.pyw | ||||
| rm -rf ./data/macos/Carla/imageformats/ | |||||
| rm ./source/carla.pyw | rm ./source/carla.pyw | ||||
| cd data/macos | cd data/macos | ||||
| @@ -193,7 +193,7 @@ class CarlaMultiW(QTabWidget): | |||||
| def paintEvent(self, event): | def paintEvent(self, event): | ||||
| QTabWidget.paintEvent(self, event) | QTabWidget.paintEvent(self, event) | ||||
| if not self.fUseCustomPaint: | |||||
| if MACOS or not self.fUseCustomPaint: | |||||
| return | return | ||||
| painter = QPainter(self) | painter = QPainter(self) | ||||
| @@ -230,7 +230,7 @@ class CarlaHostW(HostWindow): | |||||
| self.fInfoLabel.setAlignment(Qt.AlignRight|Qt.AlignVCenter) | self.fInfoLabel.setAlignment(Qt.AlignRight|Qt.AlignVCenter) | ||||
| self.fInfoLabel.setText("Engine stopped") | self.fInfoLabel.setText("Engine stopped") | ||||
| if MACOS and False: # TODO: check if NOT using pro theme | |||||
| if MACOS: # TODO: check if NOT using pro theme | |||||
| self.fInfoLabel.hide() | self.fInfoLabel.hide() | ||||
| self.setUnifiedTitleAndToolBarOnMac(True) | self.setUnifiedTitleAndToolBarOnMac(True) | ||||
| @@ -284,7 +284,7 @@ class CarlaSettingsW(QDialog): | |||||
| if gCarla.isPlugin: | if gCarla.isPlugin: | ||||
| self.ui.lw_page.hideRow(self.TAB_INDEX_PATHS) | self.ui.lw_page.hideRow(self.TAB_INDEX_PATHS) | ||||
| if WINDOWS: | |||||
| if WINDOWS or MACOS: | |||||
| self.ui.group_main_theme.setEnabled(False) | self.ui.group_main_theme.setEnabled(False) | ||||
| self.ui.ch_main_theme_pro.setChecked(False) | self.ui.ch_main_theme_pro.setChecked(False) | ||||
| @@ -445,6 +445,9 @@ class AbstractPluginSlot(QFrame): | |||||
| #------------------------------------------------------------------ | #------------------------------------------------------------------ | ||||
| def drawOutline(self): | def drawOutline(self): | ||||
| # FIXME - broken in Qt4 | |||||
| if MACOS: return | |||||
| painter = QPainter(self) | painter = QPainter(self) | ||||
| if self.fIsSelected: | if self.fIsSelected: | ||||
| @@ -67,7 +67,7 @@ class CarlaApplication(object): | |||||
| settings = QSettings("falkTX", appName) | settings = QSettings("falkTX", appName) | ||||
| useProTheme = settings.value(CARLA_KEY_MAIN_USE_PRO_THEME, True, type=bool) | useProTheme = settings.value(CARLA_KEY_MAIN_USE_PRO_THEME, True, type=bool) | ||||
| if WINDOWS or not useProTheme: | |||||
| if WINDOWS or MACOS or not useProTheme: | |||||
| self._createApp(appName) | self._createApp(appName) | ||||
| return | return | ||||