diff --git a/app/config.py b/app/config.py index 68c5600..1b21e0e 100644 --- a/app/config.py +++ b/app/config.py @@ -11,6 +11,7 @@ class Config(object): CHECK_AUDACITY_AT_STARTUP = True CART_DIRECTORY = "/home/kae/radio/CartTracks" CARTS_COUNT = 10 + CARTS_HIDE = True COLOUR_BITRATE_LOW = "#ffcdd2" COLOUR_BITRATE_MEDIUM = "#ffeb6f" COLOUR_BITRATE_OK = "#dcedc8" diff --git a/app/musicmuster.py b/app/musicmuster.py index be9c659..33c1596 100755 --- a/app/musicmuster.py +++ b/app/musicmuster.py @@ -161,7 +161,11 @@ class Window(QMainWindow, Ui_MainWindow): self.tabPlaylist.currentWidget self.load_last_playlists() - self.carts_init() + if Config.CARTS_HIDE: + self.cartsWidget.hide() + self.frame_6.hide() + else: + self.carts_init() self.enable_play_next_controls() self.timer.start(Config.TIMER_MS) self.connect_signals_slots() diff --git a/app/ui/main_window.ui b/app/ui/main_window.ui index 2c16b51..95f8f7d 100644 --- a/app/ui/main_window.ui +++ b/app/ui/main_window.ui @@ -290,23 +290,6 @@ padding-left: 8px; - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - @@ -813,6 +796,25 @@ padding-left: 8px; + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + diff --git a/app/ui/main_window_ui.py b/app/ui/main_window_ui.py index 1fd1882..8aee7f3 100644 --- a/app/ui/main_window_ui.py +++ b/app/ui/main_window_ui.py @@ -158,11 +158,6 @@ class Ui_MainWindow(object): self.frame_4.setFrameShadow(QtWidgets.QFrame.Raised) self.frame_4.setObjectName("frame_4") self.gridLayout_4.addWidget(self.frame_4, 1, 0, 1, 1) - self.horizontalLayout_Carts = QtWidgets.QHBoxLayout() - self.horizontalLayout_Carts.setObjectName("horizontalLayout_Carts") - spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.horizontalLayout_Carts.addItem(spacerItem) - self.gridLayout_4.addLayout(self.horizontalLayout_Carts, 2, 0, 1, 1) self.frame_6 = QtWidgets.QFrame(self.centralwidget) self.frame_6.setMinimumSize(QtCore.QSize(0, 16)) self.frame_6.setAutoFillBackground(False) @@ -377,6 +372,13 @@ class Ui_MainWindow(object): self.horizontalLayout.addWidget(self.frame_3) self.horizontalLayout_2.addLayout(self.horizontalLayout) self.gridLayout_4.addWidget(self.frame_5, 5, 0, 1, 1) + self.cartsWidget = QtWidgets.QWidget(self.centralwidget) + self.cartsWidget.setObjectName("cartsWidget") + self.horizontalLayout_Carts = QtWidgets.QHBoxLayout(self.cartsWidget) + self.horizontalLayout_Carts.setObjectName("horizontalLayout_Carts") + spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.horizontalLayout_Carts.addItem(spacerItem) + self.gridLayout_4.addWidget(self.cartsWidget, 2, 0, 1, 1) MainWindow.setCentralWidget(self.centralwidget) self.menubar = QtWidgets.QMenuBar(MainWindow) self.menubar.setGeometry(QtCore.QRect(0, 0, 1280, 26))