Compare commits
No commits in common. "a27b1d702afa08a80f27ad8e8694fb7c3a5cf5fe" and "3b3087cc3766970c52b85c5bfad05454decc8e80" have entirely different histories.
a27b1d702a
...
3b3087cc37
3 changed files with 2 additions and 40 deletions
|
|
@ -1,7 +1,3 @@
|
||||||
# 0.5.5
|
|
||||||
|
|
||||||
* Add + button to time log widget in side bar to have a simplified log entry dialog (without summary or report option)
|
|
||||||
|
|
||||||
# 0.5.4
|
# 0.5.4
|
||||||
|
|
||||||
* Ensure pressing enter a second time on a new line with a checkbox, erases the checkbox (if it had no text added to it)
|
* Ensure pressing enter a second time on a new line with a checkbox, erases the checkbox (if it had no text added to it)
|
||||||
|
|
|
||||||
|
|
@ -66,12 +66,6 @@ class TimeLogWidget(QFrame):
|
||||||
self.toggle_btn.setArrowType(Qt.RightArrow)
|
self.toggle_btn.setArrowType(Qt.RightArrow)
|
||||||
self.toggle_btn.clicked.connect(self._on_toggle)
|
self.toggle_btn.clicked.connect(self._on_toggle)
|
||||||
|
|
||||||
self.log_btn = QToolButton()
|
|
||||||
self.log_btn.setText("➕")
|
|
||||||
self.log_btn.setToolTip(strings._("add_time_entry"))
|
|
||||||
self.log_btn.setAutoRaise(True)
|
|
||||||
self.log_btn.clicked.connect(self._open_dialog_log_only)
|
|
||||||
|
|
||||||
self.open_btn = QToolButton()
|
self.open_btn = QToolButton()
|
||||||
self.open_btn.setIcon(
|
self.open_btn.setIcon(
|
||||||
self.style().standardIcon(QStyle.SP_FileDialogDetailedView)
|
self.style().standardIcon(QStyle.SP_FileDialogDetailedView)
|
||||||
|
|
@ -84,7 +78,6 @@ class TimeLogWidget(QFrame):
|
||||||
header.setContentsMargins(0, 0, 0, 0)
|
header.setContentsMargins(0, 0, 0, 0)
|
||||||
header.addWidget(self.toggle_btn)
|
header.addWidget(self.toggle_btn)
|
||||||
header.addStretch(1)
|
header.addStretch(1)
|
||||||
header.addWidget(self.log_btn)
|
|
||||||
header.addWidget(self.open_btn)
|
header.addWidget(self.open_btn)
|
||||||
|
|
||||||
# Body: simple summary label for the day
|
# Body: simple summary label for the day
|
||||||
|
|
@ -171,19 +164,6 @@ class TimeLogWidget(QFrame):
|
||||||
if not self.toggle_btn.isChecked():
|
if not self.toggle_btn.isChecked():
|
||||||
self.summary_label.setText(strings._("time_log_collapsed_hint"))
|
self.summary_label.setText(strings._("time_log_collapsed_hint"))
|
||||||
|
|
||||||
def _open_dialog_log_only(self) -> None:
|
|
||||||
if not self._current_date:
|
|
||||||
return
|
|
||||||
|
|
||||||
dlg = TimeLogDialog(self._db, self._current_date, self, True)
|
|
||||||
dlg.exec()
|
|
||||||
|
|
||||||
# Always refresh summary + header totals
|
|
||||||
self._reload_summary()
|
|
||||||
|
|
||||||
if not self.toggle_btn.isChecked():
|
|
||||||
self.summary_label.setText(strings._("time_log_collapsed_hint"))
|
|
||||||
|
|
||||||
|
|
||||||
class TimeLogDialog(QDialog):
|
class TimeLogDialog(QDialog):
|
||||||
"""
|
"""
|
||||||
|
|
@ -196,13 +176,7 @@ class TimeLogDialog(QDialog):
|
||||||
4) manage entries for this date
|
4) manage entries for this date
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(
|
def __init__(self, db: DBManager, date_iso: str, parent=None):
|
||||||
self,
|
|
||||||
db: DBManager,
|
|
||||||
date_iso: str,
|
|
||||||
parent=None,
|
|
||||||
log_entry_only: bool | None = False,
|
|
||||||
):
|
|
||||||
super().__init__(parent)
|
super().__init__(parent)
|
||||||
self._db = db
|
self._db = db
|
||||||
self._date_iso = date_iso
|
self._date_iso = date_iso
|
||||||
|
|
@ -251,7 +225,6 @@ class TimeLogDialog(QDialog):
|
||||||
self.hours_spin.setRange(0.0, 24.0)
|
self.hours_spin.setRange(0.0, 24.0)
|
||||||
self.hours_spin.setDecimals(2)
|
self.hours_spin.setDecimals(2)
|
||||||
self.hours_spin.setSingleStep(0.25)
|
self.hours_spin.setSingleStep(0.25)
|
||||||
self.hours_spin.setValue(0.25)
|
|
||||||
form.addRow(strings._("hours"), self.hours_spin)
|
form.addRow(strings._("hours"), self.hours_spin)
|
||||||
|
|
||||||
root.addLayout(form)
|
root.addLayout(form)
|
||||||
|
|
@ -311,12 +284,6 @@ class TimeLogDialog(QDialog):
|
||||||
self._reload_activities()
|
self._reload_activities()
|
||||||
self._reload_entries()
|
self._reload_entries()
|
||||||
|
|
||||||
if log_entry_only:
|
|
||||||
self.delete_btn.hide()
|
|
||||||
self.report_btn.hide()
|
|
||||||
self.table.hide()
|
|
||||||
self.resize(self.sizeHint().width(), self.sizeHint().height())
|
|
||||||
|
|
||||||
# ----- Data loading ------------------------------------------------
|
# ----- Data loading ------------------------------------------------
|
||||||
|
|
||||||
def _reload_projects(self) -> None:
|
def _reload_projects(self) -> None:
|
||||||
|
|
|
||||||
|
|
@ -2,8 +2,7 @@
|
||||||
|
|
||||||
set -eo pipefail
|
set -eo pipefail
|
||||||
|
|
||||||
# Clean caches etc
|
rm -rf dist
|
||||||
/home/user/venv-filedust/bin/filedust -y .
|
|
||||||
|
|
||||||
# Publish to Pypi
|
# Publish to Pypi
|
||||||
poetry build
|
poetry build
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue