Skip to content

Commit f384ffe

Browse files
committed
Added Now buttons
Also the breakTimeEdit now has focus on minutes and defaults to 30 minutes. Fixes #9
1 parent 9812c75 commit f384ffe

File tree

1 file changed

+30
-25
lines changed

1 file changed

+30
-25
lines changed

TardisDiff.py

Lines changed: 30 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -44,40 +44,37 @@ def initUI(self):
4444
self.contentWidget = QtWidgets.QWidget()
4545
self.gridLayout = QtWidgets.QGridLayout(self.contentWidget)
4646
self.formLayout = QtWidgets.QFormLayout()
47-
self.label_time1 = QtWidgets.QLabel(self.contentWidget)
48-
self.label_time2 = QtWidgets.QLabel(self.contentWidget)
49-
self.label_breakTime = QtWidgets.QLabel(self.contentWidget)
5047
self.timeEdit1 = QtWidgets.QTimeEdit(self.contentWidget)
5148
self.timeEdit2 = QtWidgets.QTimeEdit(self.contentWidget)
5249
self.timeEditBreakTime = QtWidgets.QTimeEdit(self.contentWidget)
53-
self.label_timeDiff = QtWidgets.QLabel(self.contentWidget)
50+
self.timeEditBreakTime.setDisplayFormat("h:mm")
51+
self.timeEditBreakTime.setCurrentSection(
52+
QtWidgets.QDateTimeEdit.MinuteSection)
53+
self.timeEditBreakTime.setTime(QtCore.QTime(0, 30))
5454
self.label_timeDiffOut = QtWidgets.QLabel(self.contentWidget)
55+
self.button_time1_now = QtWidgets.QPushButton(
56+
"Now", self.contentWidget)
57+
self.button_time2_now = QtWidgets.QPushButton(
58+
"Now", self.contentWidget)
5559

56-
self.label_time1.setText("Time 1:")
57-
self.label_time2.setText("Time 2:")
58-
self.label_breakTime.setText("Break Time:")
59-
self.label_timeDiff.setText("Difference")
6060
self.label_timeDiffOut.setText("")
6161
self.timeEdit1.setTime(self.getStartTime())
6262
self.timeEdit2.setTime(QtCore.QTime.currentTime())
6363

64-
# Set relations
65-
self.formLayout.setWidget(0, QtWidgets.QFormLayout.LabelRole,
66-
self.label_time1)
67-
self.formLayout.setWidget(0, QtWidgets.QFormLayout.FieldRole,
68-
self.timeEdit1)
69-
self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole,
70-
self.label_time2)
71-
self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole,
72-
self.timeEdit2)
73-
self.formLayout.setWidget(2, QtWidgets.QFormLayout.LabelRole,
74-
self.label_breakTime)
75-
self.formLayout.setWidget(2, QtWidgets.QFormLayout.FieldRole,
76-
self.timeEditBreakTime)
77-
self.formLayout.setWidget(3, QtWidgets.QFormLayout.LabelRole,
78-
self.label_timeDiff)
79-
self.formLayout.setWidget(3, QtWidgets.QFormLayout.FieldRole,
80-
self.label_timeDiffOut)
64+
# Add UI elements
65+
row1 = QtWidgets.QHBoxLayout()
66+
row1.addWidget(self.timeEdit1)
67+
row1.addWidget(self.button_time1_now)
68+
69+
row2 = QtWidgets.QHBoxLayout()
70+
row2.addWidget(self.timeEdit2)
71+
row2.addWidget(self.button_time2_now)
72+
73+
self.formLayout.addRow("Time 1:", row1)
74+
self.formLayout.addRow("Time 2:", row2)
75+
self.formLayout.addRow("Break Time:", self.timeEditBreakTime)
76+
self.formLayout.addRow("Difference:", self.label_timeDiffOut)
77+
8178
self.gridLayout.addLayout(self.formLayout, 0, 0, 1, 1)
8279
self.setCentralWidget(self.contentWidget)
8380

@@ -87,6 +84,8 @@ def initUI(self):
8784
self.timeEdit1.timeChanged.connect(self.inputChanged)
8885
self.timeEdit2.timeChanged.connect(self.inputChanged)
8986
self.timeEditBreakTime.timeChanged.connect(self.inputChanged)
87+
self.button_time1_now.pressed.connect(self.reset_time1)
88+
self.button_time2_now.pressed.connect(self.reset_time2)
9089

9190
self.setWindowTitle('TardisDiff')
9291
self.inputChanged()
@@ -105,6 +104,12 @@ def inputChanged(self):
105104
self.difference = round(self.difference, 2)
106105
self.label_timeDiffOut.setText(str(self.difference))
107106

107+
def reset_time1(self):
108+
self.timeEdit1.setTime(QtCore.QTime.currentTime())
109+
110+
def reset_time2(self):
111+
self.timeEdit2.setTime(QtCore.QTime.currentTime())
112+
108113
def setClipboard(self):
109114
"""Sets the current diff text to clipboard"""
110115
self.clipboard.setText(str(self.difference))

0 commit comments

Comments
 (0)