CreatBot/GeneralKlipperScreen
7
0
Fork 0
forked from CreatBot/CreatBotKlipperScreen
Code Pull Requests Activity

print: use am-pm if not 24h

Browse Source
This commit is contained in:
alfrix 2022-12-01 11:34:36 -03:00
parent 7651b892b8
commit 4804f5a5e0
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
panels/print.py
View File

@ -37,6 +37,9 @@ class PrintPanel(ScreenPanel):
self.directories = {}
self.labels['directories'] = {}
self.labels['files'] = {}
self.time_24 = self._config.get_main_config().getboolean("24htime", True)
logging.info(f"24h time is {self.time_24}")
sbox = Gtk.Box(spacing=0)
sbox.set_vexpand(False)
for i, (name, val) in enumerate(self.sort_items.items(), start=1):
@ -120,11 +123,11 @@ class PrintPanel(ScreenPanel):
curdir = os.path.join(*d[:i + 1])
if curdir != "gcodes" and fileinfo['modified'] > self.filelist[curdir]['modified']:
self.filelist[curdir]['modified'] = fileinfo['modified']
self.labels['directories'][curdir]['info'].set_markup(
'<small>' + _("Modified")
+ f' <b>{datetime.fromtimestamp(fileinfo["modified"]):%Y-%m-%d %H:%M}</b></small>'
)
if self.time_24:
time = f':<b> {datetime.fromtimestamp(fileinfo["modified"]):%Y-%m-%d %H:%M}</b>'
else:
time = f':<b> {datetime.fromtimestamp(fileinfo["modified"]):%Y-%m-%d %I:%M %p}<b>'
self.labels['directories'][curdir]['info'].set_markup(_("Modified") + time)
self.filelist[directory]['files'].append(filename)
if filepath not in self.files:
@ -146,6 +149,7 @@ class PrintPanel(ScreenPanel):
def _create_row(self, fullpath, filename=None):
name = Gtk.Label()
name.get_style_context().add_class("print-filename")
if filename:
name.set_markup(f'<big><b>{os.path.splitext(filename)[0].replace("_", " ")}</b></big>')
else:
@ -157,6 +161,7 @@ class PrintPanel(ScreenPanel):
info = Gtk.Label()
info.set_halign(Gtk.Align.START)
info.get_style_context().add_class("print-info")
labels = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
labels.add(name)
@ -338,14 +343,16 @@ class PrintPanel(ScreenPanel):
fileinfo = self._screen.files.get_file_info(filename)
if fileinfo is None:
return
info = '<small>' + _("Uploaded") + f': <b>{datetime.fromtimestamp(fileinfo["modified"]):%Y-%m-%d %H:%M}</b>\n'
info = _("Uploaded")
if self.time_24:
info += f':<b> {datetime.fromtimestamp(fileinfo["modified"]):%Y-%m-%d %H:%M}</b>\n'
else:
info += f':<b> {datetime.fromtimestamp(fileinfo["modified"]):%Y-%m-%d %I:%M %p}</b>\n'
if "size" in fileinfo:
info += _("Size") + f': <b>{self.format_size(fileinfo["size"])}</b>\n'
info += _("Size") + f': <b>{self.format_size(fileinfo["size"])}</b>\n'
if "estimated_time" in fileinfo:
info += _("Print Time") + f': <b>{self.format_time(fileinfo["estimated_time"])}</b>'
info += "</small>"
info += _("Print Time") + f': <b>{self.format_time(fileinfo["estimated_time"])}</b>'
return info
def reload_files(self, widget=None):

10
styles/base.css
View File

@ -414,6 +414,16 @@ trough {
font-size: 1.25em;
}
.print-filename {
font-size: 1.1em;
margin-bottom: 0.2em;
}
.print-info {
font-size: 0.95em;
}
.tempbutton_top {
border: .15em solid white;
border-bottom: 0;