Subversion Repositories Kolibri OS

Rev

Rev 6002 | Rev 7717 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 6002 Rev 6950
Line 91... Line 91...
91 
	add ebx,DATE_BUTTON_WIDTH shl 16
 91 
	add ebx,DATE_BUTTON_WIDTH shl 16
92 
	sub ebx,4 shl 16
 92 
	sub ebx,4 shl 16
93 
	mov bx,1
 93 
	mov bx,1
94 
	mov cx,DATE_BUTTON_HEIGHT-3
 94 
	mov cx,DATE_BUTTON_HEIGHT-3
95 
	mcall
 95 
	mcall
96 
	; rgiht border-outer
 96 
	; right border-outer
97 
	mov edx,color2
 97 
	mov edx,color2
98 
	add ebx,1 shl 16
 98 
	add ebx,1 shl 16
99 
	sub ecx,1 shl 16
 99 
	sub ecx,1 shl 16
100 
	add cx,1
 100 
	add cx,1
101 
	mcall
 101 
	mcall
- 
 
 102 
	; right border-outer 2
- 
 
 103 
	mov edx,color1
- 
 
 104 
	add ebx,1 shl 16
- 
 
 105 
	sub ecx,1 shl 16
- 
 
 106 
	add cx,2
- 
 
 107 
	add cx,1
- 
 
 108 
	mcall
102 
	; bottom border-outer
 109 
	; bottom border-outer
103 
	mov edx,color2
 110 
	mov edx,color2
104 
	pop ecx
 111 
	pop ecx
105 
	pop ebx
 112 
	pop ebx
106 
	add ecx,DATE_BUTTON_HEIGHT shl 16
 113 
	add ecx,DATE_BUTTON_HEIGHT shl 16
107 
	sub ecx,1 shl 16
 114 
	sub ecx,1 shl 16
108 
	add ebx,1 shl 16
 115 
	add ebx,1 shl 16
109 
	mov cx,1
 116 
	mov cx,1
110 
	mcall
 117 
	mcall
- 
 
 118 
	; bottom border-outer 2
- 
 
 119 
	mov edx,color1
- 
 
 120 
	add ecx,1 shl 16
- 
 
 121 
	mcall
- 
 
 122 
	add ebx,1 shl 16
- 
 
 123 
	sub ecx,1 shl 16
111 
	; left border-outer
 124 
	; left border-outer
112 
	mov edx,color4
 125 
	mov edx,color4
113 
	add ebx,1 shl 16
 126 
	add ebx,1 shl 16
114 
	sub ecx,1 shl 16
 127 
	sub ecx,1 shl 16
115 
	sub bx,2
 128 
	sub bx,2
Line 561... Line 574...
561 
    mov  edx,2
 574 
    mov  edx,2
562 
    mcall
 575 
    mcall
563 
    mov  ebx,B_SPIN_X ; <
 576 
    mov  ebx,B_SPIN_X ; <
564 
    inc  edx
 577 
    inc  edx
565 
    mcall
 578 
    mcall
566 
    add  ebx,54 shl 16 ; >
 579 
    add  ebx,55 shl 16 ; >
567 
    inc  edx
 580 
    inc  edx
568 
    mcall
 581 
    mcall
569 
    call draw_days
 582 
    call draw_days
Line 570... Line 583...
570 
 
 583 
 
Line 574... Line 587...
574 
    mcall  ,233*65536+301
 587 
    mcall  ,233*65536+301
575 
    mcall  ,185*65536+287, ,plus
 588 
    mcall  ,185*65536+287, ,plus
576 
    mcall  ,185*65536+317, ,minus
 589 
    mcall  ,185*65536+317, ,minus
577 
    mcall  , 35*65536+300,0x00CCCCCC,set_date_t,15 ;set date text
 590 
    mcall  , 35*65536+300,0x00CCCCCC,set_date_t,15 ;set date text
Line 578... Line -...
578 
 
 - 
 
579 
 
 - 
 
580 
    mov  ecx,0x10ddeeff
 - 
 
581 
    mov  edx,n_style
 - 
 
582 
    mov  esi,ns_end-n_style
 - 
 
583 
    mov  ebx,B_NS
 - 
 
584 
    cmp  [new_style],1
 - 
 
585 
    je	 .high
 - 
 
586 
    mov  ecx,0xa0a0a0
 - 
 
587 
    jmp  .int
 - 
 
588 
  .high:
 - 
 
589 
    mov  ecx,COL_NEW_STYLE_T
 - 
 
590 
  .int:
 - 
 
591 
    mcall
 - 
 
592 
 
 591 
 
593 
    mov  ecx,COL_GO_TODAY_T
 592 
    mov  ecx,COL_GO_TODAY_T
594 
    mov  edx,today_msg
 593 
    mov  edx,today_msg
595 
    mov  ebx,B_TODAY
 594 
    mov  ebx,B_TODAY
596 
    mov  esi,today_end-today_msg
 595 
    mov  esi,today_end-today_msg
Line 632... Line 631...
632 
  .ddd_loop:
 631 
  .ddd_loop:
633 
    mov  edi,edx
 632 
    mov  edi,edx
634 
    push ecx
 633 
    push ecx
635 
    mov  esi,COL_DROPDOWN_BG
 634 
    mov  esi,COL_DROPDOWN_BG
636 
    mcall 8,B_MONTH_X,[esp+4]
 635 
    mcall 8,B_MONTH_X,[esp+4]
637 
    shr  eax,1
 636 
    mov eax,4
638 
    mov  ebx,[esp+8]
 637 
    mov  ebx,[esp+8]
639 
    xchg edx,[esp+12]
 638 
    xchg edx,[esp+12]
640 
    movzx esi,byte[month_name]
 639 
    movzx esi,byte[month_name]
641 
    ShowFocus edi
 640 
    ShowFocus edi
642 
    mcall
 641 
    mcall
Line 729... Line 728...
729 
	DrawRect COL_DATE_INACTIVE_1,COL_DATE_INACTIVE_2,COL_DATE_INACTIVE_3,COL_DATE_INACTIVE_4
 728 
	DrawRect COL_DATE_INACTIVE_1,COL_DATE_INACTIVE_2,COL_DATE_INACTIVE_3,COL_DATE_INACTIVE_4
730 
	jmp .out
 729 
	jmp .out
731 
.draw_but:				     ;draw non selected button
 730 
.draw_but:				     ;draw non selected button
732 
    add  edx,200+1 shl 29
 731 
    add  edx,200+1 shl 29
733 
    mcall 8
 732 
    mcall 8
- 
 
 733 
	DrawRect COL_DATE_1,COL_DATE_2,COL_DATE_3,COL_DATE_4
734 
	mov eax,[Year]
 734 
	mov eax,[Year]
735 
	cmp [curYear],eax
 735 
	cmp [curYear],eax
736 
	jne .out
 736 
	jne .out
737 
	mov eax,[Month]
 737 
	mov eax,[Month]
738 
	cmp [curMonth],eax
 738 
	cmp [curMonth],eax
739 
	jne .out
 739 
	jne .out
740 
	mov eax,[number]
 740 
	mov eax,[number]
741 
	cmp [curDay],eax
 741 
	cmp [curDay],eax
742 
	jne .out
 742 
	jne .out
743 
	mov edx,0xff0000
 743 
	mov edx,0xff0000
744 
	mov bx,DATE_BUTTON_WIDTH-2
 744 
	mov bx,DATE_BUTTON_WIDTH-1
745 
	mov cx,2
 745 
	mov cx,3
746 
	add ebx,1 shl 16
 746 
	sub ebx,2 shl 16
747 
	add ecx,27 shl 16
 747 
	sub ecx,1 shl 16
748 
	mcall 13
 748 
	mcall 13
749 
.out:
 749 
.out:
750 
	mov	eax, [number]
 750 
	mov	eax, [number]
751 
	xor	edx, edx
 751 
	xor	edx, edx
752 
	mov	ecx, 10
 752 
	mov	ecx, 10
Line 829... Line 829...
829 
    add  eax,ecx
 829 
    add  eax,ecx
830 
    mov  ecx,ebx
 830 
    mov  ecx,ebx
831 
    shr  ecx,2
 831 
    shr  ecx,2
832 
    add  eax,ecx
 832 
    add  eax,ecx
833 
    dec  eax
 833 
    dec  eax
834 
    cmp  [new_style],0
 - 
 
835 
    je	 .nonew
 - 
 
836 
    add  eax,2
 834 
    add  eax,2
837 
    xchg eax,ebx
 835 
    xchg eax,ebx
838 
    mov  ecx,100
 836 
    mov  ecx,100
839 
    xor  edx,edx
 837 
    xor  edx,edx
840 
    div  cx
 838 
    div  cx
841 
    sub  ebx,eax
 839 
    sub  ebx,eax
842 
    shr  eax,2
 840 
    shr  eax,2
843 
    add  ebx,eax
 841 
    add  ebx,eax
844 
  .nonew:
 - 
 
845 
    add  ebx,5
 842 
    add  ebx,5
846 
    mov  eax,ebx
 843 
    mov  eax,ebx
847 
    xor  edx,edx
 844 
    xor  edx,edx
848 
    movzx ebx,byte[week_days+1]
 845 
    movzx ebx,byte[week_days+1]
849 
    sub  eax,ebx
 846 
    sub  eax,ebx