diff options
22 files changed, 279 insertions, 398 deletions
diff --git a/dbaccess/source/ui/dlg/AdabasStat.cxx b/dbaccess/source/ui/dlg/AdabasStat.cxx index b33dc74b6ecc..d121349c1fb5 100644 --- a/dbaccess/source/ui/dlg/AdabasStat.cxx +++ b/dbaccess/source/ui/dlg/AdabasStat.cxx @@ -2,9 +2,9 @@ * * $RCSfile: AdabasStat.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: oj $ $Date: 2001-05-28 06:50:20 $ + * last change: $Author: fme $ $Date: 2001-06-21 15:07:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -115,14 +115,14 @@ OAdabasStatistics::OAdabasStatistics( Window* pParent, const Reference< ::com::sun::star::sdbc::XConnection >& _xCurrentConnection, const Reference< XMultiServiceFactory >& _xFactory) : ModalDialog( pParent, ModuleRes(DLG_ADABASSTAT) ) - ,m_GB_FILES( this , ResId(GB_FILES)) + ,m_FL_FILES( this , ResId(FL_FILES)) ,m_FT_SYSDEVSPACE( this , ResId(FT_SYSDEVSPACE)) ,m_ET_SYSDEVSPACE( this , STR_ADABAS_HELP_SYSDEVSPACE,ResId(ET_SYSDEVSPACE)) ,m_FT_TRANSACTIONLOG( this , ResId(FT_TRANSACTIONLOG)) ,m_ET_TRANSACTIONLOG( this , STR_ADABAS_HELP_TRANSACT,ResId(ET_TRANSACTIONLOG)) ,m_FT_DATADEVSPACE( this , ResId(FT_DATADEVSPACE)) ,m_LB_DATADEVS( this , STR_ADABAS_HELP_DATADEVSPACES,ResId(LB_DATADEVS)) - ,m_GB_SIZES( this , ResId(GB_SIZES)) + ,m_FL_SIZES( this , ResId(FL_SIZES)) ,m_FT_SIZE( this , ResId(FT_SIZE)) ,m_ET_SIZE( this , STR_ADABAS_HELP_SIZE,ResId(ET_SIZE)) ,m_FT_FREESIZE( this , ResId(FT_FREESIZE)) diff --git a/dbaccess/source/ui/dlg/AdabasStat.hrc b/dbaccess/source/ui/dlg/AdabasStat.hrc index 561b251711b1..109c10ca249c 100644 --- a/dbaccess/source/ui/dlg/AdabasStat.hrc +++ b/dbaccess/source/ui/dlg/AdabasStat.hrc @@ -2,9 +2,9 @@ * * $RCSfile: AdabasStat.hrc,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: oj $ $Date: 2001-03-27 07:17:01 $ + * last change: $Author: fme $ $Date: 2001-06-21 15:07:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,8 +79,8 @@ #define PB_OK 1 -#define GB_FILES 1 -#define GB_SIZES 2 +#define FL_FILES 1 +#define FL_SIZES 2 #endif // DBAUI_ADABASSTAT_HRC diff --git a/dbaccess/source/ui/dlg/AdabasStat.hxx b/dbaccess/source/ui/dlg/AdabasStat.hxx index e32ba7940bba..5a918fc1df6e 100644 --- a/dbaccess/source/ui/dlg/AdabasStat.hxx +++ b/dbaccess/source/ui/dlg/AdabasStat.hxx @@ -2,9 +2,9 @@ * * $RCSfile: AdabasStat.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: oj $ $Date: 2001-03-27 07:17:09 $ + * last change: $Author: fme $ $Date: 2001-06-21 15:07:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,9 +70,6 @@ #ifndef _SV_DIALOG_HXX #include <vcl/dialog.hxx> #endif -#ifndef _SV_GROUP_HXX -#include <vcl/group.hxx> -#endif #ifndef DBAUI_FIELDCONTROLS_HXX #include "FieldControls.hxx" #endif @@ -96,14 +93,14 @@ namespace dbaui { protected: - GroupBox m_GB_FILES; + FixedLine m_FL_FILES; FixedText m_FT_SYSDEVSPACE; OPropEditCtrl m_ET_SYSDEVSPACE; FixedText m_FT_TRANSACTIONLOG; OPropEditCtrl m_ET_TRANSACTIONLOG; FixedText m_FT_DATADEVSPACE; OPropListBoxCtrl m_LB_DATADEVS; - GroupBox m_GB_SIZES; + FixedLine m_FL_SIZES; FixedText m_FT_SIZE; OPropEditCtrl m_ET_SIZE; FixedText m_FT_FREESIZE; diff --git a/dbaccess/source/ui/dlg/AdabasStat.src b/dbaccess/source/ui/dlg/AdabasStat.src index 18c6579fadb4..845326b834f4 100644 --- a/dbaccess/source/ui/dlg/AdabasStat.src +++ b/dbaccess/source/ui/dlg/AdabasStat.src @@ -2,9 +2,9 @@ * * $RCSfile: AdabasStat.src,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: kz $ $Date: 2001-06-13 22:17:23 $ + * last change: $Author: fme $ $Date: 2001-06-21 15:07:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,10 +77,10 @@ ModalDialog DLG_ADABASSTAT SVLook = TRUE ; Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; - GroupBox GB_FILES + FixedLine FL_FILES { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( WINDOW_SIZE_X - 12, 93 ) ; + Size = MAP_APPFONT ( WINDOW_SIZE_X - 12, 8 ) ; Text = "Datenbankdateien" ; Text[ENGLISH] = "Database files" ; Text[ english_us ] = "Database files"; @@ -217,10 +217,10 @@ ModalDialog DLG_ADABASSTAT VScroll = TRUE; HScroll = TRUE; }; - GroupBox GB_SIZES + FixedLine FL_SIZES { Pos = MAP_APPFONT ( 6 , 99 ) ; - Size = MAP_APPFONT ( WINDOW_SIZE_X - 12 , 65 ) ; + Size = MAP_APPFONT ( WINDOW_SIZE_X - 12 , 8 ) ; Text = "Datenbankgren" ; Text [ ENGLISH ] = "database sizes" ; Text[ english_us ] = "Database sizes"; diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx index 5f622f0372fa..3960273418dc 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.cxx +++ b/dbaccess/source/ui/dlg/RelationDlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: RelationDlg.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: oj $ $Date: 2001-05-04 11:19:38 $ + * last change: $Author: fme $ $Date: 2001-06-21 15:07:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -467,16 +467,16 @@ ORelationDialog::ORelationDialog( OJoinTableView* pParent, ORelationTableConnectionData* pConnectionData, BOOL bAllowTableSelect ) : ModalDialog( pParent, ModuleRes(DLG_REL_PROPERTIES) ) - ,aGB_InvolvedTables( this, ModuleRes(GB_INVOLVED_TABLES)) + ,aFL_InvolvedTables( this, ModuleRes(FL_INVOLVED_TABLES)) ,m_lmbLeftTable( this, ModuleRes(LB_LEFT_TABLE)) ,m_lmbRightTable( this, ModuleRes(LB_RIGHT_TABLE)) - ,aGB_InvolvedFields( this, ModuleRes(GB_INVOLVED_FIELDS)) - ,aGB_CascUpd( this, ModuleRes(GB_CASC_UPD) ) + ,aFL_InvolvedFields( this, ModuleRes(FL_INVOLVED_FIELDS)) + ,aFL_CascUpd( this, ModuleRes(FL_CASC_UPD) ) ,aRB_NoCascUpd( this, ModuleRes(RB_NO_CASC_UPD) ) ,aRB_CascUpd( this, ModuleRes(RB_CASC_UPD) ) ,aRB_CascUpdNull( this, ModuleRes(RB_CASC_UPD_NULL) ) ,aRB_CascUpdDefault( this, ModuleRes(RB_CASC_UPD_DEFAULT) ) - ,aGB_CascDel( this, ModuleRes(GB_CASC_DEL) ) + ,aFL_CascDel( this, ModuleRes(FL_CASC_DEL) ) ,aRB_NoCascDel( this, ModuleRes(RB_NO_CASC_DEL) ) ,aRB_CascDel( this, ModuleRes(RB_CASC_DEL) ) ,aRB_CascDelNull( this, ModuleRes(RB_CASC_DEL_NULL) ) @@ -500,7 +500,7 @@ ORelationDialog::ORelationDialog( OJoinTableView* pParent, ////////////////////////////////////////////////////////////////////// // BrowseBox positionieren - Point aDlgPoint = LogicToPixel( Point(12,55), MAP_APPFONT ); + Point aDlgPoint = LogicToPixel( Point(12,43), MAP_APPFONT ); Size aDlgSize = LogicToPixel( Size(162,68), MAP_APPFONT ); m_pRC_Tables->SetPosSizePixel( aDlgPoint, aDlgSize ); m_pRC_Tables->Show(); diff --git a/dbaccess/source/ui/dlg/RelationDlg.hrc b/dbaccess/source/ui/dlg/RelationDlg.hrc index 7637d47cb363..41dddd225dab 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.hrc +++ b/dbaccess/source/ui/dlg/RelationDlg.hrc @@ -2,9 +2,9 @@ * * $RCSfile: RelationDlg.hrc,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: oj $ $Date: 2001-02-28 10:02:51 $ + * last change: $Author: fme $ $Date: 2001-06-21 15:07:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,10 +67,10 @@ #define FT_TABLE1 1 #define FT_TABLE2 2 -#define GB_INVOLVED_TABLES 1 -#define GB_INVOLVED_FIELDS 2 -#define GB_CASC_DEL 3 -#define GB_CASC_UPD 4 +#define FL_INVOLVED_TABLES 1 +#define FL_INVOLVED_FIELDS 2 +#define FL_CASC_DEL 3 +#define FL_CASC_UPD 4 #define RB_NO_CASC_DEL 1 #define RB_NO_CASC_UPD 2 diff --git a/dbaccess/source/ui/dlg/RelationDlg.src b/dbaccess/source/ui/dlg/RelationDlg.src index 7a65a9b46bd1..a6aad3e2c823 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.src +++ b/dbaccess/source/ui/dlg/RelationDlg.src @@ -1,6 +1,6 @@ //-------------------------------------------------------------------------- // - // $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/dbaccess/source/ui/dlg/RelationDlg.src,v 1.10 2001-06-13 22:19:14 kz Exp $ + // $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/dbaccess/source/ui/dlg/RelationDlg.src,v 1.11 2001-06-21 15:07:11 fme Exp $ // // (c) Copyright 1997 by Star Division GmbH, Hamburg. // @@ -8,7 +8,7 @@ // AWO // // Letzte Aenderung: - // $Author: kz $ $Date: 2001-06-13 22:19:14 $ $Revision: 1.10 $ + // $Author: fme $ $Date: 2001-06-21 15:07:11 $ $Revision: 1.11 $ // //-------------------------------------------------------------------------- #ifndef DBAUI_RELATIONDIALOG_HRC @@ -23,17 +23,17 @@ ModalDialog DLG_REL_PROPERTIES { OutputSize = TRUE ; SVLook = TRUE ; - Size = MAP_APPFONT ( 186 , 235 ) ; + Size = MAP_APPFONT ( 186 , 205 ) ; Text = "Relationen" ; Text [ english ] = "Relations" ; Text [ english_us ] = "Relations" ; Moveable = TRUE ; Closeable = TRUE ; - GroupBox GB_INVOLVED_TABLES + FixedLine FL_INVOLVED_TABLES { - Pos = MAP_APPFONT ( 6 , 6 ) ; - Size = MAP_APPFONT ( 174 , 31 ) ; + Pos = MAP_APPFONT ( 6 , 3 ) ; + Size = MAP_APPFONT ( 174 , 8 ) ; Text = "beteiligte Tabellen" ; Text [ English ] = "involved tables" ; Text[ english_us ] = "Tables involved"; @@ -61,7 +61,7 @@ ModalDialog DLG_REL_PROPERTIES ListBox LB_LEFT_TABLE { Border = TRUE; - Pos = MAP_APPFONT( 12, 18 ); + Pos = MAP_APPFONT( 12, 14 ); Size = MAP_APPFONT( 78, 60 ); DropDown = TRUE; TabStop = TRUE; @@ -70,16 +70,16 @@ ModalDialog DLG_REL_PROPERTIES ListBox LB_RIGHT_TABLE { Border = TRUE; - Pos = MAP_APPFONT( 96, 18 ); + Pos = MAP_APPFONT( 96, 14 ); Size = MAP_APPFONT( 78, 60 ); DropDown = TRUE; TabStop = TRUE; }; - GroupBox GB_INVOLVED_FIELDS + FixedLine FL_INVOLVED_FIELDS { - Pos = MAP_APPFONT ( 6 , 43 ) ; - Size = MAP_APPFONT ( 174 , 86 ) ; + Pos = MAP_APPFONT ( 6 , 29 ) ; + Size = MAP_APPFONT ( 174 , 8 ) ; Text = "beteiligte Felder" ; Text [ English ] = "involved fields" ; Text[ english_us ] = "Fields involved"; @@ -104,10 +104,10 @@ ModalDialog DLG_REL_PROPERTIES Text[ finnish ] = "beteiligte Felder"; }; - GroupBox GB_CASC_UPD + FixedLine FL_CASC_UPD { - Pos = MAP_APPFONT ( 6 , 135 ) ; - Size = MAP_APPFONT ( 84 , 71 ) ; + Pos = MAP_APPFONT ( 6 , 114 ) ; + Size = MAP_APPFONT ( 84 , 8 ) ; Text = "Update Optionen" ; Text [ English ] = "Update options" ; Text [ english_us ] = "Update options" ; @@ -134,8 +134,8 @@ ModalDialog DLG_REL_PROPERTIES }; RadioButton RB_NO_CASC_UPD { - Pos = MAP_APPFONT ( 12 , 147 ) ; - Size = MAP_APPFONT ( 72 , 12 ) ; + Pos = MAP_APPFONT ( 12 , 125 ) ; + Size = MAP_APPFONT ( 72 , 10 ) ; TabStop = TRUE ; Text = "~Keine Aktion" ; Text [ English ] = "No action" ; @@ -163,8 +163,8 @@ ModalDialog DLG_REL_PROPERTIES }; RadioButton RB_CASC_UPD { - Pos = MAP_APPFONT ( 12 , 162 ) ; - Size = MAP_APPFONT ( 72 , 12 ) ; + Pos = MAP_APPFONT ( 12 , 139 ) ; + Size = MAP_APPFONT ( 72 , 10 ) ; Text = "K~ask. Update" ; Text [ English ] = "Cascading update" ; Text [ portuguese ] = "Actualizar ~cascata" ; @@ -191,8 +191,8 @@ ModalDialog DLG_REL_PROPERTIES }; RadioButton RB_CASC_UPD_NULL { - Pos = MAP_APPFONT ( 12 , 177 ) ; - Size = MAP_APPFONT ( 72 , 12 ) ; + Pos = MAP_APPFONT ( 12 , 153 ) ; + Size = MAP_APPFONT ( 72 , 10 ) ; Text = "~Null setzen" ; Text [ English ] = "Set null" ; Text [ portuguese ] = "Definir ~Null" ; @@ -219,8 +219,8 @@ ModalDialog DLG_REL_PROPERTIES }; RadioButton RB_CASC_UPD_DEFAULT { - Pos = MAP_APPFONT ( 12 , 192 ) ; - Size = MAP_APPFONT ( 72 , 12 ) ; + Pos = MAP_APPFONT ( 12 , 167 ) ; + Size = MAP_APPFONT ( 72 , 10 ) ; Text = "~Default setzen" ; Text [ English ] = "Set default" ; Text [ portuguese ] = "Definir ~padro" ; @@ -245,11 +245,11 @@ ModalDialog DLG_REL_PROPERTIES Text[ catalan ] = "~Predeterminar"; Text[ finnish ] = "~Default setzen"; }; -// zweite Groupbox - GroupBox GB_CASC_DEL +// zweite FixedLine + FixedLine FL_CASC_DEL { - Pos = MAP_APPFONT ( 96 , 135 ) ; - Size = MAP_APPFONT ( 84 , 71 ) ; + Pos = MAP_APPFONT ( 96 , 114 ) ; + Size = MAP_APPFONT ( 84 , 8 ) ; Text = "Lschoptionen" ; Text [ English ] = "Delete options" ; Text [ english_us ] = "Delete options" ; @@ -276,8 +276,8 @@ ModalDialog DLG_REL_PROPERTIES }; RadioButton RB_NO_CASC_DEL { - Pos = MAP_APPFONT ( 102 , 147 ) ; - Size = MAP_APPFONT ( 72 , 12 ) ; + Pos = MAP_APPFONT ( 102 , 125 ) ; + Size = MAP_APPFONT ( 72 , 10 ) ; TabStop = TRUE ; Text = "K~eine Aktion" ; Text [ English ] = "No action" ; @@ -305,8 +305,8 @@ ModalDialog DLG_REL_PROPERTIES }; RadioButton RB_CASC_DEL { - Pos = MAP_APPFONT ( 102 , 162 ) ; - Size = MAP_APPFONT ( 72 , 12 ) ; + Pos = MAP_APPFONT ( 102 , 139 ) ; + Size = MAP_APPFONT ( 72 , 10 ) ; Text = "Ka~sk. Lschen" ; Text [ English ] = "Cascading delete" ; Text [ portuguese ] = "Eli~minar cascata" ; @@ -333,8 +333,8 @@ ModalDialog DLG_REL_PROPERTIES }; RadioButton RB_CASC_DEL_NULL { - Pos = MAP_APPFONT ( 102 , 177 ) ; - Size = MAP_APPFONT ( 72 , 12 ) ; + Pos = MAP_APPFONT ( 102 , 153 ) ; + Size = MAP_APPFONT ( 72 , 10 ) ; Text = "Nu~ll setzen" ; Text [ English ] = "Set null" ; Text [ portuguese ] = "Definir ~Null" ; @@ -361,8 +361,8 @@ ModalDialog DLG_REL_PROPERTIES }; RadioButton RB_CASC_DEL_DEFAULT { - Pos = MAP_APPFONT ( 102 , 192 ) ; - Size = MAP_APPFONT ( 72 , 12 ) ; + Pos = MAP_APPFONT ( 102 , 167 ) ; + Size = MAP_APPFONT ( 72 , 10 ) ; Text = "De~fault setzen" ; Text [ English ] = "Set default" ; Text [ portuguese ] = "Definir ~padro" ; @@ -390,20 +390,20 @@ ModalDialog DLG_REL_PROPERTIES OKButton PB_OK { - Pos = MAP_APPFONT ( 6 , 216 ) ; + Pos = MAP_APPFONT ( 6 , 184 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; DefButton = TRUE ; }; CancelButton PB_CANCEL { - Pos = MAP_APPFONT ( 59 , 216 ) ; + Pos = MAP_APPFONT ( 59 , 184 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; }; HelpButton PB_HELP { - Pos = MAP_APPFONT ( 115 , 216 ) ; + Pos = MAP_APPFONT ( 115 , 184 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; }; diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index 00122093280a..9bef0d869e4c 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: adtabdlg.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: oj $ $Date: 2001-03-19 12:42:25 $ + * last change: $Author: fme $ $Date: 2001-06-21 15:07:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -123,7 +123,7 @@ OAddTableDlg::OAddTableDlg( Window* pParent) ,aAddButton( this, ResId( PB_ADDTABLE ) ) ,aCloseButton( this, ResId( PB_CLOSE ) ) ,aHelpButton( this, ResId( PB_HELP ) ) - ,aGroupBoxTable( this, ResId( GB_TABLE ) ) + ,aFixedLineTable( this, ResId( FL_TABLE ) ) ,aDefaultString( ResId( STR_DEFAULT ) ) { DBG_CTOR(OAddTableDlg,NULL); diff --git a/dbaccess/source/ui/dlg/adtabdlg.hrc b/dbaccess/source/ui/dlg/adtabdlg.hrc index eed60d7353c0..389028936ea7 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.hrc +++ b/dbaccess/source/ui/dlg/adtabdlg.hrc @@ -2,9 +2,9 @@ * * $RCSfile: adtabdlg.hrc,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: oj $ $Date: 2001-02-05 09:15:13 $ + * last change: $Author: fme $ $Date: 2001-06-21 15:07:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,7 +65,7 @@ #define LB_DATABASE 2 #define FT_TABLE 1 #define FT_DATABASE 2 -#define GB_TABLE 1 +#define FL_TABLE 1 #define PB_ADDTABLE 1 #define PB_CLOSE 2 #define PB_HELP 3 diff --git a/dbaccess/source/ui/dlg/adtabdlg.src b/dbaccess/source/ui/dlg/adtabdlg.src index 1a38d38626c4..4ec84e668214 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.src +++ b/dbaccess/source/ui/dlg/adtabdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: adtabdlg.src,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: kz $ $Date: 2001-06-13 22:21:09 $ + * last change: $Author: fme $ $Date: 2001-06-21 15:07:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,7 +73,7 @@ ModelessDialog DLG_JOIN_TABADD OutputSize = TRUE ; SVLook = TRUE ; HelpID = DLG_JOIN_TABADD ; - Size = MAP_APPFONT ( 178 , 155 ) ; + Size = MAP_APPFONT ( 178 , 147 ) ; /* ### ACHTUNG: Neuer Text in Resource? Tabellen hinzufgen : Tabellen hinzufgen */ Text = "Tabellen hinzufgen" ; Text [ ENGLISH ] = "Add tables" ; @@ -95,7 +95,7 @@ ModelessDialog DLG_JOIN_TABADD FixedText FT_TABLE { Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 100 , 10 ) ; + Size = MAP_APPFONT ( 100 , 8 ) ; Text = "~Tabellenname" ; Text [ ENGLISH ] = "~Table name" ; Text [ NORWEGIAN ] = "~Table name" ; @@ -204,10 +204,10 @@ ModelessDialog DLG_JOIN_TABADD Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; }; - GroupBox GB_TABLE + FixedLine FL_TABLE { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 111 , 146 ) ; + Size = MAP_APPFONT ( 111 , 8 ) ; Text = "Tabelle" ; Text [ ENGLISH ] = "Table" ; Text [ NORWEGIAN ] = "Table" ; diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index faebbbc3b167..a86b0aed7f48 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dbfindex.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: fs $ $Date: 2001-06-12 15:42:44 $ + * last change: $Author: fme $ $Date: 2001-06-21 15:07:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -119,23 +119,23 @@ ODbaseIndexDialog::ODbaseIndexDialog( Window * pParent, String aDataSrcName ) aPB_HELP( this, ResId( PB_HELP ) ), m_FT_Tables( this, ResId( FT_TABLES ) ), aCB_Tables( this, ResId( CB_TABLES ) ), - m_GB_Indexes( this, ResId( GB_INDEXES ) ), + m_FL_Indexes( this, ResId( FL_INDEXES ) ), m_FT_TableIndexes( this, ResId( FT_TABLEINDEXES ) ), aLB_TableIndexes( this, ResId( LB_TABLEINDEXES ) ), m_FT_AllIndexes( this, ResId( FT_ALLINDEXES ) ), aLB_FreeIndexes( this, ResId( LB_FREEINDEXES ) ), - aPB_Add( this, ResId( PB_ADD ) ), - aPB_Remove( this, ResId( PB_REMOVE ) ), - aPB_AddAll( this, ResId( PB_ADDALL ) ), - aPB_RemoveAll( this, ResId( PB_REMOVEALL ) ), + aIB_Add( this, ResId( IB_ADD ) ), + aIB_Remove( this, ResId( IB_REMOVE ) ), + aIB_AddAll( this, ResId( IB_ADDALL ) ), + aIB_RemoveAll( this, ResId( IB_REMOVEALL ) ), m_aDSN(aDataSrcName), m_bCaseSensitiv(sal_True) { aCB_Tables.SetSelectHdl( LINK(this, ODbaseIndexDialog, TableSelectHdl) ); - aPB_Add.SetClickHdl( LINK(this, ODbaseIndexDialog, AddClickHdl) ); - aPB_Remove.SetClickHdl( LINK(this, ODbaseIndexDialog, RemoveClickHdl) ); - aPB_AddAll.SetClickHdl( LINK(this, ODbaseIndexDialog, AddAllClickHdl) ); - aPB_RemoveAll.SetClickHdl( LINK(this, ODbaseIndexDialog, RemoveAllClickHdl) ); + aIB_Add.SetClickHdl( LINK(this, ODbaseIndexDialog, AddClickHdl) ); + aIB_Remove.SetClickHdl( LINK(this, ODbaseIndexDialog, RemoveClickHdl) ); + aIB_AddAll.SetClickHdl( LINK(this, ODbaseIndexDialog, AddAllClickHdl) ); + aIB_RemoveAll.SetClickHdl( LINK(this, ODbaseIndexDialog, RemoveAllClickHdl) ); aPB_OK.SetClickHdl( LINK(this, ODbaseIndexDialog, OKClickHdl) ); aLB_FreeIndexes.SetSelectHdl( LINK(this, ODbaseIndexDialog, OnListEntrySelected) ); @@ -177,11 +177,11 @@ sal_Bool ODbaseIndexDialog::GetTable(const String& _rName, TableInfoListIterator //------------------------------------------------------------------------- void ODbaseIndexDialog::checkButtons() { - aPB_Add.Enable(0 != aLB_FreeIndexes.GetSelectEntryCount()); - aPB_AddAll.Enable(0 != aLB_FreeIndexes.GetEntryCount()); + aIB_Add.Enable(0 != aLB_FreeIndexes.GetSelectEntryCount()); + aIB_AddAll.Enable(0 != aLB_FreeIndexes.GetEntryCount()); - aPB_Remove.Enable(0 != aLB_TableIndexes.GetSelectEntryCount()); - aPB_RemoveAll.Enable(0 != aLB_TableIndexes.GetEntryCount()); + aIB_Remove.Enable(0 != aLB_TableIndexes.GetSelectEntryCount()); + aIB_RemoveAll.Enable(0 != aLB_TableIndexes.GetEntryCount()); } //------------------------------------------------------------------------- @@ -348,15 +348,15 @@ IMPL_LINK( ODbaseIndexDialog, TableSelectHdl, ComboBox*, pComboBox ) void ODbaseIndexDialog::Init() { aPB_OK.Disable(); - m_GB_Indexes.Disable(); + m_FL_Indexes.Disable(); m_FT_TableIndexes.Disable(); aLB_TableIndexes.Disable(); m_FT_AllIndexes.Disable(); aLB_FreeIndexes.Disable(); - aPB_Add.Disable(); - aPB_Remove.Disable(); - aPB_AddAll.Disable(); - aPB_RemoveAll.Disable(); + aIB_Add.Disable(); + aIB_Remove.Disable(); + aIB_AddAll.Disable(); + aIB_RemoveAll.Disable(); /////////////////////////////////////////////////////////////////////////// // Alle Indizes werden erst einmal zur Liste der freien Indizes hinzugefuegt. @@ -463,7 +463,7 @@ void ODbaseIndexDialog::Init() if (m_aTableInfoList.size()) { aPB_OK.Enable(); - m_GB_Indexes.Enable(); + m_FL_Indexes.Enable(); m_FT_TableIndexes.Enable(); aLB_TableIndexes.Enable(); m_FT_AllIndexes.Enable(); @@ -599,6 +599,9 @@ void OTableInfo::WriteInfFile( const String& rDSN ) const /************************************************************************* * history: * $Log: not supported by cvs2svn $ + * Revision 1.9 2001/06/12 15:42:44 fs + * #88079# catch the property exceptions + * * Revision 1.8 2001/05/29 06:44:52 fs * #87037# Init: don't cut the extension from the index URLs * diff --git a/dbaccess/source/ui/dlg/dbfindex.hrc b/dbaccess/source/ui/dlg/dbfindex.hrc index 1bd2ae819851..0d67da065568 100644 --- a/dbaccess/source/ui/dlg/dbfindex.hrc +++ b/dbaccess/source/ui/dlg/dbfindex.hrc @@ -7,7 +7,7 @@ #define FT_TABLEINDEXES 2 #define FT_ALLINDEXES 3 -#define GB_INDEXES 1 +#define FL_INDEXES 1 #define LB_TABLEINDEXES 1 #define LB_FREEINDEXES 2 @@ -16,10 +16,10 @@ #define PB_CANCEL 1 #define PB_HELP 1 -#define PB_ADD 1 -#define PB_REMOVE 2 -#define PB_ADDALL 3 -#define PB_REMOVEALL 4 +#define IB_ADD 1 +#define IB_REMOVE 2 +#define IB_ADDALL 3 +#define IB_REMOVEALL 4 #endif //_DBAUI_DBF_INDEXES_HRC_ diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx index ecb772924394..de9b302cdbb2 100644 --- a/dbaccess/source/ui/dlg/dbfindex.hxx +++ b/dbaccess/source/ui/dlg/dbfindex.hxx @@ -2,9 +2,9 @@ * * $RCSfile: dbfindex.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: fs $ $Date: 2001-05-14 13:25:15 $ + * last change: $Author: fme $ $Date: 2001-06-21 15:07:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,9 +65,6 @@ #ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> #endif -#ifndef _GROUP_HXX //autogen -#include <vcl/group.hxx> -#endif #ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> #endif @@ -150,7 +147,7 @@ protected: FixedText m_FT_Tables; ComboBox aCB_Tables; - GroupBox m_GB_Indexes; + FixedLine m_FL_Indexes; FixedText m_FT_TableIndexes; ListBox aLB_TableIndexes; @@ -158,10 +155,10 @@ protected: FixedText m_FT_AllIndexes; ListBox aLB_FreeIndexes; - PushButton aPB_Add; - PushButton aPB_Remove; - PushButton aPB_AddAll; - PushButton aPB_RemoveAll; + ImageButton aIB_Add; + ImageButton aIB_Remove; + ImageButton aIB_AddAll; + ImageButton aIB_RemoveAll; DECL_LINK( TableSelectHdl, ComboBox* ); DECL_LINK( AddClickHdl, PushButton* ); @@ -204,6 +201,9 @@ public: /************************************************************************* * history: * $Log: not supported by cvs2svn $ + * Revision 1.5 2001/05/14 13:25:15 fs + * #86942# +checkButtons / OnListEntrySelected + * * Revision 1.4 2001/03/07 16:44:40 fs * added a parameter to implRemoveIndex controlling the assertion / correct collecting the indexes in Init * diff --git a/dbaccess/source/ui/dlg/dbfindex.src b/dbaccess/source/ui/dlg/dbfindex.src index c17b04df502c..8edffbdc0167 100644 --- a/dbaccess/source/ui/dlg/dbfindex.src +++ b/dbaccess/source/ui/dlg/dbfindex.src @@ -2,9 +2,9 @@ * * $RCSfile: dbfindex.src,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: kz $ $Date: 2001-06-13 22:26:30 $ + * last change: $Author: fme $ $Date: 2001-06-21 15:07:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,8 +66,8 @@ #include "dbu_resource.hrc" #endif -#define WIN_X 202 -#define WIN_Y 168 +#define WIN_X 264 +#define WIN_Y 149 ModalDialog DLG_DBASE_INDEXES { @@ -86,48 +86,28 @@ ModalDialog DLG_DBASE_INDEXES Closeable = TRUE ; OKButton PB_OK { - Pos = MAP_APPFONT ( 6 , WIN_Y - 20 ) ; + Pos = MAP_APPFONT ( 208 , 5 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; }; CancelButton PB_CANCEL { - Pos = MAP_APPFONT ( 59 , WIN_Y - 20 ) ; + Pos = MAP_APPFONT ( 208 , 23 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; }; HelpButton PB_HELP { - Pos = MAP_APPFONT ( WIN_X - 56 , WIN_Y - 20 ) ; + Pos = MAP_APPFONT ( 208 , 43 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; }; FixedText FT_TABLES { - Pos = MAP_APPFONT ( 8 , 6 ) ; - Size = MAP_APPFONT ( 50 , 10 ) ; - Text = "~Tabelle:" ; - Text [ english ] = "Table:" ; - Text [ english_us ] = "~Table:" ; - Text [ spanish ] = "~Tabla:" ; - Text [ french ] = "~Table :" ; - Text [ italian ] = "Tabella:" ; - Text [ dutch ] = "~Tabel: " ; - Text [ portuguese ] = "~Tabela:" ; - Text [ portuguese_brazilian ] = "Tabelle:" ; - Text [ danish ] = "Tabel:" ; - Text [ swedish ] = "~Tabell:" ; - Text[ chinese_simplified ] = "(~T)"; - Text[ russian ] = ":"; - Text[ polish ] = "Tabela:"; - Text[ japanese ] = "ð(~T):"; - Text[ chinese_traditional ] = "(~T)G"; - Text[ arabic ] = ":"; - Text[ greek ] = ":"; - Text[ korean ] = "ǥ(~T):"; - Text[ turkish ] = "Tablo:"; - Text[ catalan ] = "~Tabla:"; - Text[ finnish ] = "~Taulukko:"; + Pos = MAP_APPFONT ( 8 , 7 ) ; + Size = MAP_APPFONT ( 50 , 8 ) ; + Text = "~Tabelle" ; + Text [ english ] = "Table" ; }; ComboBox CB_TABLES { @@ -138,10 +118,10 @@ ModalDialog DLG_DBASE_INDEXES TabStop = TRUE ; DropDown = TRUE ; }; - GroupBox GB_INDEXES + FixedLine FL_INDEXES { Pos = MAP_APPFONT ( 6 , 22 ) ; - Size = MAP_APPFONT ( WIN_X - 12 , 120 ) ; + Size = MAP_APPFONT ( 196 , 8 ) ; Text = "Zuweisung" ; Text [ english ] = "Assignment" ; Text [ english_us ] = "Assignment" ; @@ -168,100 +148,108 @@ ModalDialog DLG_DBASE_INDEXES FixedText FT_TABLEINDEXES { Pos = MAP_APPFONT ( 12 , 33 ) ; - Size = MAP_APPFONT ( 83 , 10 ) ; - Text = "T~abellenindizes:" ; - Text [ english ] = "Table indexes:" ; - Text [ english_us ] = "T~able indexes:" ; - Text [ spanish ] = "ndices de ta~bla:" ; - Text [ french ] = "~Index de table :" ; - Text [ italian ] = "Indici t~abella:" ; - Text [ dutch ] = "Tabel~indices: " ; - Text [ portuguese ] = "~ndices de tabelas:" ; - Text [ portuguese_brazilian ] = "Tabellenindizes:" ; - Text [ swedish ] = "T~abellindex:" ; - Text [ danish ] = "Tabelindeks:" ; - Text[ chinese_simplified ] = "־(~A)"; - Text[ russian ] = " :"; - Text[ polish ] = "Indeksy tabeli:"; - Text[ japanese ] = "ðق̲ޯ(~A):"; - Text[ chinese_traditional ] = "лx(~A)G"; - Text[ arabic ] = " :"; - Text[ greek ] = "~ :"; - Text[ korean ] = "ǥ (~A):"; - Text[ turkish ] = "Tablo dizinleri:"; - Text[ catalan ] = "ndices de ta~bla:"; - Text[ finnish ] = "T~aulukkohakemistot:"; + Size = MAP_APPFONT ( 83 , 8 ) ; + Text = "T~abellenindizes" ; + Text [ english ] = "Table indexes" ; }; ListBox LB_TABLEINDEXES { Border = TRUE ; SVLook = TRUE ; - Pos = MAP_APPFONT ( 12 , 46 ) ; - Size = MAP_APPFONT ( 73 , 90 ) ; + Pos = MAP_APPFONT ( 12 , 44 ) ; + Size = MAP_APPFONT ( 76 , 98 ) ; TabStop = TRUE ; }; FixedText FT_ALLINDEXES { - Pos = MAP_APPFONT ( 117 , 33 ) ; - Size = MAP_APPFONT ( 73 , 10 ) ; - Text = "~Freie Indizes:" ; - Text [ english ] = "Free Indexes:" ; - Text [ english_us ] = "~Free indexes:" ; - Text [ spanish ] = "ndices lib~res:" ; - Text [ french ] = "Index ~libres :" ; - Text [ italian ] = "Indici liberi:" ; - Text [ dutch ] = "~Vrije indices: " ; - Text [ portuguese ] = "ndices ~livres:" ; - Text [ portuguese_brazilian ] = "Freie Indizes" ; - Text [ swedish ] = "~Fria index:" ; - Text [ danish ] = "Frie indeks:" ; - Text[ chinese_simplified ] = "ɱ־(~F)"; - Text[ russian ] = " :"; - Text[ polish ] = "Wolne indeksy:"; - Text[ japanese ] = "ذޯ(~F)"; - Text[ chinese_traditional ] = "ۥѼлx(~F)G"; - Text[ arabic ] = " :"; - Text[ greek ] = "~ "; - Text[ korean ] = " (~F)"; - Text[ turkish ] = "Bo dizinler:"; - Text[ catalan ] = "ndices lib~res:"; - Text[ finnish ] = "~Vapaat hakemistot:"; + Pos = MAP_APPFONT ( 120 , 33 ) ; + Size = MAP_APPFONT ( 73 , 8 ) ; + Text = "~Freie Indizes" ; + Text [ english ] = "Free Indexes" ; }; ListBox LB_FREEINDEXES { Border = TRUE ; SVLook = TRUE ; - Pos = MAP_APPFONT ( 117 , 46 ) ; - Size = MAP_APPFONT ( 73 , 90 ) ; + Pos = MAP_APPFONT ( 120 , 44 ) ; + Size = MAP_APPFONT ( 76 , 98 ) ; TabStop = TRUE ; }; - PushButton PB_ADD + ImageButton IB_ADD { - Pos = MAP_APPFONT ( 91 , 60 ) ; + Pos = MAP_APPFONT ( 94 , 60 ) ; Size = MAP_APPFONT ( 20 , 14 ) ; - Text = "<-" ; - TabStop = TRUE ; + TabStop = TRUE ; + ButtonImage = Image + { + ImageBitmap = Bitmap + { + File = "one_left.bmp" ; + }; + MaskColor = Color + { + Red = 0xC000 ; + Green = 0xC000 ; + Blue = 0xC000 ; + }; + }; }; - PushButton PB_ADDALL + ImageButton IB_ADDALL { - Pos = MAP_APPFONT ( 91 , 77 ) ; + Pos = MAP_APPFONT ( 94 , 77 ) ; Size = MAP_APPFONT ( 20 , 14 ) ; - Text = "~<<=" ; - TabStop = TRUE ; + TabStop = TRUE ; + ButtonImage = Image + { + ImageBitmap = Bitmap + { + File = "all_left.bmp" ; + }; + MaskColor = Color + { + Red = 0xC000 ; + Green = 0xC000 ; + Blue = 0xC000 ; + }; + }; }; - PushButton PB_REMOVE + ImageButton IB_REMOVE { - Pos = MAP_APPFONT ( 91 , 98 ) ; + Pos = MAP_APPFONT ( 94 , 98 ) ; Size = MAP_APPFONT ( 20 , 14 ) ; - Text = "->" ; - TabStop = TRUE ; + TabStop = TRUE ; + ButtonImage = Image + { + ImageBitmap = Bitmap + { + File = "one_right.bmp" ; + }; + MaskColor = Color + { + Red = 0xC000 ; + Green = 0xC000 ; + Blue = 0xC000 ; + }; + }; }; - PushButton PB_REMOVEALL + ImageButton IB_REMOVEALL { - Pos = MAP_APPFONT ( 91, 114 ) ; + Pos = MAP_APPFONT ( 94, 114 ) ; Size = MAP_APPFONT ( 20 , 14 ) ; - Text = "=~>>" ; - TabStop = TRUE ; + TabStop = TRUE ; + ButtonImage = Image + { + ImageBitmap = Bitmap + { + File = "all_right.bmp" ; + }; + MaskColor = Color + { + Red = 0xC000 ; + Green = 0xC000 ; + Blue = 0xC000 ; + }; + }; }; Text [ portuguese_brazilian ] = "Indizes" ; @@ -283,6 +271,9 @@ ModalDialog DLG_DBASE_INDEXES /************************************************************************* * history: * $Log: not supported by cvs2svn $ + * Revision 1.8 2001/06/13 22:26:30 kz + * Merge SRC633: 14.06.01 - 00:26:49 + * * Revision 1.7 2001/05/10 05:48:47 kz * Merge SRC631: 10.05.01 - 07:49:17 (NoBranch) * diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index e54a6165a2fe..32e0cd1db87f 100644 --- a/dbaccess/source/ui/dlg/queryfilter.cxx +++ b/dbaccess/source/ui/dlg/queryfilter.cxx @@ -2,9 +2,9 @@ * * $RCSfile: queryfilter.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: oj $ $Date: 2001-04-06 14:22:20 $ + * last change: $Author: fme $ $Date: 2001-06-21 15:07:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -161,7 +161,7 @@ DlgFilterCrit::DlgFilterCrit(Window * pParent, ,aFT_WHERECOMP ( this, ResId( FT_WHERECOMP ) ) ,aFT_WHEREVALUE ( this, ResId( FT_WHEREVALUE ) ) ,aFT_WHEREOPER ( this, ResId( FT_WHEREOPER ) ) - ,aGB_FIELDS ( this, ResId( GB_FIELDS ) ) + ,aFL_FIELDS ( this, ResId( FL_FIELDS ) ) ,aBT_OK ( this, ResId( BT_OK ) ) ,aBT_CANCEL ( this, ResId( BT_CANCEL ) ) ,aBT_HELP ( this, ResId( BT_HELP ) ) diff --git a/dbaccess/source/ui/dlg/queryfilter.hrc b/dbaccess/source/ui/dlg/queryfilter.hrc index bdf1abe50b5d..ffbf5c82046c 100644 --- a/dbaccess/source/ui/dlg/queryfilter.hrc +++ b/dbaccess/source/ui/dlg/queryfilter.hrc @@ -2,9 +2,9 @@ * * $RCSfile: queryfilter.hrc,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: oj $ $Date: 2000-11-10 16:11:25 $ + * last change: $Author: fme $ $Date: 2001-06-21 15:07:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,7 +79,7 @@ #define LB_WHERECOND2 7 #define LB_WHERECOND3 8 -#define GB_FIELDS 1 +#define FL_FIELDS 1 #define ET_WHEREVALUE1 1 #define ET_WHEREVALUE2 2 diff --git a/dbaccess/source/ui/dlg/queryfilter.src b/dbaccess/source/ui/dlg/queryfilter.src index 8e79b010d2d8..ee4cf11ce9c8 100644 --- a/dbaccess/source/ui/dlg/queryfilter.src +++ b/dbaccess/source/ui/dlg/queryfilter.src @@ -2,9 +2,9 @@ * * $RCSfile: queryfilter.src,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: kz $ $Date: 2001-06-13 22:40:23 $ + * last change: $Author: fme $ $Date: 2001-06-21 15:07:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -191,7 +191,7 @@ ModalDialog DLG_FILTERCRIT OutputSize = TRUE ; Hide = TRUE ; SVLook = TRUE ; - Size = MAP_APPFONT ( 303 , 84 ) ; + Size = MAP_APPFONT ( 303 , 76 ) ; Text = "Filter" ; Text [ english ] = "Filter"; Text [ english_us ] = "Filter"; @@ -201,7 +201,7 @@ ModalDialog DLG_FILTERCRIT ListBox LB_WHEREFIELD1 { Border = TRUE ; - Pos = MAP_APPFONT ( 60 , 28 ) ; + Pos = MAP_APPFONT ( 60 , 25 ) ; Size = MAP_APPFONT ( 60 , 90 ) ; TabStop = TRUE ; DropDown = TRUE ; @@ -209,8 +209,8 @@ ModalDialog DLG_FILTERCRIT ListBox LB_WHERECOMP1 { Border = TRUE ; - Pos = MAP_APPFONT ( 124 , 28 ) ; - Size = MAP_APPFONT ( 50 , 72 ) ; + Pos = MAP_APPFONT ( 124 , 25 ) ; + Size = MAP_APPFONT ( 49 , 72 ) ; TabStop = TRUE ; DDExtraWidth = TRUE ; DropDown = TRUE ; @@ -219,15 +219,15 @@ ModalDialog DLG_FILTERCRIT Edit ET_WHEREVALUE1 { Border = TRUE ; - Pos = MAP_APPFONT ( 177 , 28 ) ; + Pos = MAP_APPFONT ( 177 , 25 ) ; Size = MAP_APPFONT ( 60 , 12 ) ; TabStop = TRUE ; }; ListBox LB_WHERECOND2 { Border = TRUE ; - Pos = MAP_APPFONT ( 15 , 43 ) ; - Size = MAP_APPFONT ( 40 , 36 ) ; + Pos = MAP_APPFONT ( 15 , 41 ) ; + Size = MAP_APPFONT ( 41 , 36 ) ; TabStop = TRUE ; DropDown = TRUE ; CurPos = 0 ; @@ -236,7 +236,7 @@ ModalDialog DLG_FILTERCRIT ListBox LB_WHEREFIELD2 { Border = TRUE ; - Pos = MAP_APPFONT ( 60 , 43 ) ; + Pos = MAP_APPFONT ( 60 , 41 ) ; Size = MAP_APPFONT ( 60 , 90 ) ; TabStop = TRUE ; DropDown = TRUE ; @@ -244,8 +244,8 @@ ModalDialog DLG_FILTERCRIT ListBox LB_WHERECOMP2 { Border = TRUE ; - Pos = MAP_APPFONT ( 124 , 43 ) ; - Size = MAP_APPFONT ( 50 , 72 ) ; + Pos = MAP_APPFONT ( 124 , 41 ) ; + Size = MAP_APPFONT ( 49 , 72 ) ; TabStop = TRUE ; DropDown = TRUE ; DDExtraWidth = TRUE ; @@ -254,15 +254,15 @@ ModalDialog DLG_FILTERCRIT Edit ET_WHEREVALUE2 { Border = TRUE ; - Pos = MAP_APPFONT ( 177 , 43 ) ; + Pos = MAP_APPFONT ( 177 , 41 ) ; Size = MAP_APPFONT ( 60 , 12 ) ; TabStop = TRUE ; }; ListBox LB_WHERECOND3 { Border = TRUE ; - Pos = MAP_APPFONT ( 15 , 58 ) ; - Size = MAP_APPFONT ( 40 , 36 ) ; + Pos = MAP_APPFONT ( 15 , 57 ) ; + Size = MAP_APPFONT ( 41 , 36 ) ; TabStop = TRUE ; DropDown = TRUE ; CurPos = 0 ; @@ -271,7 +271,7 @@ ModalDialog DLG_FILTERCRIT ListBox LB_WHEREFIELD3 { Border = TRUE ; - Pos = MAP_APPFONT ( 60 , 58 ) ; + Pos = MAP_APPFONT ( 60 , 57 ) ; Size = MAP_APPFONT ( 60 , 90 ) ; TabStop = TRUE ; DropDown = TRUE ; @@ -279,8 +279,8 @@ ModalDialog DLG_FILTERCRIT ListBox LB_WHERECOMP3 { Border = TRUE ; - Pos = MAP_APPFONT ( 124 , 58 ) ; - Size = MAP_APPFONT ( 50 , 72 ) ; + Pos = MAP_APPFONT ( 124 , 57 ) ; + Size = MAP_APPFONT ( 49 , 72 ) ; TabStop = TRUE ; DropDown = TRUE ; DDExtraWidth = TRUE ; @@ -289,14 +289,14 @@ ModalDialog DLG_FILTERCRIT Edit ET_WHEREVALUE3 { Border = TRUE ; - Pos = MAP_APPFONT ( 177 , 58 ) ; + Pos = MAP_APPFONT ( 177 , 57 ) ; Size = MAP_APPFONT ( 60 , 12 ) ; TabStop = TRUE ; }; FixedText FT_WHEREFIELD { Pos = MAP_APPFONT ( 60 , 14 ) ; - Size = MAP_APPFONT ( 60 , 10 ) ; + Size = MAP_APPFONT ( 60 , 8 ) ; Text = "Feldname" ; Center = TRUE ; Text [ ENGLISH ] = "Fieldname" ; @@ -326,7 +326,7 @@ ModalDialog DLG_FILTERCRIT FixedText FT_WHERECOMP { Pos = MAP_APPFONT ( 124 , 14 ) ; - Size = MAP_APPFONT ( 50 , 10 ) ; + Size = MAP_APPFONT ( 50 , 8 ) ; Text = "Bedingung" ; Center = TRUE ; Text [ ENGLISH ] = "Condition" ; @@ -356,7 +356,7 @@ ModalDialog DLG_FILTERCRIT FixedText FT_WHEREVALUE { Pos = MAP_APPFONT ( 177 , 14 ) ; - Size = MAP_APPFONT ( 60 , 10 ) ; + Size = MAP_APPFONT ( 60 , 8 ) ; Text = "Wert" ; Center = TRUE ; Text [ ENGLISH ] = "Value" ; @@ -386,7 +386,7 @@ ModalDialog DLG_FILTERCRIT FixedText FT_WHEREOPER { Pos = MAP_APPFONT ( 15 , 14 ) ; - Size = MAP_APPFONT ( 40 , 10 ) ; + Size = MAP_APPFONT ( 40 , 8 ) ; /* ### ACHTUNG: Neuer Text in Resource? Verknpfung : Verknpfung */ Text = "Verknpfung" ; Center = TRUE ; @@ -414,10 +414,10 @@ ModalDialog DLG_FILTERCRIT Text[ language_user1 ] = " "; Text[ catalan ] = "Vnculo"; }; - GroupBox GB_FIELDS + FixedLine FL_FIELDS { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 236 , 74 ) ; + Size = MAP_APPFONT ( 236 , 8 ) ; Text = "Kriterien" ; Text [ ENGLISH ] = "Search criteria" ; Text [ norwegian ] = "Search criteria" ; diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx index ce24b5363bf8..758b7a48762f 100644 --- a/dbaccess/source/ui/dlg/queryorder.cxx +++ b/dbaccess/source/ui/dlg/queryorder.cxx @@ -2,9 +2,9 @@ * * $RCSfile: queryorder.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: fs $ $Date: 2001-03-15 08:23:00 $ + * last change: $Author: fme $ $Date: 2001-06-21 15:07:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -121,7 +121,6 @@ DlgOrderCrit::DlgOrderCrit( Window * pParent, ,aLB_ORDERFIELD3( this, ResId( LB_ORDERFIELD3 ) ) ,aLB_ORDERVALUE3( this, ResId( LB_ORDERVALUE3 ) ) ,aFT_ORDERFIELD( this, ResId( FT_ORDERFIELD ) ) - ,aFT_ORDERVALUE( this, ResId( FT_ORDERVALUE ) ) ,aFT_ORDERAFTER1( this, ResId( FT_ORDERAFTER1 ) ) ,aFT_ORDERAFTER2( this, ResId( FT_ORDERAFTER2 ) ) ,aFT_ORDEROPER( this, ResId( FT_ORDEROPER ) ) @@ -129,7 +128,7 @@ DlgOrderCrit::DlgOrderCrit( Window * pParent, ,aBT_OK( this, ResId( BT_OK ) ) ,aBT_CANCEL( this, ResId( BT_CANCEL ) ) ,aBT_HELP( this, ResId( BT_HELP ) ) - ,aGB_ORDER( this, ResId( GB_ORDER ) ) + ,aFL_ORDER( this, ResId( FL_ORDER ) ) ,aSTR_NOENTRY( ResId( STR_NOENTRY ) ) ,m_xQueryComposer(_rxQueryComposer) ,m_xColumns(_rxCols) diff --git a/dbaccess/source/ui/dlg/queryorder.hrc b/dbaccess/source/ui/dlg/queryorder.hrc index 6458c44d2925..06d666e65ba2 100644 --- a/dbaccess/source/ui/dlg/queryorder.hrc +++ b/dbaccess/source/ui/dlg/queryorder.hrc @@ -2,9 +2,9 @@ * * $RCSfile: queryorder.hrc,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: oj $ $Date: 2000-11-10 16:12:18 $ + * last change: $Author: fme $ $Date: 2001-06-21 15:07:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,7 +67,6 @@ #define FT_ORDERFIELD 1 -#define FT_ORDERVALUE 2 #define FT_ORDERDIR 3 #define FT_ORDERAFTER1 4 #define FT_ORDERAFTER2 5 @@ -80,7 +79,7 @@ #define LB_ORDERVALUE2 5 #define LB_ORDERVALUE3 6 -#define GB_ORDER 1 +#define FL_ORDER 1 #define BT_OK 1 #define BT_CANCEL 2 diff --git a/dbaccess/source/ui/dlg/queryorder.src b/dbaccess/source/ui/dlg/queryorder.src index 277817688f62..89633849e5d7 100644 --- a/dbaccess/source/ui/dlg/queryorder.src +++ b/dbaccess/source/ui/dlg/queryorder.src @@ -2,9 +2,9 @@ * * $RCSfile: queryorder.src,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: kz $ $Date: 2001-06-13 22:42:18 $ + * last change: $Author: fme $ $Date: 2001-06-21 15:07:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,7 +70,7 @@ ModalDialog DLG_ORDERCRIT Border = TRUE ; SVLook = TRUE ; HelpId = HID_DLG_ORDERCRIT ; - Size = MAP_APPFONT ( 252 , 83 ) ; + Size = MAP_APPFONT ( 252 , 76 ) ; Text = "Sortierung" ; Text [ ENGLISH ] = "Sort Order" ; Text [ norwegian ] = "Sort Order" ; @@ -89,7 +89,7 @@ ModalDialog DLG_ORDERCRIT ListBox LB_ORDERFIELD1 { Border = TRUE ; - Pos = MAP_APPFONT ( 59 , 29 ) ; + Pos = MAP_APPFONT ( 59 , 25 ) ; Size = MAP_APPFONT ( 60 , 72 ) ; TabStop = TRUE ; DropDown = TRUE ; @@ -98,7 +98,7 @@ ModalDialog DLG_ORDERCRIT ListBox LB_ORDERVALUE1 { Border = TRUE ; - Pos = MAP_APPFONT ( 123 , 29 ) ; + Pos = MAP_APPFONT ( 123 , 25 ) ; Size = MAP_APPFONT ( 60 , 36 ) ; TabStop = TRUE ; DropDown = TRUE ; @@ -227,7 +227,7 @@ ModalDialog DLG_ORDERCRIT ListBox LB_ORDERFIELD2 { Border = TRUE ; - Pos = MAP_APPFONT ( 59 , 45 ) ; + Pos = MAP_APPFONT ( 59 , 41 ) ; Size = MAP_APPFONT ( 60 , 72 ) ; TabStop = TRUE ; DropDown = TRUE ; @@ -236,7 +236,7 @@ ModalDialog DLG_ORDERCRIT ListBox LB_ORDERVALUE2 { Border = TRUE ; - Pos = MAP_APPFONT ( 123 , 45 ) ; + Pos = MAP_APPFONT ( 123 , 41 ) ; Size = MAP_APPFONT ( 60 , 36 ) ; TabStop = TRUE ; DropDown = TRUE ; @@ -365,7 +365,7 @@ ModalDialog DLG_ORDERCRIT ListBox LB_ORDERFIELD3 { Border = TRUE ; - Pos = MAP_APPFONT ( 59 , 60 ) ; + Pos = MAP_APPFONT ( 59 , 57 ) ; Size = MAP_APPFONT ( 60 , 72 ) ; TabStop = TRUE ; DropDown = TRUE ; @@ -374,7 +374,7 @@ ModalDialog DLG_ORDERCRIT ListBox LB_ORDERVALUE3 { Border = TRUE ; - Pos = MAP_APPFONT ( 123 , 60 ) ; + Pos = MAP_APPFONT ( 123 , 57 ) ; Size = MAP_APPFONT ( 60 , 36 ) ; TabStop = TRUE ; DropDown = TRUE ; @@ -502,8 +502,8 @@ ModalDialog DLG_ORDERCRIT }; FixedText FT_ORDERFIELD { - Pos = MAP_APPFONT ( 58 , 15 ) ; - Size = MAP_APPFONT ( 60 , 10 ) ; + Pos = MAP_APPFONT ( 58 , 14 ) ; + Size = MAP_APPFONT ( 60 , 8 ) ; Text = "Feldname" ; Text [ ENGLISH ] = "Fieldname" ; Text [ norwegian ] = "Fieldname" ; @@ -531,41 +531,10 @@ ModalDialog DLG_ORDERCRIT Text[ catalan ] = "Nombre de campo"; }; - FixedText FT_ORDERVALUE - { - Pos = MAP_APPFONT ( 118 , 110 ) ; - Size = MAP_APPFONT ( 59 , 1 ) ; - Text = "Reihenfolge" ; - Text [ ENGLISH ] = "Order" ; - Text [ norwegian ] = "Rekkeflge" ; - Text [ italian ] = "Sequenza" ; - Text [ portuguese_brazilian ] = "Ordem" ; - Text [ portuguese ] = "Ordem" ; - Text [ finnish ] = "Jrjestys" ; - Text [ danish ] = "Rkkeflge" ; - Text [ french ] = "Ordre" ; - Text [ swedish ] = "Ordning" ; - Text [ dutch ] = "Volgorde" ; - Text [ spanish ] = "Orden" ; - Text [ ENGLISH_US ] = "Order" ; - Center = TRUE ; - Text[ chinese_simplified ] = "˳"; - Text[ russian ] = ""; - Text[ polish ] = "Kolejno"; - Text[ japanese ] = "בւ"; - Text[ chinese_traditional ] = ""; - Text[ arabic ] = ""; - Text[ greek ] = ""; - Text[ korean ] = ""; - Text[ turkish ] = "Sra"; - Text[ language_user1 ] = " "; - Text[ catalan ] = "Orden"; - }; - FixedText FT_ORDERAFTER1 { - Pos = MAP_APPFONT ( 12 , 45 ) ; - Size = MAP_APPFONT ( 40 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 43 ) ; + Size = MAP_APPFONT ( 40 , 8 ) ; Text = "danach" ; Text [ ENGLISH ] = "and then" ; Text [ norwegian ] = "and then" ; @@ -593,8 +562,8 @@ ModalDialog DLG_ORDERCRIT }; FixedText FT_ORDERAFTER2 { - Pos = MAP_APPFONT ( 12 , 60 ) ; - Size = MAP_APPFONT ( 40 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 59 ) ; + Size = MAP_APPFONT ( 40 , 8 ) ; Text = "danach" ; Text [ ENGLISH ] = "and then" ; Text [ norwegian ] = "and then" ; @@ -622,8 +591,8 @@ ModalDialog DLG_ORDERCRIT }; FixedText FT_ORDEROPER { - Pos = MAP_APPFONT ( 12 , 15 ) ; - Size = MAP_APPFONT ( 46 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 14 ) ; + Size = MAP_APPFONT ( 46 , 8 ) ; /* ### ACHTUNG: Neuer Text in Resource? Verknpfung : Verknpfung */ Text = "Verknpfung" ; Text [ ENGLISH ] = "Operator" ; @@ -652,8 +621,8 @@ ModalDialog DLG_ORDERCRIT }; FixedText FT_ORDERDIR { - Pos = MAP_APPFONT ( 122 , 15 ) ; - Size = MAP_APPFONT ( 60 , 10 ) ; + Pos = MAP_APPFONT ( 122 , 14 ) ; + Size = MAP_APPFONT ( 60 , 8 ) ; Text = "Reihenfolge" ; Text [ ENGLISH ] = "Direction" ; Text [ norwegian ] = "Retning" ; @@ -699,10 +668,10 @@ ModalDialog DLG_ORDERCRIT Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; }; - GroupBox GB_ORDER + FixedLine FL_ORDER { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 184 , 77 ) ; + Size = MAP_APPFONT ( 184 , 8 ) ; Text = "Sortierung" ; Text [ ENGLISH ] = "Sort order" ; Text [ norwegian ] = "Sort order" ; diff --git a/dbaccess/source/ui/dlg/sqlmessage.hrc b/dbaccess/source/ui/dlg/sqlmessage.hrc index d152edf0b98e..bfe32bc0937f 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.hrc +++ b/dbaccess/source/ui/dlg/sqlmessage.hrc @@ -2,9 +2,9 @@ * * $RCSfile: sqlmessage.hrc,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: sj $ $Date: 2001-05-17 13:28:15 $ + * last change: $Author: fme $ $Date: 2001-06-21 15:07:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,7 +67,7 @@ #define ED_TEXT 1 -#define GB_DATA 1 +#define FL_DATA 1 #define FL_DETAILS 1 @@ -90,6 +90,9 @@ /************************************************************************* * history: * $Log: not supported by cvs2svn $ + * Revision 1.2 2001/05/17 13:28:15 sj + * #86988# dialog redesign + * * Revision 1.1 2000/10/05 10:07:00 fs * initial checkin * diff --git a/dbaccess/source/ui/dlg/sqlmessage.src b/dbaccess/source/ui/dlg/sqlmessage.src index fa96a12cdb0e..a9071ffab55e 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.src +++ b/dbaccess/source/ui/dlg/sqlmessage.src @@ -2,9 +2,9 @@ * * $RCSfile: sqlmessage.src,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: kz $ $Date: 2001-06-13 22:44:21 $ + * last change: $Author: fme $ $Date: 2001-06-21 15:07:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,89 +88,6 @@ Image BMP_EXCEPTION_INFO MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; }; }; -ModalDialog DLG_SQLMESSAGE -{ - Moveable = TRUE ; - Closeable = TRUE ; - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 238 , 101 ) ; - HelpId = HID_GENERIC_SQL_ERROR; - Text = "Text" ; - Text [ ENGLISH ] = "Text" ; - Text [ norwegian ] = "Text" ; - Text [ italian ] = "Testo" ; - Text [ portuguese_brazilian ] = "Texto" ; - Text [ portuguese ] = "Texto" ; - Text [ finnish ] = "Teksti" ; - Text [ danish ] = "Tekst" ; - Text [ french ] = "Texte" ; - Text [ swedish ] = "Text" ; - Text [ dutch ] = "Tekst" ; - Text [ spanish ] = "Texto" ; - Text [ english_us ] = "Text" ; - MultiLineEdit ED_TEXT - { - Border = TRUE ; - Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 153 , 76 ) ; - TabStop = TRUE ; - }; - GroupBox GB_DATA - { - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 165 , 92 ) ; - Text = "Text" ; - Text [ ENGLISH ] = "Text" ; - Text [ norwegian ] = "Text" ; - Text [ italian ] = "Testo" ; - Text [ portuguese_brazilian ] = "Texto" ; - Text [ portuguese ] = "Texto" ; - Text [ finnish ] = "Teksti" ; - Text [ danish ] = "Tekst" ; - Text [ french ] = "Texte" ; - Text [ swedish ] = "Text" ; - Text [ dutch ] = "Tekst" ; - Text [ spanish ] = "Texto" ; - Text [ english_us ] = "Text" ; - Text[ chinese_simplified ] = ""; - Text[ russian ] = ""; - Text[ polish ] = "Tekst"; - Text[ japanese ] = "÷"; - Text[ chinese_traditional ] = "r"; - Text[ arabic ] = ""; - Text[ greek ] = ""; - Text[ korean ] = "ؽƮ"; - Text[ turkish ] = "Metin"; - Text[ language_user1 ] = " "; - Text[ catalan ] = "Texto"; - }; - OKButton PB_OK - { - Pos = MAP_APPFONT ( 181 , 6 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; - }; - CancelButton PB_CANCEL - { - Pos = MAP_APPFONT ( 181 , 23 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - Text[ chinese_simplified ] = ""; - Text[ russian ] = ""; - Text[ polish ] = "Tekst"; - Text[ japanese ] = "÷"; - Text[ chinese_traditional ] = "r"; - Text[ arabic ] = ""; - Text[ greek ] = ""; - Text[ korean ] = "ؽƮ"; - Text[ turkish ] = "Metin"; - Text[ language_user1 ] = " "; - Text[ catalan ] = "Texto"; -}; - ModalDialog DLG_SQLEXCEPTIONCHAIN { Moveable = TRUE ; @@ -444,6 +361,9 @@ ModalDialog DLG_SQLEXCEPTIONCHAIN /************************************************************************* * history: * $Log: not supported by cvs2svn $ + * Revision 1.15 2001/06/13 22:44:21 kz + * Merge SRC633: 14.06.01 - 00:44:36 + * * Revision 1.14 2001/06/08 22:18:54 rt * Merge SRC633: 09.06.01 - 00:19:13 * |