nostr/more-speech
1
0
Fork 0
mirror of https://github.com/unclebob/more-speech.git synced 2024-09-30 10:30:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

at-util -> tabs-util

Browse Source
This commit is contained in:
Robert C. Martin 2023-06-08 08:16:30 -05:00
parent dd154b4e2b
commit 94bdf4704a
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/more_speech/nostr/tab_searcher.clj
View File

@ -8,7 +8,7 @@
[more-speech.bech32 :as bech32] [more-speech.bech32 :as bech32]
[more-speech.db.gateway :as gateway] [more-speech.db.gateway :as gateway]
[more-speech.nostr.contact-list :as contact-list] [more-speech.nostr.contact-list :as contact-list]
[more-speech.ui.swing.tabs-util :as at-util] [more-speech.ui.swing.tabs-util :as tabs-util]
[more-speech.config :as config])) [more-speech.config :as config]))
(defn get-subject [event] (defn get-subject [event]
@ -112,8 +112,8 @@
tree (get-mem [:tab-tree-map tab-name]) tree (get-mem [:tab-tree-map tab-name])
model (config tree :model) model (config tree :model)
root-node (.getRoot model) root-node (.getRoot model)
node (at-util/find-header-node root-node event-id)] node (tabs-util/find-header-node root-node event-id)]
(at-util/select-tree-node tree node)))))) (tabs-util/select-tree-node tree node))))))
(defn select-next [tab-name _e] (defn select-next [tab-name _e]
(update-position-and-select tab-name inc-n)) (update-position-and-select tab-name inc-n))

6
src/more_speech/ui/swing/article_panel_util.clj
View File

@ -2,7 +2,7 @@
(:use [seesaw core]) (:use [seesaw core])
(:require [more-speech.mem :refer :all] (:require [more-speech.mem :refer :all]
[more-speech.ui.swing.util :as util] [more-speech.ui.swing.util :as util]
[more-speech.ui.swing.tabs-util :as at-util])) [more-speech.ui.swing.tabs-util :as tabs-util]))
(defn display-event [tab-index event-id] (defn display-event [tab-index event-id]
(let [tabs-list (get-mem :tabs-list) (let [tabs-list (get-mem :tabs-list)
@ -12,10 +12,10 @@
(when (some? tree) (when (some? tree)
(let [model (config tree :model) (let [model (config tree :model)
root-node (.getRoot model) root-node (.getRoot model)
node (at-util/find-header-node root-node event-id)] node (tabs-util/find-header-node root-node event-id)]
(when (some? node) (when (some? node)
(util/select-tab tab-index) (util/select-tab tab-index)
(at-util/select-tree-node tree node)))))) (tabs-util/select-tree-node tree node))))))
(defn adjust-back-count [n] (defn adjust-back-count [n]
(let [event-history (get-mem :event-history) (let [event-history (get-mem :event-history)

4
src/more_speech/ui/swing/tabs.clj
View File

@ -14,7 +14,7 @@
[more-speech.ui.formatters :as formatters] [more-speech.ui.formatters :as formatters]
[more-speech.ui.swing.article-panel :as article-panel] [more-speech.ui.swing.article-panel :as article-panel]
[more-speech.ui.swing.edit-window :as edit-window] [more-speech.ui.swing.edit-window :as edit-window]
[more-speech.ui.swing.tabs-util :as at-util] [more-speech.ui.swing.tabs-util :as tabs-util]
[more-speech.ui.swing.util :as swing-util]) [more-speech.ui.swing.util :as swing-util])
(:use (seesaw [color] [core] [font] [tree])) (:use (seesaw [color] [core] [font] [tree]))
(:import (javax.swing.tree DefaultMutableTreeNode DefaultTreeModel TreePath))) (:import (javax.swing.tree DefaultMutableTreeNode DefaultTreeModel TreePath)))
@ -157,7 +157,7 @@
(defn add-event-to-tab-tree [tree event-id] (defn add-event-to-tab-tree [tree event-id]
(let [model (config tree :model) (let [model (config tree :model)
root (.getRoot model) root (.getRoot model)
insertion-point (at-util/find-chronological-insertion-point root event-id) insertion-point (tabs-util/find-chronological-insertion-point root event-id)
child (DefaultMutableTreeNode. event-id)] child (DefaultMutableTreeNode. event-id)]
(.insertNodeInto model child root insertion-point) (.insertNodeInto model child root insertion-point)
(.makeVisible tree (TreePath. (.getPath child))) (.makeVisible tree (TreePath. (.getPath child)))

10
src/more_speech/ui/swing/util.clj
View File

@ -5,7 +5,7 @@
[more-speech.mem :refer :all] [more-speech.mem :refer :all]
[more-speech.nostr.event-dispatcher :as event-handlers] [more-speech.nostr.event-dispatcher :as event-handlers]
[more-speech.nostr.util :as util] [more-speech.nostr.util :as util]
[more-speech.ui.swing.tabs-util :as at-util]) [more-speech.ui.swing.tabs-util :as tabs-util])
(:use (seesaw [core]))) (:use (seesaw [core])))
(defn clear-popup [popup] (defn clear-popup [popup]
@ -127,7 +127,7 @@
(if (some? tree) (if (some? tree)
(let [model (config tree :model) (let [model (config tree :model)
root-node (.getRoot model)] root-node (.getRoot model)]
(at-util/find-header-node root-node id)) (tabs-util/find-header-node root-node id))
nil) nil)
)) ))
@ -140,7 +140,7 @@
tree (get-mem [:tab-tree-map tab-name]) tree (get-mem [:tab-tree-map tab-name])
node (get-node tab-name id)] node (get-node tab-name id)]
(if (some? node) (if (some? node)
(at-util/select-tree-node tree node) (tabs-util/select-tree-node tree node)
(loop [tabs (get-mem :tabs-list)] (loop [tabs (get-mem :tabs-list)]
(if (empty? tabs) (if (empty? tabs)
nil nil
@ -148,9 +148,9 @@
tree (get-mem [:tab-tree-map tab-name]) tree (get-mem [:tab-tree-map tab-name])
model (config tree :model) model (config tree :model)
root-node (.getRoot model) root-node (.getRoot model)
node (at-util/find-header-node root-node id)] node (tabs-util/find-header-node root-node id)]
(if (some? node) (if (some? node)
(do (do
(select-tab tab-name) (select-tab tab-name)
(at-util/select-tree-node tree node)) (tabs-util/select-tree-node tree node))
(recur (rest tabs))))))))) (recur (rest tabs)))))))))