Merge pull request #495 from M4xi1m3/omega-atomic

[apps] Replaced atom with atomic

.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

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
+Default,calculation,rpn,graph,code,statistics,probability,solver,atomic,sequence,regression,settings
+HidePython,calculation,rpn,graph,code,statistics,probability,solver,atomic,sequence,regression,settings

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

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) {

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",

themes/themes/local/epsilon_dark.json

@@ -142,7 +142,9 @@
             "Halogen": "00debd",
             "ReactiveNonmetal": "00ee00",
             "NobleGas": "8baaff",
-            "TableLines": "323532"
+            "TableLines": "323532",
+            "Highlight": "000000",
+            "Background": "d9d9d9"
         }
     }
 }

themes/themes/local/epsilon_light.json

@@ -142,7 +142,9 @@
             "Halogen": "00debd",
             "ReactiveNonmetal": "00ee00",
             "NobleGas": "8baaff",
-            "TableLines": "323532"
+            "TableLines": "323532",
+            "Highlight": "000000",
+            "Background": "d9d9d9"
         }
     }
 }

themes/themes/local/omega_dark.json

@@ -142,7 +142,9 @@
             "Halogen": "00debd",
             "ReactiveNonmetal": "00ee00",
             "NobleGas": "8baaff",
-            "TableLines": "323532"
+            "TableLines": "323532",
+            "Highlight": "000000",
+            "Background": "d9d9d9"
         }
     }
 }

themes/themes/local/omega_light.json

@@ -142,7 +142,9 @@
             "Halogen": "00debd",
             "ReactiveNonmetal": "00ee00",
             "NobleGas": "8baaff",
-            "TableLines": "323532"
+            "TableLines": "323532",
+            "Highlight": "000000",
+            "Background": "d9d9d9"
         }
     }
 }