aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tagit/actions/__init__.py2
-rw-r--r--tagit/actions/filter.py22
-rw-r--r--tagit/apps/desktop.py7
-rw-r--r--tagit/config/settings.json48
-rw-r--r--tagit/widgets/browser.kv2
-rw-r--r--tagit/widgets/browser.py1
-rw-r--r--tagit/widgets/desktop.py1
-rw-r--r--tagit/widgets/filter.kv1
-rw-r--r--tagit/widgets/filter.py2
-rw-r--r--tagit/widgets/status.py1
10 files changed, 24 insertions, 63 deletions
diff --git a/tagit/actions/__init__.py b/tagit/actions/__init__.py
index 24524b4..444bd73 100644
--- a/tagit/actions/__init__.py
+++ b/tagit/actions/__init__.py
@@ -18,7 +18,7 @@ from . import grouping
#from . import misc
#from . import objects
#from . import planes
-#from . import search
+from . import search
#from . import session
#from . import tabs
diff --git a/tagit/actions/filter.py b/tagit/actions/filter.py
index 3702879..869844e 100644
--- a/tagit/actions/filter.py
+++ b/tagit/actions/filter.py
@@ -22,7 +22,7 @@ from tagit.widgets.bindings import Binding
from tagit.widgets.filter import FilterAwareMixin
# inner-module imports
-from .action import Action
+from . import action
# exports
__all__ = []
@@ -35,7 +35,7 @@ Builder.load_file(os.path.join(os.path.dirname(__file__), 'filter.kv'))
# classes
-class SearchByAddressOnce(Action):
+class SearchByAddressOnce(action.Action):
"""Open the filters in address mode for a single edit"""
text = kp.StringProperty('Inline edit')
@@ -46,7 +46,7 @@ class SearchByAddressOnce(Action):
self.root.filter.show_address_once()
-class SetToken(Action):
+class SetToken(action.Action):
"""Set all filters from a text query."""
text = kp.StringProperty('Set tokens')
@@ -84,7 +84,7 @@ class SetToken(Action):
dialogues.Error(text=f'syntax error: {e}').open()
-class AddToken(Action):
+class AddToken(action.Action):
"""Show a dialogue for adding a filter."""
text = kp.StringProperty('Add filter')
@@ -123,7 +123,7 @@ class AddToken(Action):
self.root.browser.frame = Frame()
-class EditToken(Action):
+class EditToken(action.Action):
"""Show a dialogue for editing a filter."""
text = kp.StringProperty('Edit token')
@@ -182,7 +182,7 @@ class EditToken(Action):
filter.f_tail.pop(idx)
-class RemoveToken(Action):
+class RemoveToken(action.Action):
"""Remove a filter."""
text = kp.StringProperty('Remove token')
@@ -204,7 +204,7 @@ class RemoveToken(Action):
filter.t_tail.remove(token)
-class GoBack(Action):
+class GoBack(action.Action):
"""Remove the rightmost filter from the search."""
text = kp.StringProperty('Previous search')
@@ -222,7 +222,7 @@ class GoBack(Action):
self.root.browser.frame = filter.f_head.pop(-1)
-class GoForth(Action):
+class GoForth(action.Action):
"""Add the rightmost filter to the search"""
text = kp.StringProperty('Next search')
@@ -240,7 +240,7 @@ class GoForth(Action):
self.root.browser.frame = filter.f_tail.pop(0)
-class JumpToToken(Action):
+class JumpToToken(action.Action):
"""Jump to a filter token."""
text = kp.StringProperty('Jump to token')
@@ -254,12 +254,12 @@ class JumpToToken(Action):
self.root.trigger('GoForth', filter.t_tail.index(token) + 1)
-class SearchmodeSwitch(Action, FilterAwareMixin):
+class SearchmodeSwitch(action.Action, FilterAwareMixin):
"""Switch between shingle and address search bar display."""
text = kp.StringProperty('Toggle searchbar mode')
def on_root(self, wx, root):
- Action.on_root(self, wx, root)
+ action.Action.on_root(self, wx, root)
FilterAwareMixin.on_root(self, wx, root)
def on_searchmode(self, filter, searchmode):
diff --git a/tagit/apps/desktop.py b/tagit/apps/desktop.py
index 086a503..21a610c 100644
--- a/tagit/apps/desktop.py
+++ b/tagit/apps/desktop.py
@@ -32,8 +32,13 @@ class TagitApp(App):
# set title
self.title = 'tagit v2.0'
+ # FIXME: mb/port
+ # load essentials
+ from tagit.config.loader import load_settings, TAGITRC
+ cfg = load_settings(TAGITRC, 0)
+
# create widget
- return desktop.MainWindow()
+ return desktop.MainWindow(cfg, None, None) # FIXME: expects cfg, stor, log arguments
def on_start(self):
# trigger startup operations
diff --git a/tagit/config/settings.json b/tagit/config/settings.json
index e0bb3cf..8fd4754 100644
--- a/tagit/config/settings.json
+++ b/tagit/config/settings.json
@@ -2,67 +2,19 @@
"ui": {
"standalone": {
"keytriggers": [
- "ClipboardCopy",
- "ClipboardPaste",
- "CreateGroup",
- "DissolveGroup",
- "AddToGroup",
- "MoveCursorUp",
- "MoveCursorDown",
- "MoveCursorLeft",
- "MoveCursorRight",
- "MoveCursorLast",
- "MoveCursorFirst",
- "NextPage",
- "PreviousPage",
- "ScrollDown",
- "ScrollUp",
- "ZoomIn",
- "ZoomOut",
- "Select",
- "SelectAll",
- "SelectNone",
- "SelectMulti",
- "SelectRange",
- "AddToken",
- "GoBack",
- "GoForth",
- "SearchByAddressOnce",
- "AddTag",
- "EditTag",
- "OpenGroup",
- "RepresentGroup",
- "Search",
- "ShowSelected",
- "RemoveSelected",
- "OpenExternal",
- "ShowHelp"
],
"buttondocks": {
"filter": [
- "AddToken",
- "GoBack",
- "GoForth"
],
"navigation_left": [
- "MoveCursorFirst",
- "PreviousPage",
- "ScrollUp"
],
"navigation_right": [
- "ScrollDown",
- "NextPage",
- "MoveCursorLast"
],
"status": [
- "RotateLeft",
- "DeleteObject",
- "RotateRight"
]
},
"context": {
"root": [
- "CloseSessionAndExit"
]
}
}
diff --git a/tagit/widgets/browser.kv b/tagit/widgets/browser.kv
index ed40a44..758d08f 100644
--- a/tagit/widgets/browser.kv
+++ b/tagit/widgets/browser.kv
@@ -1,4 +1,4 @@
-#:import OpenGroup tagit.actions.grouping
+#-- #:import OpenGroup tagit.actions.grouping
<Browser>:
root: None
diff --git a/tagit/widgets/browser.py b/tagit/widgets/browser.py
index df1a8b8..dace58b 100644
--- a/tagit/widgets/browser.py
+++ b/tagit/widgets/browser.py
@@ -394,6 +394,7 @@ class Browser(GridLayout, StorageAwareMixin, ConfigAwareMixin):
# load previews for items
# FIXME: Only relevant items, not all of them
+ return # FIXME: mb/port
thumbs = items.preview(default=open(resource_find('no_preview.png'), 'rb'))
resolution = self._cell_resolution()
for ent, thumb, child in zip(reversed(items), reversed(thumbs), childs):
diff --git a/tagit/widgets/desktop.py b/tagit/widgets/desktop.py
index f012fc7..018bd60 100644
--- a/tagit/widgets/desktop.py
+++ b/tagit/widgets/desktop.py
@@ -207,6 +207,7 @@ class MainWindow(FloatLayout):
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'):
# save and close
self.trigger('CloseSessionAndExit')
diff --git a/tagit/widgets/filter.kv b/tagit/widgets/filter.kv
index d98b5a7..b638570 100644
--- a/tagit/widgets/filter.kv
+++ b/tagit/widgets/filter.kv
@@ -1,4 +1,5 @@
#:import SearchmodeSwitch tagit.actions.filter
+#-- #:import SortKey tagit.actions.search
<Filter>:
root: None
diff --git a/tagit/widgets/filter.py b/tagit/widgets/filter.py
index 56d460a..0152737 100644
--- a/tagit/widgets/filter.py
+++ b/tagit/widgets/filter.py
@@ -101,7 +101,7 @@ class Filter(BoxLayout, ConfigAwareMixin):
# sort
#sortkey = kp.ObjectProperty(partial(ast.NumericalSort, 'time'))
- sortkey = kp.ObjectProperty() # FIXME: mb/port
+ sortkey = kp.ObjectProperty(None) # FIXME: mb/port
sortdir = kp.BooleanProperty(False) # False means ascending
diff --git a/tagit/widgets/status.py b/tagit/widgets/status.py
index 7b08eee..fea52b9 100644
--- a/tagit/widgets/status.py
+++ b/tagit/widgets/status.py
@@ -94,6 +94,7 @@ class Status(BoxLayout, BrowserAwareMixin, ConfigAwareMixin):
logging.getLogger().root.removeHandler(self.handler_history)
# status log event
+ return # FIXME: mb/port
self.handler_status = logger_config(
CallbackHandler(self.status_from_log),
ColorsMarkup,
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-02 07:26:36 +0000