default.skn: update to Shkvorka 2.1, move arcanii game to cd version, desktop app: wider buttons

git-svn-id: svn://kolibrios.org@6033 a494cfbc-eb01-0410-851d-a64ba20cac60

data/Tupfile.lua

@@ -333,7 +333,6 @@ tup.append_table(img_files, {
  {"File Managers/KFM", PROGS .. "/fs/kfm/trunk/kfm"},
  {"File Managers/OPENDIAL", PROGS .. "/fs/opendial/opendial"},
  {"GAMES/15", PROGS .. "/games/15/trunk/15"},
- {"GAMES/ARCANII", PROGS .. "/games/arcanii/trunk/arcanii"},
  {"GAMES/FREECELL", PROGS .. "/games/freecell/freecell"},
  {"GAMES/GOMOKU", PROGS .. "/games/gomoku/trunk/gomoku"},
  {"GAMES/KLAVISHA", PROGS .. "/games/klavisha/trunk/klavisha"},
@@ -428,9 +427,9 @@ tup.append_table(extra_files, {
  {"HD_Load/USB_Boot/", PROGS .. "/hd_load/usb_boot/setmbr.exe"},
  {"HD_Load/USB_boot_old/", PROGS .. "/hd_load/usb_boot_old/MeOSload.com"},
  {"HD_Load/USB_boot_old/", PROGS .. "/hd_load/usb_boot_old/enable.exe"},
+ {"kolibrios/games/arcanii", PROGS .. "/games/arcanii/trunk/arcanii"},
  {"kolibrios/games/codemaster/binary_master", PROGS .. "/games/codemaster/binary_master"},
  {"kolibrios/games/codemaster/hang_programmer", PROGS .. "/games/codemaster/hang_programmer"},
-
  {"kolibrios/games/codemaster/kolibri_puzzle", PROGS .. "/games/codemaster/kolibri_puzzle"},
  {"kolibrios/games/invaders", PROGS .. "/games/invaders/invaders"},
  {"kolibrios/media/zsea/zsea", PROGS .. "/media/zsea/zSea"},

data/common/settings/game_center.ini

@@ -25,7 +25,7 @@ Pong=/sys/games/pong,79
 Pong3=/sys/games/pong3,12
 RocketForces=/sys/games/rforces
 Pig=/kolibrios/games/pig/pig
-Arcanii=/sys/games/arcanii,12
+Arcanii=/kolibrios/games/arcanii,12
 Padenie=/sys/games/padenie
 Xonix=/sys/games/xonix,21
 Ataka=/sys/games/ataka

programs/system/desktop/trunk/desktop.asm

@@ -510,7 +510,7 @@ draw_window:
 ;-----------------------------------
 ; select color DTP frame
 ; LOAD BUTTON	; button 12
-	mcall	8,<frame_1.x+10,load_w>,<frame_1.y+25,15>,12,[w_work_button]
+	mcall	8,<frame_1.x+10,load_w>,<frame_1.y+25,18>,12,[w_work_button]
 ; SAVE BUTTON
 	add	ebx,(load_w+2)*65536-load_w+save_w
 	inc	edx
@@ -519,11 +519,11 @@ draw_window:
 	mov	ebx,(frame_1.x + frame_1.width - apply_w - 15)*65536+apply_w
 	mcall	8,,,16	; button 17
 ; select color DTP button text
-	mcall	4,<frame_1.x+16,frame_1.y+29>,[w_work_button_text],t1,t1.size
+	mcall	4,<frame_1.x+16,frame_1.y+31>,[w_work_button_text],t1,t1.size
 ;-----------------------------------	
 ; select skin frame	
 ; LOAD SKIN BUTTON	; button 17
-	mcall	8,<frame_2.x+10,load_w>,<frame_2.y+25,15>,17,[w_work_button]
+	mcall	8,<frame_2.x+10,load_w>,<frame_2.y+25,18>,17,[w_work_button]
 ; 3D
 	mov	ebx,(frame_2.x+155)*65536+34
 	mcall	,,,14	; button 14
@@ -535,7 +535,7 @@ draw_window:
 	mov	ebx,(frame_2.x + frame_2.width - apply_w -15)*65536+apply_w
 	mcall	,,,18		; button 18
 ; select skin button text
-	mcall	4,<frame_2.x+16,frame_2.y+29>,[w_work_button_text],t2,t2.size
+	mcall	4,<frame_2.x+16,frame_2.y+31>,[w_work_button_text],t2,t2.size
 ;-----------------------------------		
 	call	draw_button_row
 	call	draw_button_row_of_texts

skins/_old/Leency/Shkvorka/default.asm

@@ -3,12 +3,12 @@ include '..\me_skin.inc'
 SKIN_PARAMS \
   height          = bmp_center1.height,\  ; skin height
   margins         = [6:5:43:3],\          ; margins [left:top:right:bottom]
-  colors active   = [binner=0xE4DFE1:\    ; border inner
+  colors active   = [binner=0xDDD7CF:\    ; border inner
                      bouter=0x646464:\    ; border outer
-                     bframe=0xE4DFE1],\   ; border middle
-  colors inactive = [binner=0xE4DFE1:\    ; border inner
+                     bframe=0xDDD7CF],\   ; border middle
+  colors inactive = [binner=0xDDD7CF:\    ; border inner
                      bouter=0x646464:\    ; border outer
-                     bframe=0xE4DFE1],\   ; border middle
+                     bframe=0xDDD7CF],\   ; border middle
   dtp             = 'default.dtp'          ; dtp colors
 
 SKIN_BUTTONS \

skins/_old/Leency/Shkvorka/default.dtp.asm

@@ -5,8 +5,8 @@ struc system_colors
   .grab_button      dd 0x000000
   .grab_button_text dd 0x000000
   .grab_text        dd 0x333333
-  .work             dd 0xE4DFE1
-  .work_button      dd 0x7288B1
+  .work             dd 0xDDD7CF
+  .work_button      dd 0x7887A6
   .work_button_text dd 0xFEFEFE
   .work_text        dd 0x000000
   .work_graph       dd 0x7E7E7E