diff --git a/frontend/src/app/main/data/viewer.cljs b/frontend/src/app/main/data/viewer.cljs index 81fc28b4b..b87a398fe 100644 --- a/frontend/src/app/main/data/viewer.cljs +++ b/frontend/src/app/main/data/viewer.cljs @@ -549,12 +549,14 @@ (ptk/reify ::go-to-workspace ptk/WatchEvent (watch [_ state _] - (let [project-id (get-in state [:viewer :project :id]) + (let [route (:route state) + project-id (get-in state [:viewer :project :id]) file-id (get-in state [:viewer :file :id]) + saved-page-id (get-in route [:query-params :page-id]) pparams {:project-id project-id :file-id file-id} - qparams {:page-id (or page-id (:current-page-id state))}] + qparams {:page-id (or page-id saved-page-id)}] (rx/of (rt/nav-new-window* {:rname :workspace :path-params pparams :query-params qparams - :name (str "workspace-" file-id)}))))))) \ No newline at end of file + :name (str "workspace-" file-id)}))))))) diff --git a/frontend/src/app/main/data/viewer/shortcuts.cljs b/frontend/src/app/main/data/viewer/shortcuts.cljs index 7d87cf901..87e714d61 100644 --- a/frontend/src/app/main/data/viewer/shortcuts.cljs +++ b/frontend/src/app/main/data/viewer/shortcuts.cljs @@ -11,49 +11,53 @@ [app.main.store :as st])) (def shortcuts - {:increase-zoom {:tooltip "+" - :command "+" - :fn (st/emitf dv/increase-zoom)} + {:increase-zoom {:tooltip "+" + :command "+" + :fn (st/emitf dv/increase-zoom)} - :decrease-zoom {:tooltip "-" - :command "-" - :fn (st/emitf dv/decrease-zoom)} + :decrease-zoom {:tooltip "-" + :command "-" + :fn (st/emitf dv/decrease-zoom)} - :select-all {:tooltip (ds/meta "A") - :command (ds/c-mod "a") - :fn (st/emitf (dv/select-all))} + :select-all {:tooltip (ds/meta "A") + :command (ds/c-mod "a") + :fn (st/emitf (dv/select-all))} - :zoom-50 {:tooltip (ds/shift "0") - :command "shift+0" - :fn (st/emitf dv/zoom-to-50)} + :zoom-50 {:tooltip (ds/shift "0") + :command "shift+0" + :fn (st/emitf dv/zoom-to-50)} - :reset-zoom {:tooltip (ds/shift "1") - :command "shift+1" - :fn (st/emitf dv/reset-zoom)} + :reset-zoom {:tooltip (ds/shift "1") + :command "shift+1" + :fn (st/emitf dv/reset-zoom)} - :zoom-200 {:tooltip (ds/shift "2") - :command "shift+2" - :fn (st/emitf dv/zoom-to-200)} + :zoom-200 {:tooltip (ds/shift "2") + :command "shift+2" + :fn (st/emitf dv/zoom-to-200)} - :next-frame {:tooltip ds/left-arrow - :command "left" - :fn (st/emitf dv/select-prev-frame)} + :next-frame {:tooltip ds/left-arrow + :command "left" + :fn (st/emitf dv/select-prev-frame)} - :prev-frame {:tooltip ds/right-arrow - :command "right" - :fn (st/emitf dv/select-next-frame)} + :prev-frame {:tooltip ds/right-arrow + :command "right" + :fn (st/emitf dv/select-next-frame)} - :open-handoff {:tooltip "G H" - :command "g h" - :fn #(st/emit! (dv/go-to-section :handoff))} + :open-handoff {:tooltip "G H" + :command "g h" + :fn #(st/emit! (dv/go-to-section :handoff))} - :open-comments {:tooltip "G C" - :command "g c" - :fn #(st/emit! (dv/go-to-section :comments))} + :open-comments {:tooltip "G C" + :command "g c" + :fn #(st/emit! (dv/go-to-section :comments))} - :open-workspace {:tooltip "G W" - :command "g w" - :fn #(st/emit! (dv/go-to-workspace))}}) + :open-interactions {:tooltip "G V" + :command "g v" + :fn #(st/emit! (dv/go-to-section :interactions))} + + :open-workspace {:tooltip "G W" + :command "g w" + :fn #(st/emit! (dv/go-to-workspace))}}) (defn get-tooltip [shortcut] (assert (contains? shortcuts shortcut) (str shortcut)) diff --git a/frontend/src/app/main/ui/viewer/header.cljs b/frontend/src/app/main/ui/viewer/header.cljs index 13b3d0353..3cf960bc2 100644 --- a/frontend/src/app/main/ui/viewer/header.cljs +++ b/frontend/src/app/main/ui/viewer/header.cljs @@ -8,6 +8,7 @@ (:require [app.main.data.modal :as modal] [app.main.data.viewer :as dv] + [app.main.data.viewer.shortcuts :as sc] [app.main.store :as st] [app.main.ui.components.dropdown :refer [dropdown]] [app.main.ui.components.fullscreen :as fs] @@ -151,14 +152,14 @@ [:button.mode-zone-button.tooltip.tooltip-bottom {:on-click #(navigate :interactions) :class (dom/classnames :active (= section :interactions)) - :alt (tr "viewer.header.interactions-section")} + :alt (tr "viewer.header.interactions-section" (sc/get-tooltip :open-interactions))} i/play] (when (:can-edit permissions) [:button.mode-zone-button.tooltip.tooltip-bottom {:on-click #(navigate :comments) :class (dom/classnames :active (= section :comments)) - :alt (tr "viewer.header.comments-section")} + :alt (tr "viewer.header.comments-section" (sc/get-tooltip :open-comments))} i/chat]) (when (or (= (:type permissions) :membership) @@ -167,7 +168,7 @@ [:button.mode-zone-button.tooltip.tooltip-bottom {:on-click #(navigate :handoff) :class (dom/classnames :active (= section :handoff)) - :alt (tr "viewer.header.handsoff-section")} + :alt (tr "viewer.header.handsoff-section" (sc/get-tooltip :open-handoff))} i/code])] [:& header-options {:section section diff --git a/frontend/translations/ca.po b/frontend/translations/ca.po index e43075425..9d8006024 100644 --- a/frontend/translations/ca.po +++ b/frontend/translations/ca.po @@ -1708,7 +1708,7 @@ msgid "viewer.frame-not-found" msgstr "No s'ha trobat la taula de treball." msgid "viewer.header.comments-section" -msgstr "Comentaris" +msgstr "Comentaris (%s)" #: src/app/main/ui/viewer/header.cljs msgid "viewer.header.dont-show-interactions" @@ -1723,14 +1723,14 @@ msgid "viewer.header.fullscreen" msgstr "Pantalla completa" msgid "viewer.header.handsoff-section" -msgstr "Lliurament" +msgstr "Lliurament (%s)" #: src/app/main/ui/viewer/header.cljs msgid "viewer.header.interactions" msgstr "Interaccions" msgid "viewer.header.interactions-section" -msgstr "Interaccions" +msgstr "Interaccions (%s)" #: src/app/main/ui/viewer/header.cljs msgid "viewer.header.share.copy-link" diff --git a/frontend/translations/de.po b/frontend/translations/de.po index 81b20f707..65eaa9632 100644 --- a/frontend/translations/de.po +++ b/frontend/translations/de.po @@ -1753,7 +1753,7 @@ msgid "viewer.frame-not-found" msgstr "Keine Zeichenfläche gefunden." msgid "viewer.header.comments-section" -msgstr "Kommentare" +msgstr "Kommentare (%s)" #: src/app/main/ui/viewer/header.cljs msgid "viewer.header.dont-show-interactions" @@ -1768,14 +1768,14 @@ msgid "viewer.header.fullscreen" msgstr "Vollbildmodus" msgid "viewer.header.handsoff-section" -msgstr "Übergabe" +msgstr "Übergabe (%s)" #: src/app/main/ui/viewer/header.cljs msgid "viewer.header.interactions" msgstr "Interaktionen" msgid "viewer.header.interactions-section" -msgstr "Interaktionen" +msgstr "Interaktionen (%s)" #: src/app/main/ui/viewer/header.cljs msgid "viewer.header.share.copy-link" diff --git a/frontend/translations/en.po b/frontend/translations/en.po index 698c24d6c..4963d624f 100644 --- a/frontend/translations/en.po +++ b/frontend/translations/en.po @@ -1757,7 +1757,7 @@ msgid "viewer.frame-not-found" msgstr "Artboard not found." msgid "viewer.header.comments-section" -msgstr "Comments" +msgstr "Comments (%s)" #: src/app/main/ui/viewer/header.cljs msgid "viewer.header.dont-show-interactions" @@ -1768,14 +1768,14 @@ msgid "viewer.header.fullscreen" msgstr "Full Screen" msgid "viewer.header.handsoff-section" -msgstr "Handsoff" +msgstr "Handsoff (%s)" #: src/app/main/ui/viewer/header.cljs msgid "viewer.header.interactions" msgstr "Interactions" msgid "viewer.header.interactions-section" -msgstr "Interactions" +msgstr "Interactions (%s)" #: src/app/main/ui/viewer/header.cljs msgid "viewer.header.share.copy-link" diff --git a/frontend/translations/es.po b/frontend/translations/es.po index 55996a1c6..bc0028286 100644 --- a/frontend/translations/es.po +++ b/frontend/translations/es.po @@ -1756,7 +1756,7 @@ msgid "viewer.frame-not-found" msgstr "No se encuentra el tablero." msgid "viewer.header.comments-section" -msgstr "Comentarios" +msgstr "Comentarios (%s)" #: src/app/main/ui/viewer/header.cljs msgid "viewer.header.dont-show-interactions" @@ -1767,14 +1767,14 @@ msgid "viewer.header.fullscreen" msgstr "Pantalla completa" msgid "viewer.header.handsoff-section" -msgstr "Handoff" +msgstr "Handoff (%s)" #: src/app/main/ui/viewer/header.cljs msgid "viewer.header.interactions" msgstr "Interacciones" msgid "viewer.header.interactions-section" -msgstr "Interacciones" +msgstr "Interacciones (%s)" #: src/app/main/ui/viewer/header.cljs msgid "viewer.header.share.copy-link" diff --git a/frontend/translations/tr.po b/frontend/translations/tr.po index da3693cb5..456a92996 100644 --- a/frontend/translations/tr.po +++ b/frontend/translations/tr.po @@ -1732,7 +1732,7 @@ msgid "viewer.frame-not-found" msgstr "Çalışma yüzeyi bulunamadı." msgid "viewer.header.comments-section" -msgstr "Yorumlar" +msgstr "Yorumlar (%s)" #: src/app/main/ui/viewer/header.cljs msgid "viewer.header.dont-show-interactions" @@ -1755,7 +1755,7 @@ msgid "viewer.header.interactions" msgstr "Etkileşimler" msgid "viewer.header.interactions-section" -msgstr "Etkileşimler" +msgstr "Etkileşimler (%s)" #: src/app/main/ui/viewer/header.cljs msgid "viewer.header.share.copy-link"