diff --git a/manuskript/ui/generalView.py b/manuskript/ui/generalView.py index 192f680..a18a965 100644 --- a/manuskript/ui/generalView.py +++ b/manuskript/ui/generalView.py @@ -15,5 +15,103 @@ class GeneralView: self.widget = builder.get_object("general_view") + self.titleBuffer = builder.get_object("title") + self.subtitleBuffer = builder.get_object("subtitle") + self.seriesBuffer = builder.get_object("series") + self.volumeBuffer = builder.get_object("volume") + self.genreBuffer = builder.get_object("genre") + self.licenseBuffer = builder.get_object("license") + self.nameBuffer = builder.get_object("name") + self.emailBuffer = builder.get_object("email") + + self.titleBuffer.connect("deleted-text", self._titleDeletedText) + self.titleBuffer.connect("inserted-text", self._titleInsertedText) + self.subtitleBuffer.connect("deleted-text", self._subtitleDeletedText) + self.subtitleBuffer.connect("inserted-text", self._subtitleInsertedText) + self.seriesBuffer.connect("deleted-text", self._seriesDeletedText) + self.seriesBuffer.connect("inserted-text", self._seriesInsertedText) + self.volumeBuffer.connect("deleted-text", self._volumeDeletedText) + self.volumeBuffer.connect("inserted-text", self._volumeInsertedText) + self.genreBuffer.connect("deleted-text", self._genreDeletedText) + self.genreBuffer.connect("inserted-text", self._genreInsertedText) + self.licenseBuffer.connect("deleted-text", self._licenseDeletedText) + self.licenseBuffer.connect("inserted-text", self._licenseInsertedText) + self.nameBuffer.connect("deleted-text", self._nameDeletedText) + self.nameBuffer.connect("inserted-text", self._nameInsertedText) + self.emailBuffer.connect("deleted-text", self._emailDeletedText) + self.emailBuffer.connect("inserted-text", self._emailInsertedText) + + def titleChanged(self, buffer: Gtk.EntryBuffer): + print("title: " + buffer.get_text()) + + def subtitleChanged(self, buffer: Gtk.EntryBuffer): + print("subtitle: " + buffer.get_text()) + + def seriesChanged(self, buffer: Gtk.EntryBuffer): + print("series: " + buffer.get_text()) + + def volumeChanged(self, buffer: Gtk.EntryBuffer): + print("volume: " + buffer.get_text()) + + def genreChanged(self, buffer: Gtk.EntryBuffer): + print("genre: " + buffer.get_text()) + + def licenseChanged(self, buffer: Gtk.EntryBuffer): + print("license: " + buffer.get_text()) + + def nameChanged(self, buffer: Gtk.EntryBuffer): + print("name: " + buffer.get_text()) + + def emailChanged(self, buffer: Gtk.EntryBuffer): + print("email: " + buffer.get_text()) + + def _titleDeletedText(self, buffer: Gtk.EntryBuffer, position, count): + self.titleChanged(buffer) + + def _titleInsertedText(self, buffer: Gtk.EntryBuffer, position, value, count): + self.titleChanged(buffer) + + def _subtitleDeletedText(self, buffer: Gtk.EntryBuffer, position, count): + self.subtitleChanged(buffer) + + def _subtitleInsertedText(self, buffer: Gtk.EntryBuffer, position, value, count): + self.subtitleChanged(buffer) + + def _seriesDeletedText(self, buffer: Gtk.EntryBuffer, position, count): + self.seriesChanged(buffer) + + def _seriesInsertedText(self, buffer: Gtk.EntryBuffer, position, value, count): + self.seriesChanged(buffer) + + def _volumeDeletedText(self, buffer: Gtk.EntryBuffer, position, count): + self.volumeChanged(buffer) + + def _volumeInsertedText(self, buffer: Gtk.EntryBuffer, position, value, count): + self.volumeChanged(buffer) + + def _genreDeletedText(self, buffer: Gtk.EntryBuffer, position, count): + self.genreChanged(buffer) + + def _genreInsertedText(self, buffer: Gtk.EntryBuffer, position, value, count): + self.genreChanged(buffer) + + def _licenseDeletedText(self, buffer: Gtk.EntryBuffer, position, count): + self.licenseChanged(buffer) + + def _licenseInsertedText(self, buffer: Gtk.EntryBuffer, position, value, count): + self.licenseChanged(buffer) + + def _nameDeletedText(self, buffer: Gtk.EntryBuffer, position, count): + self.nameChanged(buffer) + + def _nameInsertedText(self, buffer: Gtk.EntryBuffer, position, value, count): + self.nameChanged(buffer) + + def _emailDeletedText(self, buffer: Gtk.EntryBuffer, position, count): + self.emailChanged(buffer) + + def _emailInsertedText(self, buffer: Gtk.EntryBuffer, position, value, count): + self.emailChanged(buffer) + def show(self): self.widget.show_all() diff --git a/manuskript/ui/summaryView.py b/manuskript/ui/summaryView.py index 255c367..2a9f211 100644 --- a/manuskript/ui/summaryView.py +++ b/manuskript/ui/summaryView.py @@ -18,8 +18,8 @@ class SummaryView: self.widget = builder.get_object("summary_view") self.stack = builder.get_object("stack") - stackCombo = builder.get_object("stack_combo") - stackCombo.connect("changed", self.summaryStackChanged) + self.stackCombo = builder.get_object("stack_combo") + self.stackCombo.connect("changed", self.summaryStackChanged) self.situationBuffer = builder.get_object("situation") @@ -35,13 +35,16 @@ class SummaryView: self.fullBuffer = builder.get_object("summary_full") self.fullLabel = builder.get_object("full_label") - self.situationBuffer.connect("deleted-text", self.situationDeletedText) - self.situationBuffer.connect("inserted-text", self.situationInsertedText) + self.situationBuffer.connect("deleted-text", self._situationDeletedText) + self.situationBuffer.connect("inserted-text", self._situationInsertedText) self.oneSentenceBuffer.connect("changed", self.summaryOneSentenceChanged) self.oneParagraphBuffer.connect("changed", self.summaryOneParagraphChanged) self.onePageBuffer.connect("changed", self.summaryOnePageChanged) self.fullBuffer.connect("changed", self.summaryFullChanged) + self.nextButton = builder.get_object("next_button") + self.nextButton.connect("clicked", self.nextClicked) + def show(self): self.widget.show_all() @@ -54,15 +57,16 @@ class SummaryView: model = combo.get_model() page = model[tree_iter][1] + self.nextButton.set_visible(not (model.iter_next(tree_iter) is None)) self.stack.set_visible_child_name(page) def situationChanged(self, buffer: Gtk.EntryBuffer): print(buffer.get_text()) - def situationDeletedText(self, buffer: Gtk.EntryBuffer, position, count): + def _situationDeletedText(self, buffer: Gtk.EntryBuffer, position, count): self.situationChanged(buffer) - def situationInsertedText(self, buffer: Gtk.EntryBuffer, position, value, count): + def _situationInsertedText(self, buffer: Gtk.EntryBuffer, position, value, count): self.situationChanged(buffer) def summaryOneSentenceChanged(self, buffer: Gtk.TextBuffer): @@ -96,3 +100,17 @@ class SummaryView: text = buffer.get_text(start_iter, end_iter, False) self.fullLabel.set_text("Words: {} (~{} pages)".format(WordCounter.count(text), PageCounter.count(text))) + + def nextClicked(self, button: Gtk.Button): + tree_iter = self.stackCombo.get_active_iter() + + if tree_iter is None: + return + + model = self.stackCombo.get_model() + tree_iter = model.iter_next(tree_iter) + + if tree_iter is None: + return + else: + self.stackCombo.set_active_iter(tree_iter) diff --git a/ui/general.glade b/ui/general.glade index 63257c4..7f89413 100644 --- a/ui/general.glade +++ b/ui/general.glade @@ -25,6 +25,14 @@ along with Manuskript. If not, see . + + + + + + + + True True @@ -95,6 +103,7 @@ along with Manuskript. If not, see . True True + title True @@ -130,6 +139,7 @@ along with Manuskript. If not, see . True True + subtitle True @@ -165,6 +175,7 @@ along with Manuskript. If not, see . True True + series True @@ -200,6 +211,7 @@ along with Manuskript. If not, see . True True + volume True @@ -235,6 +247,7 @@ along with Manuskript. If not, see . True True + genre True @@ -270,6 +283,7 @@ along with Manuskript. If not, see . True True + license True @@ -350,6 +364,7 @@ along with Manuskript. If not, see . True True + name True @@ -385,6 +400,7 @@ along with Manuskript. If not, see . True True + email True diff --git a/ui/summary.glade b/ui/summary.glade index 94a107e..7538622 100644 --- a/ui/summary.glade +++ b/ui/summary.glade @@ -599,7 +599,7 @@ along with Manuskript. If not, see . - + Next True True