From c988233b8494c801d49630cdb2b47a48222b8a79 Mon Sep 17 00:00:00 2001 From: M4x1m3 Date: Mon, 1 Mar 2021 18:16:08 +0100 Subject: [PATCH] [apps] Replaced atom with atomic --- .gitmodules | 6 +++--- apps/atom | 1 - apps/atomic | 1 + apps/home/apps_layout.csv | 4 ++-- build/config.mak | 4 ++-- escher/src/palette.cpp | 2 ++ themes/icons.json | 2 +- themes/themes/local/epsilon_dark.json | 4 +++- themes/themes/local/epsilon_light.json | 4 +++- .../apps/{atom_icon.png => atomic_icon.png} | Bin themes/themes/local/omega_dark.json | 4 +++- .../apps/{atom_icon.png => atomic_icon.png} | Bin themes/themes/local/omega_light.json | 4 +++- .../apps/{atom_icon.png => atomic_icon.png} | Bin 14 files changed, 23 insertions(+), 13 deletions(-) delete mode 160000 apps/atom create mode 160000 apps/atomic rename themes/themes/local/epsilon_light/apps/{atom_icon.png => atomic_icon.png} (100%) rename themes/themes/local/omega_dark/apps/{atom_icon.png => atomic_icon.png} (100%) rename themes/themes/local/omega_light/apps/{atom_icon.png => atomic_icon.png} (100%) diff --git a/.gitmodules b/.gitmodules index 134e135f6..02641c8d5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "apps/rpn"] path = apps/rpn url = https://github.com/Omega-Numworks/Omega-RPN.git -[submodule "apps/atom"] - path = apps/atom - url = https://github.com/Omega-Numworks/Omega-Atom.git +[submodule "apps/atomic"] + path = apps/atomic + url = https://github.com/Omega-Numworks/Omega-Atomic.git diff --git a/apps/atom b/apps/atom deleted file mode 160000 index 8f710a9d3..000000000 --- a/apps/atom +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8f710a9d3fa4daedde14ba489e418dbac5d590c5 diff --git a/apps/atomic b/apps/atomic new file mode 160000 index 000000000..41570261a --- /dev/null +++ b/apps/atomic @@ -0,0 +1 @@ +Subproject commit 41570261a9601491994cd0e9dbdd22c0667c8803 diff --git a/apps/home/apps_layout.csv b/apps/home/apps_layout.csv index 64469620c..77e47e4b8 100644 --- a/apps/home/apps_layout.csv +++ b/apps/home/apps_layout.csv @@ -1,2 +1,2 @@ -Default,calculation,rpn,graph,code,statistics,probability,solver,atom,sequence,regression,settings -HidePython,calculation,rpn,graph,code,statistics,probability,solver,atom,sequence,regression,settings \ No newline at end of file +Default,calculation,rpn,graph,code,statistics,probability,solver,atomic,sequence,regression,settings +HidePython,calculation,rpn,graph,code,statistics,probability,solver,atomic,sequence,regression,settings diff --git a/build/config.mak b/build/config.mak index 285dc9bf1..29fa16762 100644 --- a/build/config.mak +++ b/build/config.mak @@ -8,8 +8,8 @@ EPSILON_VERSION ?= 15.3.1 OMEGA_VERSION ?= 1.21.0 # OMEGA_USERNAME ?= N/A OMEGA_STATE ?= dev -EPSILON_APPS ?= calculation rpn graph code statistics probability solver atom sequence regression settings external -SUBMODULES_APPS = atom rpn +EPSILON_APPS ?= calculation rpn graph code statistics probability solver atomic sequence regression settings external +SUBMODULES_APPS = atomic rpn EPSILON_I18N ?= en fr nl pt it de es hu EPSILON_COUNTRIES ?= WW CA DE ES FR GB IT NL PT US EPSILON_GETOPT ?= 0 diff --git a/escher/src/palette.cpp b/escher/src/palette.cpp index 5cebacaf6..c77487251 100644 --- a/escher/src/palette.cpp +++ b/escher/src/palette.cpp @@ -148,6 +148,8 @@ constexpr KDColor Palette::AtomHalogen; constexpr KDColor Palette::AtomReactiveNonmetal; constexpr KDColor Palette::AtomNobleGas; constexpr KDColor Palette::AtomTableLines; +constexpr KDColor Palette::AtomBackground; +constexpr KDColor Palette::AtomHighlight; constexpr KDColor Palette::AtomColor[]; KDColor Palette::nextDataColor(int * colorIndex) { diff --git a/themes/icons.json b/themes/icons.json index d16c64c85..3dc1ae52d 100644 --- a/themes/icons.json +++ b/themes/icons.json @@ -2,7 +2,7 @@ "apps/exam_icon.png" : "exam_icon.png", "apps/on_boarding/logo_icon.png" : "logo_icon.png", - "apps/atom/atom_icon.png" : "apps/atom_icon.png", + "apps/atomic/atomic_icon.png" : "apps/atomic_icon.png", "apps/calculation/calculation_icon.png" : "apps/calculation_icon.png", "apps/code/code_icon.png" : "apps/code_icon.png", "apps/external/external_icon.png" : "apps/external_icon.png", diff --git a/themes/themes/local/epsilon_dark.json b/themes/themes/local/epsilon_dark.json index 012dd654d..8a9ecdd21 100644 --- a/themes/themes/local/epsilon_dark.json +++ b/themes/themes/local/epsilon_dark.json @@ -142,7 +142,9 @@ "Halogen": "00debd", "ReactiveNonmetal": "00ee00", "NobleGas": "8baaff", - "TableLines": "323532" + "TableLines": "323532", + "Highlight": "000000", + "Background": "d9d9d9" } } } diff --git a/themes/themes/local/epsilon_light.json b/themes/themes/local/epsilon_light.json index 91423fa14..a2dd52f1a 100644 --- a/themes/themes/local/epsilon_light.json +++ b/themes/themes/local/epsilon_light.json @@ -142,7 +142,9 @@ "Halogen": "00debd", "ReactiveNonmetal": "00ee00", "NobleGas": "8baaff", - "TableLines": "323532" + "TableLines": "323532", + "Highlight": "000000", + "Background": "d9d9d9" } } } diff --git a/themes/themes/local/epsilon_light/apps/atom_icon.png b/themes/themes/local/epsilon_light/apps/atomic_icon.png similarity index 100% rename from themes/themes/local/epsilon_light/apps/atom_icon.png rename to themes/themes/local/epsilon_light/apps/atomic_icon.png diff --git a/themes/themes/local/omega_dark.json b/themes/themes/local/omega_dark.json index 0426dc2f9..ecd0a2f16 100644 --- a/themes/themes/local/omega_dark.json +++ b/themes/themes/local/omega_dark.json @@ -142,7 +142,9 @@ "Halogen": "00debd", "ReactiveNonmetal": "00ee00", "NobleGas": "8baaff", - "TableLines": "323532" + "TableLines": "323532", + "Highlight": "000000", + "Background": "d9d9d9" } } } diff --git a/themes/themes/local/omega_dark/apps/atom_icon.png b/themes/themes/local/omega_dark/apps/atomic_icon.png similarity index 100% rename from themes/themes/local/omega_dark/apps/atom_icon.png rename to themes/themes/local/omega_dark/apps/atomic_icon.png diff --git a/themes/themes/local/omega_light.json b/themes/themes/local/omega_light.json index 1e4ecf3da..7192e6a4c 100644 --- a/themes/themes/local/omega_light.json +++ b/themes/themes/local/omega_light.json @@ -142,7 +142,9 @@ "Halogen": "00debd", "ReactiveNonmetal": "00ee00", "NobleGas": "8baaff", - "TableLines": "323532" + "TableLines": "323532", + "Highlight": "000000", + "Background": "d9d9d9" } } } diff --git a/themes/themes/local/omega_light/apps/atom_icon.png b/themes/themes/local/omega_light/apps/atomic_icon.png similarity index 100% rename from themes/themes/local/omega_light/apps/atom_icon.png rename to themes/themes/local/omega_light/apps/atomic_icon.png