WebSVN – Kolibri OS – Path Comparison – / – /programs/system/calendar/ Rev 3888 and /programs/system/calendar/ Rev 3889

Regard whitespace Rev 3888 → Rev 3889

/programs/system/calendar/trunk/scr
Property changes:
Deleted: tsvn:logminsize
-5
\ No newline at end of property

 /programs/system/calendar/trunk/calendar.asm
 ,6 → 1,6
 ; Calendar for KolibriOS
 ;
-; v1.2 - code update by Leency, small design fixes
+; v1.3 - code update, redesign by Leency
 ; v1.1 - add change time support by DedOK
 ; v1.0 - written in pure assembler by Ivushkin Andrey aka Willow
 ; also - diamond, spraid, fedesco
 ,46 → 7,7
 ;
 ; Created: November 1, 2004
-WIN_CW equ 266
-WIN_X equ (5000 shl 16+WIN_CW+9)
-WIN_Y equ (100 shl 16+335)
-LINE1     equ 27 shl 16+16
-B_MONTH_X equ 5 shl 16+158+11
-B_Y       equ LINE1
-B_MONTH   equ 63 shl 16+32
-B_WBAR_X  equ 5 shl 16+WIN_CW
-B_WBAR_Y  equ 64 shl 16+20
-B_WEEK    equ 30 shl 16+70
-B_WX_SHIFT equ 32 shl 16
-B_DBAR_X  equ B_WBAR_X
-B_DBAR_Y  equ 85 shl 16+190
-B_DROP    equ B_MONTH+16
-B_DAYS_Y  equ 100
-B_DAYS_SHIFT equ 30
-B_YEAR_X  equ 173 shl 16+58
-B_YEAR    equ 188 shl 16+32
-B_TODAY_X equ 25 shl 16
-B_TODAY_Y equ 48 shl 16+10
-B_TODAY   equ 30 shl 16+50
-B_SPIN_WIDTH equ 13
-B_SPIN_X  equ 234 shl 16+B_SPIN_WIDTH
-B_SPIN    equ 238 shl 16+32
-B_NS_X    equ 185 shl 16+75
-B_NS_Y    equ 48 shl 16+10
-B_NS      equ 190 shl 16+50
-FOCUSABLE equ 5
 use32                ; ¢ª«îç¨âì 32-¡¨âë© à¥¦¨¬  áá¥¬¡«¥à
   org    0x0         ;  ¤à¥á æ¨ï á ã«ï
 ,13 → 39,19
      jmp  .exit
    .nofocus:
    if reg eq
-     mov  ecx,0x10000000
+     mov  ecx,COL_DROPDOWN_T
    else
-     mov  reg,0x10000000
+     mov  reg,COL_DROPDOWN_T
    end if
    .exit:
 }
+macro GetSkinHeight
+{
+        mov  eax,48
+        mov  ebx,4
+        int 0x40
+}
 str2int:
 ,9 → 87,7
 still:                  ;
-    mov  eax,23                 ; wait here for event
-    mov  ebx,50
-    mcall
+    mcall 23,50     ; wait here for event
   .evt:
     mov  ebp,[focus]
     cmp  eax,1          ; ¯¥à¥à¨á®¢ âì ®ª® ?
 ,9 → 101,8
     jmp  still          ; ¥á«¨ ¤àã£®¥ á®¡ëâ¨¥ - ¢  ç «® æ¨ª«
-  key:                  ;  ¦ â  ª« ¢¨è    ª« ¢¨ âãà¥
-    mov  eax,2          ; äãªæ¨ï 2 - áç¨â âì ª®¤ á¨¬¢®«
-    mcall               ; ¢ë§®¢ á¨áâ¥¬ë
+  key:
+    mcall 2             ; get pressed key
     cmp  ah,9
     jne  no_tab
   .tab:
 ,9 → 169,8
 day_bounds db -1,0,7,0,-7,0,1,0 ; left,down,up,right
-  button:               ;  ¦ â  ª®¯ª  ¢ ®ª¥ ¯à®£à ¬¬ë
-    mov  eax,17         ; 17 - ¯®«ãç¨âì ¨¤¥â¨ä¨ª â®à  ¦ â®© ª®¯ª¨
-    mcall               ; ¢ë§®¢ á¨áâ¥¬ë
+  button:
+    mcall 17    ; 17 - ¯®«ãç¨âì ¨¤¥â¨ä¨ª â®à  ¦ â®© ª®¯ª¨
     movzx ebx,ah
     cmp  ah,200
     jbe  nodayselect
 ,33 → 323,22
     jmp  still
 plus_hd:
-    mov  eax,3
-    mcall
+    mcall 3
     mov  ecx,eax
     add  ecx,1
     mov  eax,22
-    mov  ebx,0x00000000
-    mcall
+    mcall 22,0x00000000
     jmp  still
 plus_he:
-    mov  eax,3
-    mcall
+    mcall 3
     mov  ecx,eax
     add  ecx,16
-    mov  eax,22
-    mov  ebx,0x00000000
-    mcall
+    mcall 22,0x00000000
     jmp  still
 minus_hd:
-    mov  eax,3
-    mcall
+    mcall 3
     mov  ecx,eax
     sub  ecx,1
     mov  eax,22
 ,13 → 446,13
 draw_window:
-    mcall 12,1 ; äãªæ¨ï 12: á®®¡é¨âì  ®¡ ®âà¨á®¢ª¥ ®ª
-    xor  eax,eax        ; äãªæ¨ï 0 : ®¯à¥¤¥«¨âì ¨ ®âà¨á®¢ âì ®ª®
-    mov  ebx,WIN_X
-    mov  ecx,WIN_Y-15
-    mov  edx,COL_WINDOW_BG         ; æ¢¥â à ¡®ç¥© ®¡« áâ¨  RRGGBB,8->color gl
-    mov  edi,title                 ; § £®«®¢®ª
-    mcall
+    mcall 12,1
+    mcall 0,WIN_X,WIN_Y-15,COL_WINDOW_BG, ,title ; define window
+        GetSkinHeight
+        mov ecx, eax
+        shl ecx, 16
+        add ecx, 43
+        mcall 13,B_WBAR_X, ,COL_TOOLBAR_BG ; draw toolbar background
     call draw_week
     mcall 8,205*65536+7,290*65536+10,72,COL_TIME_BUTTONS
 ,25 → 470,25
     inc  edx
     mcall
-    mov  ebx,224*65536+7
+    mov  ebx,225*65536+7
     mov  ecx,290*65536+10
     inc  edx
     mcall
-    mov  ebx,231*65536+7
+    mov  ebx,232*65536+7
     inc  edx
     mcall
-    mov  ebx,224*65536+7
+    mov  ebx,225*65536+7
     mov  ecx,300*65536+10
     inc  edx
     mcall
-    mov  ebx,231*65536+7
+    mov  ebx,232*65536+7
     inc  edx
     mcall
-    mov  ebx,243*65536+14
+    mov  ebx,244*65536+14
     mov  ecx,290*65536+20
     inc  edx
     mcall
 ,11 → 495,11
     mov  ebx,14*65536+110
     mov  ecx,285*65536+22
-    mov  esi,0x00d5d5d5
+    mov  esi,COL_DATE_BUTTONS
     inc  edx
     mcall
-    mov  esi,COL_MONTH_YEAR_B
+    mov  esi,COL_MONTH_YEAR_B   ; new style
     mov  edx,10
     or   edx,1 shl 29+1 shl 30
     mov  ebx,B_NS_X
 ,10 → 513,10
     mov  ebx,B_MONTH_X
     mov  edx,2
     mcall
-    mov  ebx,B_SPIN_X
+    mov  ebx,B_SPIN_X ; <
     inc  edx
     mcall
-    add  ebx,B_SPIN_WIDTH shl 16
+    add  ebx,61 shl 16 ; >
     inc  edx
     mcall
     call draw_days
 ,7 → 549,7
     mov  ebx,B_SPIN
     mov  edx,spinner
-    mov  esi,3
+    mov  esi,12
     ShowFocus 4
     mcall
 ,7 → 564,7
     call draw_year
     mov  [dropped],0
     mcall 12,2
-    ret                            ; ¢ëå®¤¨¬ ¨§ ¯à®æ¥¤ãàë
+    ret
 draw_year:
     mcall 8,B_YEAR_X,B_Y,5,COL_MONTH_YEAR_B
 ,11 → 585,8
   .ddd_loop:
     mov  edi,edx
     push ecx
-    mov  ebx,B_MONTH_X
-    mov  ecx,[esp+4]
-    mov  esi,0x6f9fef
-    mov  eax,8
-    mcall
+    mov  esi,COL_DROPDOWN_BG
+    mcall 8,B_MONTH_X,[esp+4]
     shr  eax,1
     mov  ebx,[esp+8]
     xchg edx,[esp+12]
 ,11 → 632,6
     ret
 draw_days:
-    mov  eax,13
-    mov  ebx,B_DBAR_X
-    mov  ecx,B_DBAR_Y
-    mov  edx,COL_DATES_BG
-    mcall
     call count_days
     cmp  ecx,[day_sel]
     jae  .ok
 ,7 → 640,7
     mov  [number],0
     mov  eax,47
     mov  edx,B_DAYS_Y
-    mov  ebx,0x20001
+    mov  ebx,0x10001
     mov  edi,[firstday]
   .dayloop:
     push ecx
 ,12 → 647,12
     movzx edx,dx
     mov  esi,edi
     shl  esi,21
-    lea  edx,[edx+esi+29 shl 16]
+    lea  edx,[edx+esi+34 shl 16]
     mov  ecx,edi
     add  cl,[week_days+1]
     cmp  ecx,7
     je   .holiday
-    mov  esi,0x10000000
+    mov  esi,0x10000000 ; COL_DATE_TEXT
     jmp  .noholiday
   .holiday:
     mov  esi,0x10cc1010
 ,13 → 678,31
     mov  esi,COL_DATE_CHANGED
   .draw_but:
     add  edx,200+1 shl 29
-    mov  eax,8
-    mcall
+    mcall 8
+        mov    eax, [number]
+    xor    edx, edx
+    mov    ecx, 10
+    div    ecx
+    mov    [remainder], edx
+    mov    [quotient],  eax
     popa
+        ;first number
+        mov ecx,quotient
     mcall
         add edx,1 shl 16
         mcall
         sub edx,1 shl 16
+        ;second number
+        mov ecx,remainder
+        add edx,9 shl 16
+    mcall
+        add edx,1 shl 16
+        mcall
+        sub edx,10 shl 16
     pop  ecx
     inc  edi
     cmp  edi,7
 ,7 → 792,8
     mov  [firstday],edx
     ret
-I_END:  ; ª®¥æ ¯à®£à ¬¬ë
+I_END:
 firstday  dd ?
 Year dd   ?
 Month dd  ?

 /programs/system/calendar/trunk/data.inc
 ,18 → 1,60
 ; program data: colors, text, vars (todo)
 ; colors
-COL_WINDOW_BG    equ 0x14aabbcc
+COL_WINDOW_BG    equ 0x14E7E7E7
+COL_TOOLBAR_BG   equ 0x555555
 COL_WEEKDAY_BG   equ 0xCCCDDD
-COL_DATES_BG     equ 0xE7E7E7
-COL_DATE_BUTTONS equ 0xE7E7E7
+COL_DATE_BUTTONS equ 0xF3F3F3
 COL_DATE_CURRENT equ 0x31A4D0
 COL_DATE_CHANGED equ 0xef7840
 COL_TIME_BUTTONS equ 0x5555dd
 COL_GO_TODAY_T   equ 0xd048c8
-COL_MONTH_YEAR_B equ 0x05080d0
+COL_MONTH_YEAR_B equ 0x0555555 ; 0 for time?
+COL_DROPDOWN_BG  equ 0x666666
+COL_DROPDOWN_T   equ 0x10CCCccc
-COL_NEW_STYLE_T  equ 0xac0000
+COL_NEW_STYLE_T  equ 0xef3333
+remainder dd 1
+quotient dd 1
+; definitions
+WIN_CW equ 266
+WIN_X equ (5000 shl 16+WIN_CW+9)
+WIN_Y equ (100 shl 16+335)
+LINE1     equ 27 shl 16+16
+B_MONTH_X equ 15 shl 16+158
+B_Y       equ LINE1
+B_MONTH   equ 63 shl 16+32
+B_WBAR_X  equ 5 shl 16+WIN_CW
+B_WBAR_Y  equ 64 shl 16+20
+B_WEEK    equ 34 shl 16+70
+B_WX_SHIFT equ 32 shl 16
+B_DROP    equ B_MONTH+16
+B_DAYS_Y  equ 106
+B_DAYS_SHIFT equ 30
+B_YEAR_X  equ 198 shl 16+46
+B_YEAR    equ 206 shl 16+32
+B_SPIN_WIDTH equ 13
+B_SPIN_X  equ 184 shl 16+B_SPIN_WIDTH
+B_SPIN    equ 188 shl 16+32
+spinner db '<         >'
+B_TODAY_X equ 25 shl 16
+B_TODAY_Y equ 48 shl 16+10
+B_TODAY   equ 30 shl 16+50
+B_NS_X    equ 185 shl 16+75
+B_NS_Y    equ 48 shl 16+10
+B_NS      equ 190 shl 16+50
+FOCUSABLE equ 5
 ; multilanguage interface - configuratable in lang.inc
 day_count db 3,0,3,2,3,2,3,3,2,3,2,3
 Fkeys     db 210,211,212,213,214,215,216,217,208,209,228,159
 ,7 → 159,6
      db   'November '
      db   'December '
 end if
-spinner db '< >'
 week_days:
 if lang eq ru
      db   2
 ,7 → 232,7
      db   'Sat'
 end if
-title:   ; áâà®ª  § £®«®¢ª
+title:
 if lang eq ru
      db   ' «¥¤ àì',0
 else if lang eq ge
 ,5 → 297,5
 else if lang eq it
                 db   'Impostazioni',0
 else
-                db  'áâ ®¢¨âì ¤ âã',0
+                db  '   Set date    ',0
 end if

Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 3888 → Rev 3889