diff --git a/skins/_old/gliteskin/gliteskin_deepsky/default.dtp b/skins/_old/gliteskin/gliteskin_deepsky/default.dtp index 8f6f4e8f5a..8d0d502ec0 100644 Binary files a/skins/_old/gliteskin/gliteskin_deepsky/default.dtp and b/skins/_old/gliteskin/gliteskin_deepsky/default.dtp differ diff --git a/skins/_old/gliteskin/gliteskin_deepsky/default.dtp.asm b/skins/_old/gliteskin/gliteskin_deepsky/default.dtp.asm index dedf41e6ea..901f0a6de9 100644 --- a/skins/_old/gliteskin/gliteskin_deepsky/default.dtp.asm +++ b/skins/_old/gliteskin/gliteskin_deepsky/default.dtp.asm @@ -1,11 +1,11 @@ ;SYSTEM COLORS (.DTP) - COMPILE WITH FASM -frame dd 0x487cad -grab dd 0x83BAEE -grab_button dd 0xf2f0ee -grab_button_text dd 0x3a3a38 -grab_text dd 0xFFFFFF -work dd 0xEBE9E3 -work_button dd 0xEBE9E3 -work_button_text dd 0x000000 -work_text dd 0x000000 -work_graph dd 0xCCC6BB \ No newline at end of file +unused1 dd 0x2d2d2d +unused2 dd 0x2d2d2d +work_3d_dark dd 0xE6E6E6 +work_3d_light dd 0xFBFCFC +window_title dd 0xFFFFFF +work dd 0xEBE9E3 +work_button dd 0xEEEEEE +work_button_text dd 0x000000 +work_text dd 0x000000 +work_graph dd 0xCCC6BB \ No newline at end of file diff --git a/skins/_old/gliteskin/gliteskin_deepsky/dtp_build.bat b/skins/_old/gliteskin/gliteskin_deepsky/dtp_build.bat deleted file mode 100644 index 2fddee0e38..0000000000 --- a/skins/_old/gliteskin/gliteskin_deepsky/dtp_build.bat +++ /dev/null @@ -1,2 +0,0 @@ -fasm default.dtp.asm default.dtp -pause \ No newline at end of file diff --git a/skins/_old/gliteskin/gliteskin_deepsky/pack_build.bat b/skins/_old/gliteskin/gliteskin_deepsky/pack_build.bat deleted file mode 100644 index 7e7d474b2c..0000000000 --- a/skins/_old/gliteskin/gliteskin_deepsky/pack_build.bat +++ /dev/null @@ -1 +0,0 @@ -kpack default.skn default.pack.skn diff --git a/skins/_old/gliteskin/gliteskin_deepsky/skn_build.bat b/skins/_old/gliteskin/gliteskin_deepsky/skn_build.bat index 2828114c6b..6a9513989e 100644 --- a/skins/_old/gliteskin/gliteskin_deepsky/skn_build.bat +++ b/skins/_old/gliteskin/gliteskin_deepsky/skn_build.bat @@ -1,2 +1,3 @@ +fasm default.dtp.asm default.dtp fasm default.asm default.skn pause \ No newline at end of file diff --git a/skins/_old/gliteskin/gliteskin_red/default.dtp b/skins/_old/gliteskin/gliteskin_red/default.dtp index b60ed51aab..740a1358a4 100644 Binary files a/skins/_old/gliteskin/gliteskin_red/default.dtp and b/skins/_old/gliteskin/gliteskin_red/default.dtp differ diff --git a/skins/_old/gliteskin/gliteskin_red/default.dtp.asm b/skins/_old/gliteskin/gliteskin_red/default.dtp.asm index 9b77ed4ce7..3306ec8ca8 100644 --- a/skins/_old/gliteskin/gliteskin_red/default.dtp.asm +++ b/skins/_old/gliteskin/gliteskin_red/default.dtp.asm @@ -1,11 +1,11 @@ ;SYSTEM COLORS (.DTP) - COMPILE WITH FASM -frame dd 0x8a3131 -grab dd 0xD94040 -grab_button dd 0xe6e1e1 -grab_button_text dd 0x393838 +unused1 dd 0x8a3131 +unused2 dd 0xD94040 +work_3d_dark dd 0xD3D3D3 +work_3d_light dd 0xFBFCFC grab_text dd 0xFFFFFF work dd 0xE6E1E1 work_button dd 0xE6E1E1 work_button_text dd 0x000000 work_text dd 0x000000 -work_graph dd 0xA59999 \ No newline at end of file +work_graph dd 0xA59999 diff --git a/skins/_old/gliteskin/gliteskin_red/dtp_build.bat b/skins/_old/gliteskin/gliteskin_red/dtp_build.bat deleted file mode 100644 index 2fddee0e38..0000000000 --- a/skins/_old/gliteskin/gliteskin_red/dtp_build.bat +++ /dev/null @@ -1,2 +0,0 @@ -fasm default.dtp.asm default.dtp -pause \ No newline at end of file diff --git a/skins/_old/gliteskin/gliteskin_red/pack_build.bat b/skins/_old/gliteskin/gliteskin_red/pack_build.bat deleted file mode 100644 index 7e7d474b2c..0000000000 --- a/skins/_old/gliteskin/gliteskin_red/pack_build.bat +++ /dev/null @@ -1 +0,0 @@ -kpack default.skn default.pack.skn diff --git a/skins/_old/gliteskin/gliteskin_red/skn_build.bat b/skins/_old/gliteskin/gliteskin_red/skn_build.bat index 2828114c6b..6a9513989e 100644 --- a/skins/_old/gliteskin/gliteskin_red/skn_build.bat +++ b/skins/_old/gliteskin/gliteskin_red/skn_build.bat @@ -1,2 +1,3 @@ +fasm default.dtp.asm default.dtp fasm default.asm default.skn pause \ No newline at end of file diff --git a/skins/_old/mage-scroll/ReadMe.txt b/skins/_old/mage-scroll/ReadMe.txt deleted file mode 100644 index 05ba1af7e8..0000000000 --- a/skins/_old/mage-scroll/ReadMe.txt +++ /dev/null @@ -1,7 +0,0 @@ -Used standart skin codes at KolibriOS -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; ;; -;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;; -;; Distributed under terms of the GNU General Public License ;; -;; ;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; \ No newline at end of file diff --git a/skins/_old/mage-scroll/Tupfile.lua b/skins/_old/mage-scroll/Tupfile.lua index 3d777d20da..58bf53e602 100644 --- a/skins/_old/mage-scroll/Tupfile.lua +++ b/skins/_old/mage-scroll/Tupfile.lua @@ -1,2 +1,3 @@ if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("default.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "mage-scroll.skn") +tup.rule("colour.asm", 'fasm "%f" "%o"', "colour.dtp") +tup.rule({"default.asm", extra_inputs = {"colour.dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "mage-scroll.skn") diff --git a/skins/_old/mage-scroll/colour.asm b/skins/_old/mage-scroll/colour.asm index d3a97ea5ba..71168455b3 100644 --- a/skins/_old/mage-scroll/colour.asm +++ b/skins/_old/mage-scroll/colour.asm @@ -2,10 +2,10 @@ ;to created file colour.dtp ;for sets this system_colors in skin ;-------------------------------------- -dd 0x8795A5 ;; .frame -dd 0xACBFD4 ;; .grab -dd 0x8EB1D2 ;; .grab_button -dd 0x9E0404 ;; .grab_button_text +dd 0x8795A5 ;; .unused1 +dd 0xACBFD4 ;; .unused2 +dd 0x136CA6 ;; .dark +dd 0xF5F8F9 ;; .light dd 0x040404 ;; .grab_text dd 0xD2D8E0 ;; .work dd 0x3D6D94 ;; .work_button diff --git a/skins/_old/mage-scroll/colour.dtp b/skins/_old/mage-scroll/colour.dtp deleted file mode 100644 index dd7b5db8b9..0000000000 Binary files a/skins/_old/mage-scroll/colour.dtp and /dev/null differ diff --git a/skins/_old/mage-scroll/default.asm b/skins/_old/mage-scroll/default.asm index d24349899d..4b204b323c 100644 --- a/skins/_old/mage-scroll/default.asm +++ b/skins/_old/mage-scroll/default.asm @@ -9,7 +9,7 @@ include 'skin.inc' SKIN_PARAMS \ height = bmp_base.height,\ ; skin height - margins = [12:1:43:1],\ ; margins [left:top:right:bottom] + margins = [12:2:43:1],\ ; margins [left:top:right:bottom] colors active = [binner=0x00081d:\ ; border inner color bouter=0x00081d:\ ; border outer color bframe=0x4269A4],\ ; border frame color diff --git a/skins/_old/mist/default.dtp b/skins/_old/mist/default.dtp index 03f4249360..170b348359 100644 Binary files a/skins/_old/mist/default.dtp and b/skins/_old/mist/default.dtp differ diff --git a/skins/_old/mist/default.dtp.asm b/skins/_old/mist/default.dtp.asm index 203d027b62..1d7650de4e 100644 --- a/skins/_old/mist/default.dtp.asm +++ b/skins/_old/mist/default.dtp.asm @@ -2,7 +2,7 @@ frame dd 0xf4f4f4 grab dd 0xFFFfff grab_button dd 0xb1b1b1 -grab_button_text dd 0x606060 +grab_button_text dd 0xEEEEEE grab_text dd 0x606060 work dd 0xf4f4f4 work_button dd 0xebebeb diff --git a/skins/_old/mist/dtp_build.bat b/skins/_old/mist/dtp_build.bat deleted file mode 100644 index 2fddee0e38..0000000000 --- a/skins/_old/mist/dtp_build.bat +++ /dev/null @@ -1,2 +0,0 @@ -fasm default.dtp.asm default.dtp -pause \ No newline at end of file diff --git a/skins/_old/mist/pack_build.bat b/skins/_old/mist/pack_build.bat deleted file mode 100644 index 7e7d474b2c..0000000000 --- a/skins/_old/mist/pack_build.bat +++ /dev/null @@ -1 +0,0 @@ -kpack default.skn default.pack.skn diff --git a/skins/_old/mist/skn_build.bat b/skins/_old/mist/skn_build.bat index 2828114c6b..6a9513989e 100644 --- a/skins/_old/mist/skn_build.bat +++ b/skins/_old/mist/skn_build.bat @@ -1,2 +1,3 @@ +fasm default.dtp.asm default.dtp fasm default.asm default.skn pause \ No newline at end of file diff --git a/skins/_old/skin_ser/colors.dtp b/skins/_old/skin_ser/colors.dtp index 47d51f9e42..6912b0a6d0 100644 Binary files a/skins/_old/skin_ser/colors.dtp and b/skins/_old/skin_ser/colors.dtp differ