User: ihi     
Date: 2007-11-20 19:07:35+0000
Modified:
   dba/reportdesign/source/ui/dlg/DateTime.src

Log:
 INTEGRATION: CWS reportdesign01 (1.2.28); FILE MERGED
 2007/10/15 12:50:04 lla 1.2.28.2: #i77464# new date time dialog
 2007/09/07 08:33:32 oj 1.2.28.1: #i80508# remove de from resource

File Changes:

Directory: /dba/reportdesign/source/ui/dlg/
===========================================

File [changed]: DateTime.src
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/dlg/DateTime.src?r1=1.3&r2=1.4
Delta lines:  +44 -55
---------------------
--- DateTime.src        2007-08-30 12:12:23+0000        1.3
+++ DateTime.src        2007-11-20 19:07:32+0000        1.4
@@ -53,94 +53,83 @@
        Moveable = TRUE ;
        Closeable = TRUE ;
        
-       FixedLine FL_DATE
-       {
-               Pos = MAP_APPFONT ( RELATED_CONTROLS , RELATED_CONTROLS) ;
-               Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , 
FIXEDTEXT_HEIGHT ) ;
-               Text [ en-US ] = "Date";
-       };
-       
        CheckBox CB_DATE
        {
-               Pos = MAP_APPFONT ( UNRELATED_CONTROLS , RELATED_CONTROLS + 
UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT) ;
-               Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS, 
FIXEDTEXT_HEIGHT ) ;
+               Pos = MAP_APPFONT ( UNRELATED_CONTROLS , RELATED_CONTROLS /* + 
UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT */) ;
+               Size = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS, 
FIXEDTEXT_HEIGHT ) ;
                Check = TRUE;
                Text [ en-US ] = "Include Date";
        };
        
-       RadioButton RB_DATE_F1
-       {
-               Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 
2*RELATED_CONTROLS + UNRELATED_CONTROLS + 2*FIXEDTEXT_HEIGHT) ;
-               Size = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS , 
FIXEDTEXT_HEIGHT ) ;
-               Group = TRUE;
-               Check = TRUE;
-       };
-       RadioButton RB_DATE_F2
+       FixedText FT_DATE_FORMAT
        {
-               Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 
3*RELATED_CONTROLS + UNRELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT) ;
-               Size = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS , 
FIXEDTEXT_HEIGHT ) ;
+               Pos = MAP_APPFONT ( RELATED_CONTROLS + 2*UNRELATED_CONTROLS, 
RELATED_CONTROLS + UNRELATED_CONTROLS + CHECKBOX_HEIGHT );
+               Size = MAP_APPFONT( BUTTON_WIDTH - RELATED_CONTROLS, 
FIXEDTEXT_HEIGHT );
+               Text [ en-US ] = "Format";
        };
        
-       RadioButton RB_DATE_F3
+       ListBox LB_DATE_TYPE
        {
-               Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 
4*RELATED_CONTROLS + UNRELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT) ;
-               Size = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS , 
FIXEDTEXT_HEIGHT ) ;
+               Pos = MAP_APPFONT ( 2 * UNRELATED_CONTROLS + BUTTON_WIDTH, 
RELATED_CONTROLS + UNRELATED_CONTROLS + CHECKBOX_HEIGHT) ;
+               Size = MAP_APPFONT( PAGE_WIDTH - 3*UNRELATED_CONTROLS - 
BUTTON_WIDTH, 60 );
+               Border = TRUE;
+               DropDown = TRUE;
+               TabStop = TRUE;
+        Sort = FALSE;
        };
-       FixedLine FL_TIME
+
+       FixedLine FL_SEPARATOR0
        {
-               Pos = MAP_APPFONT ( RELATED_CONTROLS , 4*RELATED_CONTROLS + 
2*UNRELATED_CONTROLS + 5*FIXEDTEXT_HEIGHT) ;
-               Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , 
FIXEDTEXT_HEIGHT ) ;
-               Text [ en-US ] = "Time";
+               Pos = MAP_APPFONT ( RELATED_CONTROLS , RELATED_CONTROLS + 
2*UNRELATED_CONTROLS + CHECKBOX_HEIGHT + LISTBOX_HEIGHT) ;
+               Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , 1 ) ;
+        //             Text [ en-US ] = "Time";
        };
        CheckBox CB_TIME
        {
-               Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 5*RELATED_CONTROLS + 
2*UNRELATED_CONTROLS + 6*FIXEDTEXT_HEIGHT) ;
-               Size = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS , 
FIXEDTEXT_HEIGHT ) ;
+               Pos = MAP_APPFONT ( UNRELATED_CONTROLS, RELATED_CONTROLS + 
3*UNRELATED_CONTROLS + CHECKBOX_HEIGHT + LISTBOX_HEIGHT) ;
+               Size = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS, 
FIXEDTEXT_HEIGHT ) ;
                Check = TRUE;
                Text [ en-US ] = "Include Time";
        };
        
-       RadioButton RB_TIME_F1
-       {
-               Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 
6*RELATED_CONTROLS + 2*UNRELATED_CONTROLS + 7*FIXEDTEXT_HEIGHT) ;
-               Size = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS , 
FIXEDTEXT_HEIGHT ) ;
-               Group = TRUE;
-               Check = TRUE;
-       };
-       RadioButton RB_TIME_F2
+       FixedText FT_TIME_FORMAT
        {
-               Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 
7*RELATED_CONTROLS + 2*UNRELATED_CONTROLS + 8*FIXEDTEXT_HEIGHT) ;
-               Size = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS , 
FIXEDTEXT_HEIGHT ) ;           
+               Pos = MAP_APPFONT ( RELATED_CONTROLS + 2*UNRELATED_CONTROLS, 
RELATED_CONTROLS + 4*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + LISTBOX_HEIGHT);
+               Size = MAP_APPFONT( BUTTON_WIDTH - RELATED_CONTROLS, 
FIXEDTEXT_HEIGHT );
+               Text [ en-US ] = "Format";
        };
        
-       RadioButton RB_TIME_F3
+       ListBox LB_TIME_TYPE
        {
-               Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS, 
8*RELATED_CONTROLS + 2*UNRELATED_CONTROLS + 9*FIXEDTEXT_HEIGHT) ;
-               Size = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS , 
FIXEDTEXT_HEIGHT ) ;           
+               Pos = MAP_APPFONT ( 2 * UNRELATED_CONTROLS + BUTTON_WIDTH, 
RELATED_CONTROLS + 4*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + LISTBOX_HEIGHT) ;
+               Size = MAP_APPFONT( PAGE_WIDTH - 3*UNRELATED_CONTROLS - 
BUTTON_WIDTH, 60 );
+               Border = TRUE;
+               DropDown = TRUE;
+               TabStop = TRUE;
+        Sort = FALSE;
        };
-       
        FixedLine FL_SEPARATOR1
        {
-               Pos = MAP_APPFONT ( RELATED_CONTROLS , 8*RELATED_CONTROLS + 
3*UNRELATED_CONTROLS + 10*FIXEDTEXT_HEIGHT) ;
+               Pos = MAP_APPFONT ( RELATED_CONTROLS , RELATED_CONTROLS + 
5*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + 2*LISTBOX_HEIGHT) ;
                Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , 1 ) ;
        };
        OKButton PB_OK
        {
-               Pos = MAP_APPFONT ( UNRELATED_CONTROLS, 9*RELATED_CONTROLS + 
3*UNRELATED_CONTROLS + 10*FIXEDTEXT_HEIGHT +1) ;
+               Pos = MAP_APPFONT ( UNRELATED_CONTROLS, RELATED_CONTROLS + 
6*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + 2*LISTBOX_HEIGHT +1) ;
                Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
                TabStop = TRUE ;
                DefButton = TRUE ;
        };
        CancelButton PB_CANCEL
        {
-               Pos = MAP_APPFONT ( RELATED_CONTROLS + UNRELATED_CONTROLS + 
BUTTON_WIDTH , 9*RELATED_CONTROLS + 3*UNRELATED_CONTROLS + 10*FIXEDTEXT_HEIGHT 
+1) ;
+               Pos = MAP_APPFONT ( RELATED_CONTROLS + UNRELATED_CONTROLS + 
BUTTON_WIDTH , RELATED_CONTROLS + 6*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + 
2*LISTBOX_HEIGHT +1) ;
                Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
                TabStop = TRUE ;
        };
        HelpButton PB_HELP
        {
                TabStop = TRUE ;
-               Pos = MAP_APPFONT ( RELATED_CONTROLS + 2*UNRELATED_CONTROLS + 
2*BUTTON_WIDTH , 9*RELATED_CONTROLS + 3*UNRELATED_CONTROLS + 
10*FIXEDTEXT_HEIGHT +1) ;
+               Pos = MAP_APPFONT ( RELATED_CONTROLS + 2*UNRELATED_CONTROLS + 
2*BUTTON_WIDTH , RELATED_CONTROLS + 6*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + 
2*LISTBOX_HEIGHT +1) ;
                Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
                Text [ en-US ] = "~Help";
        };




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to