From 985733d104155acbf7511095b2c301664aadea24 Mon Sep 17 00:00:00 2001 From: Daniel Rentz Date: Wed, 30 May 2001 12:49:21 +0000 Subject: #86988# dialog redesign --- sc/source/ui/dbgui/asciiopt.cxx | 14 ++-- sc/source/ui/dbgui/asciiopt.hrc | 10 +-- sc/source/ui/dbgui/asciiopt.src | 139 ++++++++++++++++----------------------- sc/source/ui/docshell/tpstat.cxx | 10 +-- sc/source/ui/docshell/tpstat.hrc | 6 +- sc/source/ui/docshell/tpstat.src | 8 +-- 6 files changed, 82 insertions(+), 105 deletions(-) diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx index 83114e172dc8..6be6bfb21aba 100644 --- a/sc/source/ui/dbgui/asciiopt.cxx +++ b/sc/source/ui/dbgui/asciiopt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: asciiopt.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: er $ $Date: 2001-04-19 13:40:01 $ + * last change: $Author: dr $ $Date: 2001-05-30 13:49:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -532,16 +532,16 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName, aFtCharSet ( this, ScResId( FT_CHARSET ) ), aLbCharSet ( this, ScResId( LB_CHARSET ) ), bCharSetSystem ( FALSE ), - aGbSepOpt ( this, ScResId( GB_SEPOPT ) ), + aFlSepOpt ( this, ScResId( FL_SEPOPT ) ), aFtTextSep ( this, ScResId( FT_TEXTSEP ) ), aCbTextSep ( this, ScResId( CB_TEXTSEP ) ), - aGbFieldOpt ( this, ScResId( GB_FIELDOPT ) ), + aFlFieldOpt ( this, ScResId( FL_FIELDOPT ) ), aCkbAsOnce ( this, ScResId( CB_ASONCE) ), aFtType ( this, ScResId( FT_TYPE ) ), aLbType ( this, ScResId( LB_TYPE1 ) ), aScrollbar ( this, ScResId( SB_COLUMN ) ), aVScroll ( this, ScResId( SB_ROW ) ), - aGbWidth ( this, ScResId( GB_WIDTH ) ), + aFlWidth ( this, ScResId( FL_WIDTH ) ), aBtnOk ( this, ScResId( BTN_OK ) ), aBtnCancel ( this, ScResId( BTN_CANCEL ) ), aBtnHelp ( this, ScResId( BTN_HELP ) ), @@ -996,7 +996,7 @@ void ScImportAsciiDlg::DelimitedPreview() if(aCkbSpace.IsChecked()) aSeps+=' '; if(aCkbOther.IsChecked()) { - aSeps+=aEdOther.GetText().GetChar(0); + aSeps+=aEdOther.GetText(); } BOOL bMerge = FALSE; if(aCkbAsOnce.IsChecked()) bMerge=TRUE; @@ -1339,7 +1339,7 @@ void ScImportAsciiDlg::GetOptions( ScAsciiOptions& rOpt ) if(aCkbSpace.IsChecked()) aSeps+=' '; if(aCkbOther.IsChecked()) { - aSeps+=aEdOther.GetText().GetChar(0); + aSeps+=aEdOther.GetText(); } rOpt.SetMergeSeps(aCkbAsOnce.IsChecked()); rOpt.SetFieldSeps( aSeps ); diff --git a/sc/source/ui/dbgui/asciiopt.hrc b/sc/source/ui/dbgui/asciiopt.hrc index caefbba9e6f5..b9441fb7e939 100644 --- a/sc/source/ui/dbgui/asciiopt.hrc +++ b/sc/source/ui/dbgui/asciiopt.hrc @@ -2,9 +2,9 @@ * * $RCSfile: asciiopt.hrc,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:53 $ + * last change: $Author: dr $ $Date: 2001-05-30 13:49:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -64,12 +64,12 @@ #define RB_FIXED 2 #define FT_CHARSET 3 #define LB_CHARSET 4 -#define GB_SEPOPT 5 +#define FL_SEPOPT 5 #define FT_FIELDSEP 6 #define CB_FIELDSEP 7 #define FT_TEXTSEP 8 #define CB_TEXTSEP 9 -#define GB_FIELDOPT 10 +#define FL_FIELDOPT 10 #define FT_WIDTH 11 #define FT_TYPE 12 #define FT_PREVIEW 13 @@ -89,7 +89,7 @@ #define FT_PREVIEW2 27 #define FT_PREVIEW3 28 #define SB_COLUMN 29 -#define GB_WIDTH 30 +#define FL_WIDTH 30 #define BTN_OK 31 #define BTN_CANCEL 32 #define BTN_HELP 33 diff --git a/sc/source/ui/dbgui/asciiopt.src b/sc/source/ui/dbgui/asciiopt.src index 41a24d45a9ff..79136153e789 100644 --- a/sc/source/ui/dbgui/asciiopt.src +++ b/sc/source/ui/dbgui/asciiopt.src @@ -2,9 +2,9 @@ * * $RCSfile: asciiopt.src,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: kz $ $Date: 2001-05-17 07:47:00 $ + * last change: $Author: dr $ $Date: 2001-05-30 13:49:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,7 +65,7 @@ ModalDialog RID_SCDLG_ASCII { OutputSize = TRUE ; SVLook = TRUE ; - Size = MAP_APPFONT ( 321 , 225 ) ; + Size = MAP_APPFONT ( 320 , 247 ) ; Text = "Textimport" ; Text [ ENGLISH ] = "Text import" ; Text [ DANISH ] = "Tekstimport" ; @@ -78,10 +78,10 @@ ModalDialog RID_SCDLG_ASCII Text [ SWEDISH ] = "Textimport" ; Text [ PORTUGUESE ] = "Importar texto" ; Moveable = TRUE ; - GroupBox GB_WIDTH + FixedLine FL_WIDTH { - Pos = MAP_APPFONT ( 6 , 113 ) ; - Size = MAP_APPFONT ( 255 , 110 ) ; + Pos = MAP_APPFONT ( 6 , 132 ) ; + Size = MAP_APPFONT ( 252 , 8 ) ; Text = "Felder" ; Text [ ENGLISH ] = "Field width" ; Text [ DANISH ] = "Felter" ; @@ -110,45 +110,22 @@ ModalDialog RID_SCDLG_ASCII }; FixedText FT_TYPE { - Pos = MAP_APPFONT ( 148 , 124 ) ; - Size = MAP_APPFONT ( 40 , 10 ) ; - Text = "T~yp" ; - Text [ ENGLISH ] = "Type" ; - Text [ DANISH ] = "Type" ; - Text [ ENGLISH_US ] = "T~ype" ; - Text [ SPANISH ] = "T~ipo" ; - Text [ FRENCH ] = "Type" ; - Text [ ITALIAN ] = "Tipo" ; - Text [ DUTCH ] = "T~ype" ; - Text [ PORTUGUESE_BRAZILIAN ] = "Typ" ; - Text [ SWEDISH ] = "T~yp" ; - Text [ PORTUGUESE ] = "Tipo" ; - Text[ chinese_simplified ] = "ÀàÐÍ(~Y)"; - Text[ russian ] = "Òèï"; - Text[ polish ] = "Typ"; - Text[ japanese ] = "À²Ìß(~Y)"; - Text[ chinese_traditional ] = "Ãþ«¬(~Y)"; - Text[ arabic ] = "ÇáäæÚ"; - Text[ dutch ] = "T~ype"; - Text[ chinese_simplified ] = "ÀàÐÍ(~Y)"; - Text[ greek ] = "Ôý~ðïò"; - Text[ korean ] = "À¯Çü(~Y)"; - Text[ turkish ] = "T~ip"; - Text[ language_user1 ] = " "; - Text[ catalan ] = "T~ipo"; - Text[ finnish ] = "~Tyyppi"; + Pos = MAP_APPFONT ( 12 , 145 ) ; + Size = MAP_APPFONT ( 60 , 8 ) ; + Text = "Spaltent~yp" ; + Text [ ENGLISH ] = "Column t~ype" ; }; ListBox LB_TYPE1 { - Pos = MAP_APPFONT ( 190 , 121 ) ; - Size = MAP_APPFONT ( 57 , 68 ) ; + Pos = MAP_APPFONT ( 76 , 143 ) ; + Size = MAP_APPFONT ( 60 , 68 ) ; TabStop = TRUE ; DropDown = TRUE ; }; - GroupBox GB_SEPOPT + FixedLine FL_SEPOPT { - Pos = MAP_APPFONT ( 6 , 35 ) ; - Size = MAP_APPFONT ( 255 , 75 ) ; + Pos = MAP_APPFONT ( 6 , 48 ) ; + Size = MAP_APPFONT ( 252 , 8 ) ; Text = "Trennoptionen" ; Text [ ENGLISH ] = "Field separation" ; Text [ DANISH ] = "Separatorindstillinger" ; @@ -177,8 +154,8 @@ ModalDialog RID_SCDLG_ASCII }; RadioButton RB_FIXED { - Pos = MAP_APPFONT ( 12 , 46 ) ; - Size = MAP_APPFONT ( 62 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 59 ) ; + Size = MAP_APPFONT ( 243 , 10 ) ; Text = "~Feste Breite" ; Text [ ENGLISH ] = "Fixed width" ; Text [ DANISH ] = "Fast bredde" ; @@ -208,8 +185,8 @@ ModalDialog RID_SCDLG_ASCII }; RadioButton RB_SEPARATED { - Pos = MAP_APPFONT ( 12 , 58 ) ; - Size = MAP_APPFONT ( 62 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 73 ) ; + Size = MAP_APPFONT ( 243 , 10 ) ; Text = "~Getrennt" ; Text [ ENGLISH ] = "Separated" ; Text [ DANISH ] = "Delt" ; @@ -240,8 +217,8 @@ ModalDialog RID_SCDLG_ASCII }; FixedText FT_CHARSET { - Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 46 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 16 ) ; + Size = MAP_APPFONT ( 60 , 8 ) ; Text = "Z~eichensatz" ; Text [ ENGLISH ] = "Charset" ; Text [ DANISH ] = "Tegnsæt" ; @@ -270,16 +247,16 @@ ModalDialog RID_SCDLG_ASCII }; ListBox LB_CHARSET { - Pos = MAP_APPFONT ( 59 , 13 ) ; - Size = MAP_APPFONT ( 115 , 61 ) ; + Pos = MAP_APPFONT ( 76 , 14 ) ; + Size = MAP_APPFONT ( 130 , 61 ) ; TabStop = TRUE ; DropDown = TRUE ; Sort = TRUE; }; - GroupBox GB_FIELDOPT + FixedLine FL_FIELDOPT { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 255 , 29 ) ; + Size = MAP_APPFONT ( 252 , 8 ) ; Text = "Import" ; Text [ ENGLISH ] = "Import" ; Text [ english_us ] = "Import" ; @@ -308,8 +285,8 @@ ModalDialog RID_SCDLG_ASCII }; FixedText FT_TEXTSEP { - Pos = MAP_APPFONT ( 176 , 95 ) ; - Size = MAP_APPFONT ( 46 , 10 ) ; + Pos = MAP_APPFONT ( 164 , 114 ) ; + Size = MAP_APPFONT ( 50 , 8 ) ; Text = "Te~xttrenner" ; Text [ ENGLISH ] = "Text Separator" ; Text [ DANISH ] = "Tekstseparator" ; @@ -338,27 +315,27 @@ ModalDialog RID_SCDLG_ASCII }; ComboBox CB_TEXTSEP { - Pos = MAP_APPFONT ( 222 , 93 ) ; - Size = MAP_APPFONT ( 25 , 94 ) ; + Pos = MAP_APPFONT ( 218 , 112 ) ; + Size = MAP_APPFONT ( 37 , 94 ) ; TabStop = TRUE ; DropDown = TRUE ; }; OKButton BTN_OK { - Pos = MAP_APPFONT ( 267 , 6 ) ; + Pos = MAP_APPFONT ( 264 , 6 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; DefButton = TRUE ; }; CancelButton BTN_CANCEL { - Pos = MAP_APPFONT ( 267 , 23 ) ; + Pos = MAP_APPFONT ( 264 , 23 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; }; HelpButton BTN_HELP { - Pos = MAP_APPFONT ( 267 , 43 ) ; + Pos = MAP_APPFONT ( 264 , 43 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; }; @@ -420,8 +397,8 @@ ModalDialog RID_SCDLG_ASCII }; CheckBox CKB_TAB { - Pos = MAP_APPFONT ( 30 , 69 ) ; - Size = MAP_APPFONT ( 63 , 10 ) ; + Pos = MAP_APPFONT ( 20 , 86 ) ; + Size = MAP_APPFONT ( 68 , 10 ) ; Text = "~Tabulator" ; Text [ ENGLISH ] = "Tab" ; TabStop = TRUE ; @@ -451,8 +428,8 @@ ModalDialog RID_SCDLG_ASCII }; CheckBox CKB_SEMICOLON { - Pos = MAP_APPFONT ( 30 , 80 ) ; - Size = MAP_APPFONT ( 63 , 10 ) ; + Pos = MAP_APPFONT ( 20 , 99 ) ; + Size = MAP_APPFONT ( 68 , 10 ) ; Text = "~Semikolon" ; Text [ ENGLISH ] = "Semicolon" ; TabStop = TRUE ; @@ -482,10 +459,10 @@ ModalDialog RID_SCDLG_ASCII }; CheckBox CKB_COMMA { - Pos = MAP_APPFONT ( 109 , 69 ) ; - Size = MAP_APPFONT ( 62 , 10 ) ; + Pos = MAP_APPFONT ( 92 , 86 ) ; + Size = MAP_APPFONT ( 68 , 10 ) ; Text = "~Komma" ; - Text [ ENGLISH ] = "Tab" ; + Text [ ENGLISH ] = "~Comma" ; TabStop = TRUE ; Text [ english_us ] = "~Comma" ; Text [ portuguese_brazilian ] = "~Komma" ; @@ -513,8 +490,8 @@ ModalDialog RID_SCDLG_ASCII }; CheckBox CKB_SPACE { - Pos = MAP_APPFONT ( 109 , 80 ) ; - Size = MAP_APPFONT ( 63 , 10 ) ; + Pos = MAP_APPFONT ( 92 , 99 ) ; + Size = MAP_APPFONT ( 68 , 10 ) ; Text = "~Leerzeichen" ; Text [ ENGLISH ] = "Space" ; TabStop = TRUE ; @@ -544,8 +521,8 @@ ModalDialog RID_SCDLG_ASCII }; CheckBox CKB_OTHER { - Pos = MAP_APPFONT ( 180 , 69 ) ; - Size = MAP_APPFONT ( 40 , 10 ) ; + Pos = MAP_APPFONT ( 164 , 86 ) ; + Size = MAP_APPFONT ( 50 , 10 ) ; Text = "~Andere" ; Text [ ENGLISH ] = "Other" ; TabStop = TRUE ; @@ -576,15 +553,15 @@ ModalDialog RID_SCDLG_ASCII Edit ED_OTHER { Border = TRUE ; - Pos = MAP_APPFONT ( 222 , 68 ) ; - Size = MAP_APPFONT ( 14 , 10 ) ; + Pos = MAP_APPFONT ( 218 , 84 ) ; + Size = MAP_APPFONT ( 37 , 12 ) ; TabStop = TRUE ; - MaxTextLength = 1 ; + MaxTextLength = 10 ; }; FixedText FT_AT_ROW { - Pos = MAP_APPFONT ( 182 , 14 ) ; - Size = MAP_APPFONT ( 43 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 32 ) ; + Size = MAP_APPFONT ( 60 , 8 ) ; Text = "Ab ~Zeile" ; Text [ ENGLISH ] = "At Row" ; Text [ english_us ] = "From ro~w" ; @@ -615,8 +592,8 @@ ModalDialog RID_SCDLG_ASCII { Border = TRUE ; SVLook = TRUE ; - Pos = MAP_APPFONT ( 226 , 13 ) ; - Size = MAP_APPFONT ( 25 , 12 ) ; + Pos = MAP_APPFONT ( 76 , 30 ) ; + Size = MAP_APPFONT ( 30 , 12 ) ; TabStop = TRUE ; Spin = TRUE ; Minimum = 1 ; @@ -626,25 +603,25 @@ ModalDialog RID_SCDLG_ASCII { HelpId = HID_SC_ASCII_TABCTR ; Border = TRUE ; - Pos = MAP_APPFONT ( 12 , 141 ) ; - Size = MAP_APPFONT ( 235 , 68 ) ; + Pos = MAP_APPFONT ( 12 , 159 ) ; + Size = MAP_APPFONT ( 235 , 72 ) ; }; ScrollBar SB_COLUMN { - Pos = MAP_APPFONT ( 12 , 210 ) ; - Size = MAP_APPFONT ( 235 , 9 ) ; + Pos = MAP_APPFONT ( 12 , 231 ) ; + Size = MAP_APPFONT ( 235 , 8 ) ; HScroll = TRUE ; }; ScrollBar SB_ROW { - Pos = MAP_APPFONT ( 247 , 150 ) ; - Size = MAP_APPFONT ( 10 , 59 ) ; + Pos = MAP_APPFONT ( 247 , 159 ) ; + Size = MAP_APPFONT ( 8 , 72 ) ; VScroll = TRUE ; }; CheckBox CB_ASONCE { - Pos = MAP_APPFONT ( 30 , 95 ) ; - Size = MAP_APPFONT ( 130 , 10 ) ; + Pos = MAP_APPFONT ( 20 , 114 ) ; + Size = MAP_APPFONT ( 138 , 10 ) ; Text = "Fel~dtrenner zusammenfassen" ; Text [ ENGLISH ] = "Treat delimiters as one" ; TabStop = TRUE ; diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx index d6d08eca934d..2817d40f60b3 100644 --- a/sc/source/ui/docshell/tpstat.cxx +++ b/sc/source/ui/docshell/tpstat.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tpstat.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:55 $ + * last change: $Author: dr $ $Date: 2001-05-30 13:48:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -92,7 +92,7 @@ ScDocStatPage::ScDocStatPage( Window *pParent, const SfxItemSet& rSet ) aFtCells ( this, ScResId( FT_CELLS ) ), aFtPagesLbl ( this, ScResId( FT_PAGES_LBL ) ), aFtPages ( this, ScResId( FT_PAGES ) ), - aGbInfo ( this, ScResId( GB_INFO ) ) + aFlInfo ( this, ScResId( FL_INFO ) ) { ScDocShell* pDocSh = PTR_CAST( ScDocShell, SfxObjectShell::Current() ); ScDocStat aDocStat; @@ -100,9 +100,9 @@ ScDocStatPage::ScDocStatPage( Window *pParent, const SfxItemSet& rSet ) if ( pDocSh ) pDocSh->GetDocStat( aDocStat ); - String aInfo = aGbInfo.GetText(); + String aInfo = aFlInfo.GetText(); aInfo += aDocStat.aDocName; - aGbInfo .SetText( aInfo ); + aFlInfo .SetText( aInfo ); aFtTables .SetText( String::CreateFromInt32( aDocStat.nTableCount ) ); aFtCells .SetText( String::CreateFromInt32( aDocStat.nCellCount ) ); aFtPages .SetText( String::CreateFromInt32( aDocStat.nPageCount ) ); diff --git a/sc/source/ui/docshell/tpstat.hrc b/sc/source/ui/docshell/tpstat.hrc index c0a7b1ce6b37..2410c396ee83 100644 --- a/sc/source/ui/docshell/tpstat.hrc +++ b/sc/source/ui/docshell/tpstat.hrc @@ -2,9 +2,9 @@ * * $RCSfile: tpstat.hrc,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:55 $ + * last change: $Author: dr $ $Date: 2001-05-30 13:48:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,4 +67,4 @@ #define FT_PAGES 5 #define FT_PAGES_LBL 6 -#define GB_INFO 1 +#define FL_INFO 1 diff --git a/sc/source/ui/docshell/tpstat.src b/sc/source/ui/docshell/tpstat.src index 014edc73a3d3..b8619f80b058 100644 --- a/sc/source/ui/docshell/tpstat.src +++ b/sc/source/ui/docshell/tpstat.src @@ -2,9 +2,9 @@ * * $RCSfile: tpstat.src,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: kz $ $Date: 2001-05-17 07:46:41 $ + * last change: $Author: dr $ $Date: 2001-05-30 13:48:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -177,10 +177,10 @@ TabPage RID_SCPAGE_STAT Size = MAP_APPFONT ( 27 , 8 ) ; Left = TRUE ; }; - GroupBox GB_INFO + FixedLine FL_INFO { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 248 , 176 ) ; + Size = MAP_APPFONT ( 248 , 8 ) ; Text = "Dokument: " ; Text [ ENGLISH ] = "Document: " ; Text [ english_us ] = "Document: " ; -- cgit