From efc8ea6a96a6e01e440467cca6bc16624787cdcb Mon Sep 17 00:00:00 2001
From: eAndrew <eAndrew@kolibrios.org>
Date: Mon, 28 Oct 2013 21:23:33 +0000
Subject: [PATCH] Docky v0.4.1 Skins deleted

git-svn-id: svn://kolibrios.org@4121 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 data/rus/settings/Docky skins/dark    |  5 -----
 data/rus/settings/Docky skins/default |  5 -----
 data/rus/settings/docky.ini           |  5 ++++-
 programs/system/docky/trunk/docky.asm | 16 ++++------------
 4 files changed, 8 insertions(+), 23 deletions(-)
 delete mode 100644 data/rus/settings/Docky skins/dark
 delete mode 100644 data/rus/settings/Docky skins/default

diff --git a/data/rus/settings/Docky skins/dark b/data/rus/settings/Docky skins/dark
deleted file mode 100644
index 4f226311d7..0000000000
--- a/data/rus/settings/Docky skins/dark	
+++ /dev/null
@@ -1,5 +0,0 @@
-[skin]
-bg=	 079,079,095
-frame=	 000,000,000
-framein= 255,255,255
-text=	 255,255,255
\ No newline at end of file
diff --git a/data/rus/settings/Docky skins/default b/data/rus/settings/Docky skins/default
deleted file mode 100644
index e6d98b3edb..0000000000
--- a/data/rus/settings/Docky skins/default	
+++ /dev/null
@@ -1,5 +0,0 @@
-[skin]
-bg=	 225,225,225
-frame=	 144,152,176
-framein= 194,202,224
-text=	 000,000,000
\ No newline at end of file
diff --git a/data/rus/settings/docky.ini b/data/rus/settings/docky.ini
index 612636886a..5b91f74fea 100644
--- a/data/rus/settings/docky.ini
+++ b/data/rus/settings/docky.ini
@@ -6,7 +6,10 @@
 
 location=1
 
-skin=default
+bg=	 225,225,225
+frame=	 144,152,176
+framein= 194,202,224
+text=	 000,000,000
 
 [” ©«ë]
 path=/sys/file managers/eolite
diff --git a/programs/system/docky/trunk/docky.asm b/programs/system/docky/trunk/docky.asm
index ea4948b069..da0ce31773 100644
--- a/programs/system/docky/trunk/docky.asm
+++ b/programs/system/docky/trunk/docky.asm
@@ -37,15 +37,13 @@ proc main
     invoke  ini.get_int, ini_data.file_name, ini_data.settings_name, ini_data.location_name, -1
     mov     [dock_items.location], eax
 
-    invoke  ini.get_str, ini_data.file_name, ini_data.settings_name, ini_data.skin_name, ini_data.skin_file, 32, 0
-
-    invoke  ini.get_color, ini_data.skin_dir, ini_data.skin_name, ini_data.color_bg, 0x0
+    invoke  ini.get_color, ini_data.file_name, ini_data.settings_name, ini_data.color_bg, 0x0
     mov     [color.bg], eax
-    invoke  ini.get_color, ini_data.skin_dir, ini_data.skin_name, ini_data.color_frame, 0xFFFFFF
+    invoke  ini.get_color, ini_data.file_name, ini_data.settings_name, ini_data.color_frame, 0xFFFFFF
     mov     [color.frame], eax
-    invoke  ini.get_color, ini_data.skin_dir, ini_data.skin_name, ini_data.color_framein, 0x888888
+    invoke  ini.get_color, ini_data.file_name, ini_data.settings_name, ini_data.color_framein, 0x888888
     mov     [color.framein], eax
-    invoke  ini.get_color, ini_data.skin_dir, ini_data.skin_name, ini_data.color_text, 0xFFFFFF
+    invoke  ini.get_color, ini_data.file_name, ini_data.settings_name, ini_data.color_text, 0xFFFFFF
     or	    eax, 0x80000000
     mov     [color.text], eax
 
@@ -732,10 +730,6 @@ img_data:
 ini_data:
  .file_name:
     db	    "/sys/settings/Docky.ini", 0
- .skin_dir:
-    db	    "/sys/settings/Docky skins/"
- .skin_file:
-    db	    32 dup(0)
  .path_name:
     db	    "path", 0
  .param_name:
@@ -749,8 +743,6 @@ ini_data:
     db	    "@SETTINGS", 0
  .location_name:
     db	    "location", 0
- .skin_name:
-    db	    "skin", 0
  .color_bg:
     db	    "bg", 0
  .color_frame: