diff --git a/frontend/src/uxbox/main/data/workspace.cljs b/frontend/src/uxbox/main/data/workspace.cljs index 03a8fe7f7..197141055 100644 --- a/frontend/src/uxbox/main/data/workspace.cljs +++ b/frontend/src/uxbox/main/data/workspace.cljs @@ -481,21 +481,21 @@ ;; --- Grid Alignment -(defn initialize-alignment - [id] - (s/assert ::us/uuid id) - (ptk/reify ::initialize-alignment - ptk/WatchEvent - (watch [_ state stream] - (let [metadata (get-in state [:workspace-page :metadata]) - params {:width c/viewport-width - :height c/viewport-height - :x-axis (:grid-x-axis metadata c/grid-x-axis) - :y-axis (:grid-y-axis metadata c/grid-y-axis)}] - (rx/concat - (rx/of (deactivate-flag :grid-indexed)) - (->> (uwrk/initialize-alignment params) - (rx/map #(activate-flag :grid-indexed)))))))) +;; (defn initialize-alignment +;; [id] +;; (s/assert ::us/uuid id) +;; (ptk/reify ::initialize-alignment +;; ptk/WatchEvent +;; (watch [_ state stream] +;; (let [metadata (get-in state [:workspace-page :metadata]) +;; params {:width c/viewport-width +;; :height c/viewport-height +;; :x-axis (:grid-x-axis metadata c/grid-x-axis) +;; :y-axis (:grid-y-axis metadata c/grid-y-axis)}] +;; (rx/concat +;; (rx/of (deactivate-flag :grid-indexed)) +;; (->> (uwrk/initialize-alignment params) +;; (rx/map #(activate-flag :grid-indexed)))))))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Shapes events diff --git a/frontend/src/uxbox/main/locales/en.cljs b/frontend/src/uxbox/main/locales/en.cljs index 777851ea0..5f684c2b4 100644 --- a/frontend/src/uxbox/main/locales/en.cljs +++ b/frontend/src/uxbox/main/locales/en.cljs @@ -83,12 +83,12 @@ "common.accept" "Accept" "common.cancel" "Cancel" - "ds.settings.icons" "Icons" - "ds.settings.element-options" "Element options" - "ds.settings.draw-tools" "Draw tools" - "ds.settings.sitemap" "Sitemap" - "ds.settings.layers" "Layers" - "ds.settings.document-history" "Document history" + "workspace.sidebar.icons" "Icons" + "workspace.sidebar.element-options" "Element options" + "workspace.sidebar.draw-tools" "Draw tools" + "workspace.sidebar.sitemap" "Sitemap" + "workspace.sidebar.layers" "Layers" + "workspace.sidebar.document-history" "Document history" "ds.page.placeholder" "Page name" "ds.page.new" "New page" @@ -155,13 +155,12 @@ "workspace.options.measures" "Size, position & rotation" "workspace.options.font-options" "Fonts & Font Size" "workspace.options.rotation-radius" "Rotation & Radius" + "workspace.options.stroke" "Stroke" + "workspace.options.grid-options" "Grid settings" "element.fill" "Fill" - "workspace.options.stroke" "Stroke" "element.text" "Text" "element.interactions" "Interactions" - "workspace.options.page-measures" "Page settings" - "element.page-grid-options" "Grid settings" "image.new" "New image" "image.select" "Select from library" diff --git a/frontend/src/uxbox/main/locales/fr.cljs b/frontend/src/uxbox/main/locales/fr.cljs index ac6c2a8dc..b1557072a 100644 --- a/frontend/src/uxbox/main/locales/fr.cljs +++ b/frontend/src/uxbox/main/locales/fr.cljs @@ -76,40 +76,16 @@ "ds.project.placeholder" "Nom du nouveau projet" "ds.project.new" "Nouveau projet" - "ds.radius" "Rayon" - "ds.size" "Taille" - "ds.width" "Largeur" - "ds.height" "Hauteur" - "ds.style" "Style" - "ds.none" "Aucun" - "ds.solid" "Solide" - "ds.dotted" "Pointillé" - "ds.dashed" "Tiré" - "ds.mixed" "Mixte" - "ds.position" "Position" - "ds.rotation" "Rotation" - "ds.opacity" "Opacité" - "ds.color" "Couleur" - "ds.background-color" "Couleur d'arrière-plan" - "ds.font-family" "Police de caractères" - "ds.size-weight" "Taille et graisse" - "ds.font-size" "Taille de police" - "ds.line-height-letter-spacing" "Hauteur de ligne et Espacement de caractères" - "ds.line-height" "Hauteur de ligne" - "ds.letter-spacing" "Espacement de caractères" - "ds.text-align" "Alignement de texte" - "ds.name" "Nom" - "ds.go" "C'est parti !" "ds.accept" "Accepter" "ds.cancel" "Annuler" - "ds.settings.icons" "Icônes" - "ds.settings.element-options" "Options d'élément" - "ds.settings.draw-tools" "Outils de dessin" - "ds.settings.sitemap" "Plan du site" - "ds.settings.layers" "Couches" - "ds.settings.document-history" "Historique du document" + "workspace.sidebar.icons" "Icônes" + "workspace.sidebar.element-options" "Options d'élément" + "workspace.sidebar.draw-tools" "Outils de dessin" + "workspace.sidebar.sitemap" "Plan du site" + "workspace.sidebar.layers" "Couches" + "workspace.sidebar.document-history" "Historique du document" "ds.page.placeholder" "Nom de la page" "ds.page.new" "Nouvelle page" @@ -118,44 +94,70 @@ "ds.history.versions" "Historique" "ds.history.pinned" "Épinglés" - "ds.help.rect" "Boîte (Ctrl + B)" - "ds.help.circle" "Cercle (Ctrl + E)" - "ds.help.line" "Ligne (Ctrl + L)" - "ds.help.text" "Texte" - "ds.help.path" "Chemin" - "ds.help.curve" "Courbe" - "ds.help.ruler" "Règle" - "ds.help.canvas" "Calque" + "workspace.header.rect" "Boîte (Ctrl + B)" + "workspace.header.circle" "Cercle (Ctrl + E)" + "workspace.header.line" "Ligne (Ctrl + L)" + "workspace.header.text" "Texte" + "workspace.header.path" "Chemin" + "workspace.header.curve" "Courbe" + "workspace.header.ruler" "Règle" + "workspace.header.canvas" "Calque" "ds.user.profile" "Profil" "ds.user.password" "Mot de passe" "ds.user.notifications" "Notifications" "ds.user.exit" "Quitter" - "header.sitemap" "Plan du site (Ctrl + Maj + M)" - "header.draw-tools" "Outils de dessin (Ctrl + Maj + S)" - "header.color-palette" "Palette de couleurs (---)" - "header.icons" "Icônes (Ctrl + Maj + I)" - "header.layers" "Couches (Ctrl + Maj + L)" - "header.element-options" "Options d'élément (Ctrl + Maj + O)" - "header.document-history" "Historique du document (Ctrl + Maj + H)" - "header.undo" "Annuler (Ctrl + Z)" - "header.redo" "Rétablir (Ctrl + Maj + Z)" - "header.download" "Télécharger (Ctrl + E)" - "header.image" "Image (Ctrl + I)" - "header.rules" "Règles" - "header.grid" "Grille (Ctrl + G)" - "header.grid-snap" "Coller à la grille" - "header.align" "Aligner (Ctrl + A)" - "header.view-mode" "Mode visualisation (Ctrl + P)" + "workspace.header.sitemap" "Plan du site (Ctrl + Maj + M)" + "workspace.header.draw-tools" "Outils de dessin (Ctrl + Maj + S)" + "workspace.header.color-palette" "Palette de couleurs (---)" + "workspace.header.icons" "Icônes (Ctrl + Maj + I)" + "workspace.header.layers" "Couches (Ctrl + Maj + L)" + "workspace.header.element-options" "Options d'élément (Ctrl + Maj + O)" + "workspace.header.document-history" "Historique du document (Ctrl + Maj + H)" + "workspace.header.undo" "Annuler (Ctrl + Z)" + "workspace.header.redo" "Rétablir (Ctrl + Maj + Z)" + "workspace.header.download" "Télécharger (Ctrl + E)" + "workspace.header.image" "Image (Ctrl + I)" + "workspace.header.rules" "Règles" + "workspace.header.grid" "Grille (Ctrl + G)" + "workspace.header.grid-snap" "Coller à la grille" + "workspace.header.align" "Aligner (Ctrl + A)" + "workspace.header.view-mode" "Mode visualisation (Ctrl + P)" + + "workspace.options.radius" "Rayon" + "workspace.options.size" "Taille" + "workspace.options.width" "Largeur" + "workspace.options.height" "Hauteur" + "workspace.options.stroke.style" "Style" + "workspace.options.stroke.none" "Aucun" + "workspace.options.stroke.solid" "Solide" + "workspace.options.stroke.dotted" "Pointillé" + "workspace.options.stroke.dashed" "Tiré" + "workspace.options.stroke.mixed" "Mixte" + "workspace.options.position" "Position" + "workspace.options.rotation" "Rotation" + "workspace.options.opacity" "Opacité" + "workspace.options.color" "Couleur" + "workspace.options.background-color" "Couleur d'arrière-plan" + "workspace.options.font-family" "Police de caractères" + "workspace.options.font-weight" "Taille et graisse" + "workspace.options.font-size" "Taille de police" + "workspace.options.line-height-letter-spacing" "Hauteur de ligne et Espacement de caractères" + "workspace.options.line-height" "Hauteur de ligne" + "workspace.options.letter-spacing" "Espacement de caractères" + "workspace.options.text-align" "Alignement de texte" + "workspace.options.name" "Nom" + "workspace.options.go" "C'est parti !" + "workspace.options.measures" "Taille, position et rotation" + "workspace.options.font-options" "TODO" + "workspace.options.rotation-radius" "TODO" + "workspace.options.strokestroke" "Contour" + "workspace.options.grid-options" "Paramètres de la grille" - "element.measures" "Taille, position et rotation" "element.fill" "Fond" - "element.stroke" "Contour" "element.text" "Texte" "element.interactions" "Interactions" - "element.page-measures" "Paramètres de la page" - "element.page-grid-options" "Paramètres de la grille" "image.new" "Nouvelle image" "image.select" "Choisir depuis une librairie" diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/page.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options/page.cljs index bc383ecda..c504d3ed5 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/page.cljs +++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options/page.cljs @@ -110,7 +110,7 @@ :on-change change-color}] (modal/show! colorpicker-modal props)))] [:div.element-set - [:div.element-set-title (tr "element.page-grid-options")] + [:div.element-set-title (tr "workspace.options.grid-options")] [:div.element-set-content [:span (tr "workspace.options.size")] [:div.row-flex