keXa/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

settime area refactoring

Browse Source 
git-svn-id: svn://kolibrios.org@3894 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
heavyiron 2013-09-07 05:27:08 +00:00
parent 3c8c7263cc
commit 00d4cb2df8
2 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
programs/system/calendar/trunk/calendar.asm
View File

@ -470,14 +470,14 @@ draw_clock:
mcall 3 mcall 3
mov ecx,eax mov ecx,eax
mcall 47,0x00020100, ,205*65536+280,0x50000000,COL_WINDOW_BG mcall 47,0x00020100, ,198*65536+287,0x50000000,COL_WINDOW_BG
shr ecx,8 shr ecx,8
add edx,20*65536 add edx,22*65536
mcall mcall
shr ecx,8 shr ecx,8
add edx,20*65536 add edx,22*65536
mcall mcall
ret ret
@ -492,48 +492,49 @@ draw_window:
mcall 13,B_WBAR_X, ,COL_TOOLBAR_BG ; draw toolbar background mcall 13,B_WBAR_X, ,COL_TOOLBAR_BG ; draw toolbar background
call draw_week call draw_week
mcall 8,205*65536+7,290*65536+10,72,COL_TIME_BUTTONS mcall 8,196*65536+8,272*65536+10,72,COL_DATE_BUTTONS
mov ebx,212*65536+7 mov ebx,205*65536+8
inc edx inc edx
mcall mcall
mov ebx,205*65536+7 mov ebx,196*65536+8
mov ecx,300*65536+10 mov ecx,298*65536+10
inc edx inc edx
mcall mcall
mov ebx,212*65536+7 mov ebx,205*65536+8
inc edx inc edx
mcall mcall
mov ebx,225*65536+7 mov ebx,218*65536+8
mov ecx,290*65536+10 mov ecx,272*65536+10
inc edx inc edx
mcall mcall
mov ebx,232*65536+7 mov ebx,227*65536+8
inc edx inc edx
mcall mcall
mov ebx,225*65536+7 mov ebx,218*65536+8
mov ecx,300*65536+10 mov ecx,298*65536+10
inc edx inc edx
mcall mcall
mov ebx,232*65536+7 mov ebx,227*65536+8
inc edx inc edx
mcall mcall
mov ebx,244*65536+14 mov ebx,240*65536+21
mov ecx,290*65536+20 mov ecx,273*65536+35
inc edx inc edx
or edx,0x40000000
mcall mcall
mov ebx,14*65536+110 mov ebx,14*65536+110
mov ecx,285*65536+22 mov ecx,285*65536+22
mov esi,COL_DATE_BUTTONS mov esi,COL_DATE_BUTTONS
inc edx mov edx,81
mcall mcall
mov esi,COL_MONTH_YEAR_B ; new style mov esi,COL_MONTH_YEAR_B ; new style
@ -559,11 +560,15 @@ draw_window:
call draw_days call draw_days
; draw text in window ; draw text in window
mcall 4,162*65536+280,0x800000ff,sys_text mcall 4,153*65536+287,0x80000000,sys_text
mcall ,180*65536+302,0x800000ff,minus mcall 4,183*65536+287, ,separator
mcall ,180*65536+292,0x80ff0000,plus mcall ,214*65536+287
mcall ,236*65536+287
mcall ,188*65536+274, ,plus
mcall ,188*65536+300, ,minus
mcall , 24*65536+292,0x00000000,set_date_t,15 ;set date text mcall , 24*65536+292,0x00000000,set_date_t,15 ;set date text
mov ecx,0x10ddeeff mov ecx,0x10ddeeff
mov edx,n_style mov edx,n_style
mov esi,ns_end-n_style mov esi,ns_end-n_style

11
programs/system/calendar/trunk/data.inc
View File

@ -296,14 +296,15 @@ dropped db 0
sys_text: sys_text:
if lang eq ru if lang eq ru
db '∴•:',0 db '∴•',0
else if lang eq it else if lang eq it
db ' Ora:',0 db ' Ora',0
else else
db ' Time:',0 db ' Time',0
end if end if
plus db '(+)',0 separator db ':',0
minus db '(-)',0 plus db '+',0
minus db '-',0
set_date_t: set_date_t:
if lang eq ru if lang eq ru
db '“áâ ­®¢¨âì ¤ âã',0 db '“áâ ­®¢¨âì ¤ âã',0