From 5f298cd185493e3ffddce1849ec9ef9ec875c9b9 Mon Sep 17 00:00:00 2001 From: Ozbolt Menegatti Date: Mon, 3 Feb 2020 06:11:26 +0100 Subject: [PATCH] cluster toggling --- src/message/__init__.py | 2 +- src/message/example_edit.py | 5 +++++ src/model/model.py | 3 +++ src/view/view.py | 14 +++++++++++--- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/message/__init__.py b/src/message/__init__.py index 5434ab7..92391bd 100644 --- a/src/message/__init__.py +++ b/src/message/__init__.py @@ -4,7 +4,7 @@ from message.show_messages import ShowEntryLabelsEdit, ShowEditTranslation, Show from message.simple_edits import EditSenseLabel, EditSenseDefinition, EditComment, AddSenseLabel, AddSense, AddExampleTranslation, DoChosenExamples, AddToLabelList, AddToGenericList, EditVariants, EditRelatedEntries, EditEntryLabels, ExampleClusterEdit, ExampleClusterAdd from message.show_menu import ShowTranslationMenu, ShowSenseMenu, ShowExampleMenu from message.sense_edit import SenseMoveUp, SenseMoveDown, SenseBin -from message.example_edit import ExampleMoveUp, ExampleMoveDown, ExampleBin, ExampleRoleChange, ExampleComponentAdd, ExampleComponentRemove, EditExampleText, ToggleExamples +from message.example_edit import ExampleMoveUp, ExampleMoveDown, ExampleBin, ExampleRoleChange, ExampleComponentAdd, ExampleComponentRemove, EditExampleText, ToggleExamples, ToggleClusters from message.delete_messages import DeleteComment, DeleteVariants, DeleteRelatedEntries, DeleteEntryLabels from message.message import msg diff --git a/src/message/example_edit.py b/src/message/example_edit.py index 0fcf7e1..ff4aad3 100644 --- a/src/message/example_edit.py +++ b/src/message/example_edit.py @@ -88,3 +88,8 @@ class ToggleExamples(Message): def update_model(self, model): model.examples_shown = not model.examples_shown + +class ToggleClusters(Message): + def update_model(self, model): + model.clusters_shown = not model.clusters_shown + diff --git a/src/model/model.py b/src/model/model.py index c62ab5e..092695e 100644 --- a/src/model/model.py +++ b/src/model/model.py @@ -27,6 +27,9 @@ class Model: # choosing and hiding examples self.chosen_examples = [] self.examples_shown = True + + # hiding cluster numbers + self.clusters_shown = True def reset(self): # do both resets at once diff --git a/src/view/view.py b/src/view/view.py index 004119c..efa7dc5 100644 --- a/src/view/view.py +++ b/src/view/view.py @@ -54,8 +54,11 @@ class View: @staticmethod def view_toggle_buttons(model): - txt = "Hide examples" if model.examples_shown else "Show examples" - return [ h("span.button.toggle", {"on": {"click": msg(ToggleExamples())}}, txt) ] + txt_examples = "Hide examples" if model.examples_shown else "Show examples" + txt_clusters = "Hide clusters" if model.clusters_shown else "Show clusters" + + return [h("span.button.toggle", {"on": {"click": msg(ToggleExamples())}}, txt_examples), + h("span.button.toggle", {"on": {"click": msg(ToggleClusters())}}, txt_clusters)] @staticmethod @@ -138,13 +141,18 @@ class View: if not model.examples_shown and not example.is_collocation(): parent_display = "none" + clusters_display = "inherit" + if not model.clusters_shown: + clusters_display = "none" + return h("div.example", {"style": {"display": parent_display}}, [ h("div.example-dot", dot_attr, "▣"), h(example_tag, {}, [ h("span.example-text", {"on": {"click": msg(ShowExampleMenu(example))} }, example_content), h("div.example-translation-list", {}, [ h("div.example-translation", {}, View.view_translations(example.translations, example, model))]), - h("div.example-clusters", {}, show_toggle_cluster_buttons(sense, example))])]) + h("div.example-clusters", + {"style": {"display": clusters_display }}, show_toggle_cluster_buttons(sense, example))])]) @staticmethod def view_translations(translations, parent, model):