Skip to content
Snippets Groups Projects
Commit c3c1789e authored by Agsha Athalla Nurkareem's avatar Agsha Athalla Nurkareem
Browse files

Merge branch 'develop' into 'plan'

# Conflicts:
#   src/customize.py
parents 5dbe162e 17a69ea0
Branches
Tags
2 merge requests!13Develop,!11Plan
......@@ -270,10 +270,10 @@ class customizeWorkout(QWidget):
title.move(100, 15)
repDur = QLabel(exLabel)
if(count<8):
repDur.setText(f'<font style="font-size:14px;" color="#D2DCC4"; font-family="Sogoe UI";><b>{self.listEx[count][4]} Detik<b>')
repDur.setText(f'<font style="font-size:14px;" color="#D2DCC4"; font-family="Sogoe UI";><b>{self.listEx[count][4]} Seconds<b>')
repDur.move(100, 60)
else:
repDur.setText(f'<font style="font-size:14px;" color="#D2DCC4"; font-family="Sogoe UI";><b>{self.listEx[count][5]} Repetisi<b>')
repDur.setText(f'<font style="font-size:14px;" color="#D2DCC4"; font-family="Sogoe UI";><b>{self.listEx[count][5]} Repetition<b>')
repDur.move(100,60)
scrollLayout.addWidget(exLabel)
......@@ -404,7 +404,7 @@ class customizeWorkout(QWidget):
button.setIconSize(QPixmap('img/add button.png').size())
def saveButtonClicked():
if(progNameInput.text() == ''):
if(progNameInput.text().isalpha() == False):
QMessageBox.about(self, "Error", "Please input program name")
# QMessageBox.close()
else:
......@@ -458,8 +458,8 @@ class customizeWorkout(QWidget):
progText.move(599, 182)
progNameInput = QLineEdit(self)
progNameInput.move(840, 189)
progNameInput.setFixedSize(320, 41)
progNameInput.move(840, 184)
progNameInput.setFixedSize(320, 50)
progNameInput.setFont(QFont("Segoe UI", 14))
progNameInput.setStyleSheet('''
padding: 11px 30px 11px 30px;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment