Compare commits

..

2 Commits

Author SHA1 Message Date
Keith Edmunds
632e555bed Make clock bar darker 2022-09-19 15:54:36 +01:00
Keith Edmunds
c63bbcd574 Set environment variables for changed database names 2022-09-18 19:41:55 +01:00
3 changed files with 454 additions and 420 deletions

7
.envrc
View File

@ -3,7 +3,10 @@ branch=$(git branch --show-current)
if on_git_branch master; then
export MM_ENV="PRODUCTION"
export MM_DB="mysql+mysqldb://musicmuster:musicmuster@localhost/musicmuster_prod"
else MYSQL_DATABASE="musicmuster_dev"
elif on_git_branch carts; then
export MM_ENV="DEVELOPMENT"
export MM_DB="mysql+mysqldb://musicmusterv3:musicmusterv3@localhost/musicmuster_dev_v3"
export MM_DB="mysql+mysqldb://dev_musicmuster:dev_musicmuster@localhost/dev_musicmuster_carts"
else
export MM_ENV="DEVELOPMENT"
export MM_DB="mysql+mysqldb://dev_musicmuster:dev_musicmuster@localhost/dev_musicmuster"
fi

View File

@ -305,6 +305,18 @@ text-align: left;</string>
</widget>
</item>
<item row="3" column="0">
<widget class="QFrame" name="frame_5">
<property name="styleSheet">
<string notr="true">background-color: rgb(192, 191, 188)</string>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QFrame" name="frame">
@ -626,9 +638,15 @@ text-align: left;</string>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
<item>
<widget class="QLabel" name="label_6">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>31</width>
<height>19</height>
</rect>
</property>
<property name="text">
<string>End</string>
</property>
@ -636,9 +654,15 @@ text-align: left;</string>
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_end_timer">
<property name="geometry">
<rect>
<x>10</x>
<y>48</y>
<width>132</width>
<height>54</height>
</rect>
</property>
<property name="font">
<font>
<family>FreeSans</family>
@ -654,8 +678,6 @@ text-align: left;</string>
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
@ -730,6 +752,9 @@ text-align: left;</string>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<widget class="QMenuBar" name="menubar">
<property name="geometry">
<rect>

View File

@ -154,9 +154,16 @@ class Ui_MainWindow(object):
self.tabInfolist.setMovable(True)
self.tabInfolist.setObjectName("tabInfolist")
self.gridLayout_4.addWidget(self.splitter, 2, 0, 1, 1)
self.frame_5 = QtWidgets.QFrame(self.centralwidget)
self.frame_5.setStyleSheet("background-color: rgb(192, 191, 188)")
self.frame_5.setFrameShape(QtWidgets.QFrame.StyledPanel)
self.frame_5.setFrameShadow(QtWidgets.QFrame.Raised)
self.frame_5.setObjectName("frame_5")
self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.frame_5)
self.horizontalLayout_2.setObjectName("horizontalLayout_2")
self.horizontalLayout = QtWidgets.QHBoxLayout()
self.horizontalLayout.setObjectName("horizontalLayout")
self.frame = QtWidgets.QFrame(self.centralwidget)
self.frame = QtWidgets.QFrame(self.frame_5)
self.frame.setMinimumSize(QtCore.QSize(321, 0))
self.frame.setFrameShape(QtWidgets.QFrame.StyledPanel)
self.frame.setFrameShadow(QtWidgets.QFrame.Raised)
@ -226,7 +233,7 @@ class Ui_MainWindow(object):
self.btnStop.setObjectName("btnStop")
self.gridLayout.addWidget(self.btnStop, 2, 2, 1, 2)
self.horizontalLayout.addWidget(self.frame)
self.frame_elapsed = QtWidgets.QFrame(self.centralwidget)
self.frame_elapsed = QtWidgets.QFrame(self.frame_5)
self.frame_elapsed.setMinimumSize(QtCore.QSize(0, 112))
self.frame_elapsed.setStyleSheet("")
self.frame_elapsed.setFrameShape(QtWidgets.QFrame.StyledPanel)
@ -249,7 +256,7 @@ class Ui_MainWindow(object):
self.label_elapsed_timer.setObjectName("label_elapsed_timer")
self.verticalLayout_4.addWidget(self.label_elapsed_timer)
self.horizontalLayout.addWidget(self.frame_elapsed)
self.frame_fade = QtWidgets.QFrame(self.centralwidget)
self.frame_fade = QtWidgets.QFrame(self.frame_5)
self.frame_fade.setMinimumSize(QtCore.QSize(0, 112))
self.frame_fade.setStyleSheet("")
self.frame_fade.setFrameShape(QtWidgets.QFrame.StyledPanel)
@ -272,7 +279,7 @@ class Ui_MainWindow(object):
self.label_fade_timer.setObjectName("label_fade_timer")
self.verticalLayout_2.addWidget(self.label_fade_timer)
self.horizontalLayout.addWidget(self.frame_fade)
self.frame_silent = QtWidgets.QFrame(self.centralwidget)
self.frame_silent = QtWidgets.QFrame(self.frame_5)
self.frame_silent.setMinimumSize(QtCore.QSize(0, 112))
self.frame_silent.setStyleSheet("")
self.frame_silent.setFrameShape(QtWidgets.QFrame.StyledPanel)
@ -295,19 +302,18 @@ class Ui_MainWindow(object):
self.label_silent_timer.setObjectName("label_silent_timer")
self.verticalLayout_5.addWidget(self.label_silent_timer)
self.horizontalLayout.addWidget(self.frame_silent)
self.frame_end = QtWidgets.QFrame(self.centralwidget)
self.frame_end = QtWidgets.QFrame(self.frame_5)
self.frame_end.setMinimumSize(QtCore.QSize(0, 112))
self.frame_end.setStyleSheet("")
self.frame_end.setFrameShape(QtWidgets.QFrame.StyledPanel)
self.frame_end.setFrameShadow(QtWidgets.QFrame.Raised)
self.frame_end.setObjectName("frame_end")
self.verticalLayout_6 = QtWidgets.QVBoxLayout(self.frame_end)
self.verticalLayout_6.setObjectName("verticalLayout_6")
self.label_6 = QtWidgets.QLabel(self.frame_end)
self.label_6.setGeometry(QtCore.QRect(10, 10, 31, 19))
self.label_6.setAlignment(QtCore.Qt.AlignCenter)
self.label_6.setObjectName("label_6")
self.verticalLayout_6.addWidget(self.label_6)
self.label_end_timer = QtWidgets.QLabel(self.frame_end)
self.label_end_timer.setGeometry(QtCore.QRect(10, 48, 132, 54))
font = QtGui.QFont()
font.setFamily("FreeSans")
font.setPointSize(40)
@ -316,9 +322,8 @@ class Ui_MainWindow(object):
self.label_end_timer.setFont(font)
self.label_end_timer.setAlignment(QtCore.Qt.AlignCenter)
self.label_end_timer.setObjectName("label_end_timer")
self.verticalLayout_6.addWidget(self.label_end_timer)
self.horizontalLayout.addWidget(self.frame_end)
self.frame_3 = QtWidgets.QFrame(self.centralwidget)
self.frame_3 = QtWidgets.QFrame(self.frame_5)
self.frame_3.setMinimumSize(QtCore.QSize(152, 112))
self.frame_3.setMaximumSize(QtCore.QSize(184, 16777215))
self.frame_3.setFrameShape(QtWidgets.QFrame.StyledPanel)
@ -339,7 +344,8 @@ class Ui_MainWindow(object):
self.btnHidePlayed.setObjectName("btnHidePlayed")
self.gridLayout_3.addWidget(self.btnHidePlayed, 1, 0, 1, 1)
self.horizontalLayout.addWidget(self.frame_3)
self.gridLayout_4.addLayout(self.horizontalLayout, 3, 0, 1, 1)
self.horizontalLayout_2.addLayout(self.horizontalLayout)
self.gridLayout_4.addWidget(self.frame_5, 3, 0, 1, 1)
MainWindow.setCentralWidget(self.centralwidget)
self.menubar = QtWidgets.QMenuBar(MainWindow)
self.menubar.setGeometry(QtCore.QRect(0, 0, 1280, 24))