From cdd1dc960a3da5e73a86dd3ec5412417387c70d6 Mon Sep 17 00:00:00 2001
From: Matthias Baumgartner <dev@igsor.net>
Date: Wed, 25 Jan 2023 17:11:13 +0100
Subject: minor cleanup

---
 tagit/actions/misc.py    | 7 ++++++-
 tagit/actions/tagging.py | 4 ++--
 tagit/apps/desktop.py    | 3 +++
 tagit/windows/desktop.py | 9 +--------
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/tagit/actions/misc.py b/tagit/actions/misc.py
index 73e7935..99b52f4 100644
--- a/tagit/actions/misc.py
+++ b/tagit/actions/misc.py
@@ -10,11 +10,13 @@ import logging
 import os
 import sys
 
+# external imports
+import webbrowser
+
 # kivy imports
 from kivy.core.clipboard import Clipboard
 from kivy.lang import Builder
 import kivy.properties as kp
-import webbrowser
 
 # tagit imports
 from tagit import config
@@ -75,6 +77,7 @@ class OpenExternal(Action):
         return Binding.check(evt, self.cfg('bindings', 'misc', 'open'))
 
     def apply(self):
+        return # FIXME: mb/port
         with self.root.browser as browser:
             if browser.cursor is None:
                 logger.error('No file selected')
@@ -123,6 +126,7 @@ class ClipboardCopy(Action):
         return Binding.check(evt, self.cfg('bindings', 'clipboard', 'copy'))
 
     def apply(self):
+        return # FIXME: mb/port
         browser = self.root.browser
         paths = [obj.path for obj in browser.selection]
         Clipboard.copy('\n'.join(paths))
@@ -136,6 +140,7 @@ class ClipboardPaste(Action):
         return Binding.check(evt, self.cfg('bindings', 'clipboard', 'paste'))
 
     def apply(self):
+        return # FIXME: mb/port
         paths = Clipboard.paste()
         paths = paths.split('\n')
         self.root.trigger('ImportObjects', paths)
diff --git a/tagit/actions/tagging.py b/tagit/actions/tagging.py
index c6d920d..8a20702 100644
--- a/tagit/actions/tagging.py
+++ b/tagit/actions/tagging.py
@@ -78,7 +78,7 @@ class AddTag(Action):
             tags = reduce(operator.add, tags) # FIXME: mb/port: pass set once supported by Nodes.set
             # set tags
             ents.set(ns.bse.tag, tags)
-            session.dispatch('on_predicate_modified', 'tag', ents, tags)
+            session.dispatch('on_predicate_modified', ns.bse.tag, ents, tags)
             # cursor and selection might become invalid. Will be fixed in Browser.
 
 
@@ -144,7 +144,7 @@ class EditTag(Action):
             ents = browser.unfold(browser.selection)
             ents.set(ns.bse.tag, added)
             #ents.remove(ns.bse.tag, removed) # FIXME: mb/port
-            session.dispatch('on_predicate_modified', 'tag', ents, added | removed)
+            session.dispatch('on_predicate_modified', ns.bse.tag, ents, added | removed)
             # cursor and selection might become invalid. Will be fixed in Browser.
 
 ## config ##
diff --git a/tagit/apps/desktop.py b/tagit/apps/desktop.py
index 94acbf2..054002b 100644
--- a/tagit/apps/desktop.py
+++ b/tagit/apps/desktop.py
@@ -97,6 +97,9 @@ class TagitApp(App):
         # trigger startup operations
         self.root.on_startup()
 
+    # FIXME: mb/port
+    #def on_stop(self):
+    #    self.root.session.storage.close()
 
 def main(argv):
     """Start the tagit GUI. Opens a window to browse images."""
diff --git a/tagit/windows/desktop.py b/tagit/windows/desktop.py
index 915980f..42b279e 100644
--- a/tagit/windows/desktop.py
+++ b/tagit/windows/desktop.py
@@ -123,17 +123,10 @@ class MainWindow(FloatLayout):
         #App.get_running_app().stop()
 
     def on_request_close(self, *args):
-
         with open('.action_history', 'a') as ofile:
             for itm in self.action_log:
                 ofile.write(f'{itm}\n')
-
-        return False # FIXME: mb/port
-        if self.session.storage.changed() and not self.session.cfg('session', 'debug'):
-            # close
-            self.trigger('CloseSessionAndExit')
-            return True
-        # close w/o saving
+        #App.get_running_app().stop() # FIXME: mb/port: from CloseSessionAndExit
         return False
 
     def display_welcome(self):
-- 
cgit v1.2.3