Skip to content

Commit

Permalink
use css for crosslined text
Browse files Browse the repository at this point in the history
  • Loading branch information
mrvladus committed Jan 6, 2024
1 parent 08076d4 commit e2a3e5f
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 12 deletions.
9 changes: 9 additions & 0 deletions data/io.github.mrvladus.List.metainfo.xml.in.in
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,15 @@
</screenshot>
</screenshots>
<releases>
<release version="45.1.4" date="2024-01-06">
<description translatable="no">
<p>Fixed:</p>
<ul>
<li>Details not showing</li>
<li>Lists export</li>
</ul>
</description>
</release>
<release version="45.1.3" date="2024-01-05">
<description translatable="no">
<p>Added:</p>
Expand Down
4 changes: 4 additions & 0 deletions errands/resources/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@
opacity: 0.7;
}

.task-completed row box.title label.title {
text-decoration: line-through;
}

/* Task accent colors */

.task-blue {
Expand Down
8 changes: 0 additions & 8 deletions errands/utils/markup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,6 @@ class Markup:
def escape(self, text: str) -> str:
return GLib.markup_escape_text(text)

@classmethod
def add_crossline(self, text: str) -> str:
return f"<s>{text}</s>"

@classmethod
def rm_crossline(self, text: str) -> str:
return text.replace("<s>", "").replace("</s>", "")

@classmethod
def find_url(self, text: str) -> str:
"""Convert urls to markup. Make sure to escape text before calling."""
Expand Down
2 changes: 1 addition & 1 deletion errands/widgets/components.py
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,9 @@ def get_datetime_as_int(self) -> int:
return int(f"{self.datetime[:8]}{self.datetime[9:]}") if self.datetime else 0

def set_datetime(self, dt: str):
dt = datetime.datetime.fromisoformat(dt).strftime("%Y%m%dT%H%M00")
self.lock_signals = True
if dt:
dt = datetime.datetime.fromisoformat(dt).strftime("%Y%m%dT%H%M00")
self.hour.set_value(int(dt[9:11]))
self.minutes.set_value(int(dt[11:13]))
self.calendar.select_day(
Expand Down
5 changes: 2 additions & 3 deletions errands/widgets/task.py
Original file line number Diff line number Diff line change
Expand Up @@ -245,12 +245,11 @@ def on_completed_btn_toggled(self, btn: Gtk.ToggleButton) -> None:

def set_text():
if btn.get_active():
text = Markup.add_crossline(self.get_prop("text"))
self.task_row.add_css_class("task-completed")
self.add_css_class("task-completed")
else:
text = Markup.rm_crossline(self.get_prop("text"))
self.task_row.remove_css_class("task-completed")
self.remove_css_class("task-completed")
self.task_row.set_title(text)

# If task is just added set text and return to avoid sync loop
if self.just_added:
Expand Down

0 comments on commit e2a3e5f

Please sign in to comment.