From fe7b8dbc6cce30ce486ad9fc37f6aef4da67a4b2 Mon Sep 17 00:00:00 2001 From: A_D Date: Mon, 28 Jun 2021 08:45:29 +0200 Subject: [PATCH 1/4] Add config option for hiding current group/captian name --- EDMarketConnector.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 17cfdd01..352b8ce2 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -1085,12 +1085,17 @@ class AppWindow(object): # Update main window self.cooldown() if monitor.cmdr and monitor.state['Captain']: - self.cmdr['text'] = f'{monitor.cmdr} / {monitor.state["Captain"]}' + if not config.get_bool('hide_multicrew_captian', default=False): + self.cmdr['text'] = f'{monitor.cmdr} / {monitor.state["Captain"]}' + + else: + self.cmdr['text'] = f'{monitor.cmdr}' + self.ship_label['text'] = _('Role') + ':' # LANG: Multicrew role label in main window self.ship.configure(state=tk.NORMAL, text=crewroletext(monitor.state['Role']), url=None) elif monitor.cmdr: - if monitor.group: + if monitor.group and not config.get_bool("hide_group", default=False): self.cmdr['text'] = f'{monitor.cmdr} / {monitor.group}' else: From b42fcf1d4f55f1cca82d15e10ac1a85c6ba7ba77 Mon Sep 17 00:00:00 2001 From: A_D Date: Mon, 28 Jun 2021 10:28:56 +0200 Subject: [PATCH 2/4] added config option and prefs page --- EDMarketConnector.py | 2 +- prefs.py | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 352b8ce2..4d53f1ac 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -1095,7 +1095,7 @@ class AppWindow(object): self.ship.configure(state=tk.NORMAL, text=crewroletext(monitor.state['Role']), url=None) elif monitor.cmdr: - if monitor.group and not config.get_bool("hide_group", default=False): + if monitor.group and not config.get_bool("hide_private_group", default=False): self.cmdr['text'] = f'{monitor.cmdr} / {monitor.group}' else: diff --git a/prefs.py b/prefs.py index 9e2c037e..57c83f50 100644 --- a/prefs.py +++ b/prefs.py @@ -289,6 +289,7 @@ class PreferencesDialog(tk.Toplevel): self.__setup_output_tab(notebook) self.__setup_plugin_tabs(notebook) self.__setup_config_tab(notebook) + self.__setup_privacy_tab(notebook) self.__setup_appearance_tab(notebook) self.__setup_plugin_tab(notebook) @@ -671,6 +672,25 @@ class PreferencesDialog(tk.Toplevel): # LANG: Label for 'Configuration' tab in Settings notebook.add(config_frame, text=_('Configuration')) + def __setup_privacy_tab(self, notebook: Notebook) -> None: + frame = nb.Frame(notebook) + self.hide_multicrew_captian = tk.BooleanVar(value=config.get_bool('hide_multicrew_captian', default=False)) + self.hide_private_group = tk.BooleanVar(value=config.get_bool('hide_private_group', default=False)) + row = AutoInc() + + nb.Label(frame, text=_('Main UI privacy options')).grid( + row=row.get(), column=0, sticky=tk.W, padx=self.PADX, pady=self.PADY + ) + + nb.Checkbutton( + frame, text=_('Hide private group name in UI'), variable=self.hide_private_group + ).grid(row=row.get(), column=0, padx=self.PADX, pady=self.PADY) + nb.Checkbutton( + frame, text=_('Hide multi-crew captian name'), variable=self.hide_multicrew_captian + ).grid(row=row.get(), column=0, padx=self.PADX, pady=self.PADY) + + notebook.add(frame, text=_('Privacy')) + def __setup_appearance_tab(self, notebook: Notebook) -> None: self.languages = Translations.available_names() # Appearance theme and language setting @@ -1234,6 +1254,10 @@ class PreferencesDialog(tk.Toplevel): config.set('language', lang_codes.get(self.lang.get()) or '') # or '' used here due to Default being None above Translations.install(config.get_str('language', default=None)) # type: ignore # This sets self in weird ways. + # Privacy options + config.set('hide_private_group', self.hide_private_group.get()) + config.set('hide_multicrew_captian', self.hide_multicrew_captian.get()) + config.set('ui_scale', self.ui_scale.get()) config.set('ui_transparency', self.transparency.get()) config.set('always_ontop', self.always_ontop.get()) From 455250019dc248588fd72e051a1aa0fc4a134a5e Mon Sep 17 00:00:00 2001 From: A_D Date: Mon, 28 Jun 2021 10:36:31 +0200 Subject: [PATCH 3/4] added lang entries --- L10n/en.template | 12 ++++++++++++ prefs.py | 9 ++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/L10n/en.template b/L10n/en.template index 39e1346c..5ed9f4cb 100644 --- a/L10n/en.template +++ b/L10n/en.template @@ -630,3 +630,15 @@ /* stats.py: Status dialog title; In files: stats.py:376; */ "Ships" = "Ships"; + +/* prefs.py: UI elements privacy section header in privacy tab of preferences; In files: prefs.py:682; */ +"Main UI privacy options" = "Main UI privacy options"; + +/* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:687; */ +"Hide private group name in UI" = "Hide private group name in UI"; + +/* prefs.py: Hide multicrew captian name from main UI checkbox; In files: prefs.py:691; */ +"Hide multi-crew captian name" = "Hide multi-crew captian name"; + +/* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ +"Privacy" = "Privacy"; diff --git a/prefs.py b/prefs.py index 57c83f50..e110800d 100644 --- a/prefs.py +++ b/prefs.py @@ -678,18 +678,21 @@ class PreferencesDialog(tk.Toplevel): self.hide_private_group = tk.BooleanVar(value=config.get_bool('hide_private_group', default=False)) row = AutoInc() + # LANG: UI elements privacy section header in privacy tab of preferences nb.Label(frame, text=_('Main UI privacy options')).grid( row=row.get(), column=0, sticky=tk.W, padx=self.PADX, pady=self.PADY ) nb.Checkbutton( - frame, text=_('Hide private group name in UI'), variable=self.hide_private_group + frame, text=_('Hide private group name in UI'), # LANG: Hide private group owner name from UI checkbox + variable=self.hide_private_group ).grid(row=row.get(), column=0, padx=self.PADX, pady=self.PADY) nb.Checkbutton( - frame, text=_('Hide multi-crew captian name'), variable=self.hide_multicrew_captian + frame, text=_('Hide multi-crew captian name'), # LANG: Hide multicrew captian name from main UI checkbox + variable=self.hide_multicrew_captian ).grid(row=row.get(), column=0, padx=self.PADX, pady=self.PADY) - notebook.add(frame, text=_('Privacy')) + notebook.add(frame, text=_('Privacy')) # LANG: Preferences privacy tab title def __setup_appearance_tab(self, notebook: Notebook) -> None: self.languages = Translations.available_names() From a0c1854818d9e7f285b2351d187298d30ceea719 Mon Sep 17 00:00:00 2001 From: A_D Date: Sat, 7 Aug 2021 20:20:48 +0200 Subject: [PATCH 4/4] fixed letter transposition I hate the word captain. --- EDMarketConnector.py | 2 +- L10n/en.template | 4 ++-- prefs.py | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 4d53f1ac..4dcf1045 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -1085,7 +1085,7 @@ class AppWindow(object): # Update main window self.cooldown() if monitor.cmdr and monitor.state['Captain']: - if not config.get_bool('hide_multicrew_captian', default=False): + if not config.get_bool('hide_multicrew_captain', default=False): self.cmdr['text'] = f'{monitor.cmdr} / {monitor.state["Captain"]}' else: diff --git a/L10n/en.template b/L10n/en.template index 5ed9f4cb..f62c5428 100644 --- a/L10n/en.template +++ b/L10n/en.template @@ -637,8 +637,8 @@ /* prefs.py: Hide private group owner name from UI checkbox; In files: prefs.py:687; */ "Hide private group name in UI" = "Hide private group name in UI"; -/* prefs.py: Hide multicrew captian name from main UI checkbox; In files: prefs.py:691; */ -"Hide multi-crew captian name" = "Hide multi-crew captian name"; +/* prefs.py: Hide multicrew captain name from main UI checkbox; In files: prefs.py:691; */ +"Hide multi-crew captain name" = "Hide multi-crew captain name"; /* prefs.py: Preferences privacy tab title; In files: prefs.py:695; */ "Privacy" = "Privacy"; diff --git a/prefs.py b/prefs.py index e110800d..6c900863 100644 --- a/prefs.py +++ b/prefs.py @@ -674,7 +674,7 @@ class PreferencesDialog(tk.Toplevel): def __setup_privacy_tab(self, notebook: Notebook) -> None: frame = nb.Frame(notebook) - self.hide_multicrew_captian = tk.BooleanVar(value=config.get_bool('hide_multicrew_captian', default=False)) + self.hide_multicrew_captain = tk.BooleanVar(value=config.get_bool('hide_multicrew_captain', default=False)) self.hide_private_group = tk.BooleanVar(value=config.get_bool('hide_private_group', default=False)) row = AutoInc() @@ -688,8 +688,8 @@ class PreferencesDialog(tk.Toplevel): variable=self.hide_private_group ).grid(row=row.get(), column=0, padx=self.PADX, pady=self.PADY) nb.Checkbutton( - frame, text=_('Hide multi-crew captian name'), # LANG: Hide multicrew captian name from main UI checkbox - variable=self.hide_multicrew_captian + frame, text=_('Hide multi-crew captain name'), # LANG: Hide multicrew captain name from main UI checkbox + variable=self.hide_multicrew_captain ).grid(row=row.get(), column=0, padx=self.PADX, pady=self.PADY) notebook.add(frame, text=_('Privacy')) # LANG: Preferences privacy tab title @@ -1259,7 +1259,7 @@ class PreferencesDialog(tk.Toplevel): # Privacy options config.set('hide_private_group', self.hide_private_group.get()) - config.set('hide_multicrew_captian', self.hide_multicrew_captian.get()) + config.set('hide_multicrew_captain', self.hide_multicrew_captain.get()) config.set('ui_scale', self.ui_scale.get()) config.set('ui_transparency', self.transparency.get())