Skip to content

Commit

Permalink
Merge pull request #36 from kloptops/main
Browse files Browse the repository at this point in the history
port_info scene can now cycle between ports, updated translations, added scene #config to themes.
  • Loading branch information
kloptops authored Nov 25, 2023
2 parents 395fe6a + 3185659 commit ac92dfa
Show file tree
Hide file tree
Showing 12 changed files with 1,181 additions and 1,071 deletions.
7 changes: 6 additions & 1 deletion PortMaster/pugwash
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python3

## -- BEGIN PORTMASTER INFO --
PORTMASTER_VERSION = '8.5.8'
PORTMASTER_VERSION = '8.5.9'
PORTMASTER_RELEASE_CHANNEL = 'beta'
## -- END PORTMASTER INFO --

Expand Down Expand Up @@ -833,6 +833,7 @@ class PortMasterGUI(pySDL2gui.GUI, harbourmaster.Callback):
def set_port_info(self, port_name, port_info, want_install_size=False):
## TODO: make this better :D
if port_name is None:
self.set_data("port_info.name", "NOTHING")
self.set_data("port_info.image", "NO_IMAGE")
self.set_data("port_info.title", _("** NO PORT **"))
self.set_data("port_info.description", "")
Expand All @@ -846,6 +847,7 @@ class PortMasterGUI(pySDL2gui.GUI, harbourmaster.Callback):
# self.set_data("port_info.image", "no-image")
return

self.set_data("port_info.name", port_name)
self.set_data("port_info.image", str(self.get_port_image(port_name)))
self.set_data("port_info.title", port_info['attr']['title'])
self.set_data("port_info.description", port_info['attr']['desc'])
Expand Down Expand Up @@ -976,6 +978,9 @@ class PortMasterGUI(pySDL2gui.GUI, harbourmaster.Callback):
self.changed_keys.add(key)
# logger.debug(f"{key}: {value}")

def get_data(self, key):
return self.text_data.get(key, None)

def format_data(self, input_string, used_keys=None):
return self.formatter.format_string(input_string, used_keys)

Expand Down
8 changes: 4 additions & 4 deletions PortMaster/pylibs/harbourmaster/harbour.py
Original file line number Diff line number Diff line change
Expand Up @@ -638,10 +638,10 @@ def load_ports(self):

unknown_files.append(file_name)

from pprint import pprint
pprint(all_items)
pprint(file_renames)
pprint(unknown_files)
# from pprint import pprint
# pprint(all_items)
# pprint(file_renames)
# pprint(unknown_files)

## Create new ports.
new_ports = []
Expand Down
Loading

0 comments on commit ac92dfa

Please sign in to comment.