diff options
Diffstat (limited to 'dbaccess/source/ui/querydesign')
| -rw-r--r-- | dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx | 14 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/QueryDesignView.cxx | 19 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx | 59 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 48 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/TableWindowListBox.cxx | 102 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/query.src | 144 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/querycontainerwindow.cxx | 43 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/querycontroller.cxx | 6 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/querydlg.src | 28 |
9 files changed, 282 insertions, 181 deletions
diff --git a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx index 0b80f4dd87ee..db3828e58961 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx @@ -2,9 +2,9 @@ * * $RCSfile: QueryDesignFieldUndoAct.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: oj $ $Date: 2002-08-30 11:15:52 $ + * last change: $Author: hr $ $Date: 2003-03-19 17:52:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,9 +88,15 @@ namespace dbaui virtual void Redo() = 0; public: - OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, USHORT nCommentID) : OCommentUndoAction(nCommentID), pOwner(pSelBrwBox), m_nColumnPostion(BROWSER_INVALIDID) { } + OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, USHORT nCommentID); + virtual ~OQueryDesignFieldUndoAct(); - inline void SetColumnPosition(USHORT _nColumnPostion) { m_nColumnPostion = _nColumnPostion; } + inline void SetColumnPosition(USHORT _nColumnPostion) + { + m_nColumnPostion = _nColumnPostion; + OSL_ENSURE(m_nColumnPostion != BROWSER_INVALIDID,"Column position was not set add the undo action!"); + OSL_ENSURE(m_nColumnPostion < pOwner->GetColumnCount(),"Position outside the column count!"); + } }; // ================================================================================================ diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index f7291cb07e57..b1f2599bd510 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -2,9 +2,9 @@ * * $RCSfile: QueryDesignView.cxx,v $ * - * $Revision: 1.56 $ + * $Revision: 1.57 $ * - * last change: $Author: oj $ $Date: 2002-10-07 13:06:37 $ + * last change: $Author: hr $ $Date: 2003-03-19 17:52:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -727,7 +727,7 @@ namespace { // we have to look if we have alias.* here String sTemp = rFieldName; - if(sTemp.GetTokenCount('.') == 2) + if ( sTemp.GetTokenCount('.') == 2 && sTemp.GetToken(1,'.').Len() ) rFieldName = sTemp.GetToken(1,'.'); if ( rFieldName.toChar() != '*' ) { @@ -2013,7 +2013,11 @@ namespace sal_True); // quote is to true because we need quoted elements inside the function sal_Int32 nFunctionType = FKT_NONE; - ::connectivity::OSQLParseNode * pParamRef = pColumnRef->getChild(pColumnRef->count()-2); + ::connectivity::OSQLParseNode* pParamRef = NULL; + sal_Int32 nColumnRefPos = pColumnRef->count() - 2; + if ( nColumnRefPos >= 0 && nColumnRefPos < pColumnRef->count() ) + pParamRef = pColumnRef->getChild(nColumnRefPos); + if ( SQL_ISRULE(pColumnRef,general_set_fct) && SQL_ISRULE(pParamRef,column_ref) ) { @@ -2066,7 +2070,7 @@ namespace OSQLParseNode* pFunctionName = pColumnRef->getChild(0); if ( !SQL_ISPUNCTUATION(pFunctionName,"{") ) { - if ( SQL_ISRULE(pColumnRef,char_value_fct) ) + if ( SQL_ISRULEOR2(pColumnRef,length_exp,char_value_fct) ) pFunctionName = pFunctionName->getChild(0); ::rtl::OUString sFunctionName = pFunctionName->getTokenValue(); @@ -2610,7 +2614,10 @@ long OQueryDesignView::PreNotify(NotifyEvent& rNEvt) // check if the statement is correct when not returning false sal_Bool OQueryDesignView::checkStatement() { - return m_pSelectionBox->Save(); // a error occured so we return no + sal_Bool bRet = sal_True; + if ( m_pSelectionBox ) + bRet = m_pSelectionBox->Save(); // a error occured so we return no + return bRet; } //------------------------------------------------------------------------------- ::rtl::OUString OQueryDesignView::getStatement() diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx index 7459e514a544..f9593ef6399f 100644 --- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx +++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx @@ -2,9 +2,9 @@ * * $RCSfile: QueryTabWinUndoAct.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: oj $ $Date: 2002-08-30 11:15:29 $ + * last change: $Author: hr $ $Date: 2003-03-19 17:52:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -85,6 +85,22 @@ using namespace dbaui; +DBG_NAME(OQueryDesignFieldUndoAct) +OQueryDesignFieldUndoAct::OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, USHORT nCommentID) + : OCommentUndoAction(nCommentID) + , pOwner(pSelBrwBox) + , m_nColumnPostion(BROWSER_INVALIDID) +{ + DBG_CTOR(OQueryDesignFieldUndoAct,NULL); +} +// ----------------------------------------------------------------------------- +OQueryDesignFieldUndoAct::~OQueryDesignFieldUndoAct() +{ + pOwner = NULL; + DBG_DTOR(OQueryDesignFieldUndoAct,NULL); +} +// ----------------------------------------------------------------------------- + DBG_NAME(OQueryTabWinUndoAct ) // ------------------------------------------------------------------------------------------------ OQueryTabWinUndoAct::OQueryTabWinUndoAct(OQueryTableView* pOwner, USHORT nCommentID) @@ -121,28 +137,41 @@ OQueryTabWinUndoAct::~OQueryTabWinUndoAct() //------------------------------------------------------------------------------ void OTabFieldCellModifiedUndoAct::Undo() { - USHORT nColumnId = pOwner->GetColumnId(m_nColumnPostion); - String strNext = pOwner->GetCellContents(m_nCellIndex, nColumnId); - pOwner->SetCellContents(m_nCellIndex, nColumnId, m_strNextCellContents); - m_strNextCellContents = strNext; + OSL_ENSURE(m_nColumnPostion != BROWSER_INVALIDID,"Column position was not set add the undo action!"); + OSL_ENSURE(m_nColumnPostion < pOwner->GetColumnCount(),"Position outside the column count!"); + if ( m_nColumnPostion != BROWSER_INVALIDID ) + { + USHORT nColumnId = pOwner->GetColumnId(m_nColumnPostion); + String strNext = pOwner->GetCellContents(m_nCellIndex, nColumnId); + pOwner->SetCellContents(m_nCellIndex, nColumnId, m_strNextCellContents); + m_strNextCellContents = strNext; + } } //------------------------------------------------------------------------------ void OTabFieldSizedUndoAct::Undo() { - USHORT nColumnId = pOwner->GetColumnId(m_nColumnPostion); - long nNextWidth = pOwner->GetColumnWidth(nColumnId); - pOwner->SetColWidth(nColumnId, m_nNextWidth); - m_nNextWidth = nNextWidth; + OSL_ENSURE(m_nColumnPostion != BROWSER_INVALIDID,"Column position was not set add the undo action!"); + if ( m_nColumnPostion != BROWSER_INVALIDID ) + { + USHORT nColumnId = pOwner->GetColumnId(m_nColumnPostion); + long nNextWidth = pOwner->GetColumnWidth(nColumnId); + pOwner->SetColWidth(nColumnId, m_nNextWidth); + m_nNextWidth = nNextWidth; + } } // ----------------------------------------------------------------------------- void OTabFieldMovedUndoAct::Undo() { - sal_uInt16 nId = pDescr->GetColumnId(); - USHORT nOldPos = pOwner->GetColumnPos(nId); - pOwner->SetColumnPos(nId,m_nColumnPostion); - pOwner->ColumnMoved(nId,FALSE); - m_nColumnPostion = nOldPos; + OSL_ENSURE(m_nColumnPostion != BROWSER_INVALIDID,"Column position was not set add the undo action!"); + if ( m_nColumnPostion != BROWSER_INVALIDID ) + { + sal_uInt16 nId = pDescr->GetColumnId(); + USHORT nOldPos = pOwner->GetColumnPos(nId); + pOwner->SetColumnPos(nId,m_nColumnPostion); + pOwner->ColumnMoved(nId,FALSE); + m_nColumnPostion = nOldPos; + } } // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 0ea8a818a479..3ea7b2d58bb7 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -2,9 +2,9 @@ * * $RCSfile: SelectionBrowseBox.cxx,v $ * - * $Revision: 1.45 $ + * $Revision: 1.46 $ * - * last change: $Author: oj $ $Date: 2002-09-24 10:52:28 $ + * last change: $Author: hr $ $Date: 2003-03-19 17:52:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -153,6 +153,10 @@ const String g_strZero = String::CreateFromAscii("0"); #define HANDLE_ID 0 #define HANDLE_COLUMN_WITDH 70 +#define SQL_ISRULEOR2(pParseNode, e1,e2) ((pParseNode)->isRule() && (\ + (pParseNode)->getRuleID() == OSQLParser::RuleID(OSQLParseNode::##e1) || \ + (pParseNode)->getRuleID() == OSQLParser::RuleID(OSQLParseNode::##e2))) + // ----------------------------------------------------------------------------- namespace @@ -825,12 +829,37 @@ sal_Bool OSelectionBrowseBox::saveField(const String& _sFieldName,OTableFieldDes // append the whole text as field name // so we first clear the function field clearEntryFunctionField(_sFieldName,aSelEntry,_bListAction,nColumnId); + sal_Bool bQuote = sal_False; + if ( SQL_ISRULEOR2(pColumnRef,length_exp,char_value_fct) + || SQL_ISRULEOR2(pColumnRef,position_exp,extract_exp) ) + { + bQuote = sal_True; + sal_Int32 nDataType = DataType::DOUBLE; + OSQLParseNode* pFunctionName = pColumnRef->getChild(0); + if ( !SQL_ISPUNCTUATION(pFunctionName,"{") ) + { + if ( SQL_ISRULEOR2(pColumnRef,length_exp,char_value_fct) ) + pFunctionName = pFunctionName->getChild(0); + + if ( pFunctionName ) + { + ::rtl::OUString sFunctionName = pFunctionName->getTokenValue(); + if ( !sFunctionName.getLength() ) + sFunctionName = ::rtl::OStringToOUString(OSQLParser::TokenIDToStr(pFunctionName->getTokenID()),RTL_TEXTENCODING_MS_1252); + + nDataType = OSQLParser::getFunctionReturnType( + sFunctionName + ,&pController->getParser()->getContext()); + aSelEntry->SetDataType(nDataType); + } + } + } - // now parse teh hole statement + // now parse the hole statement sal_uInt32 nFunCount = pColumnRef->count(); ::rtl::OUString sParameters; for(sal_uInt32 i = 0; i < nFunCount; ++i) - pColumnRef->getChild(i)->parseNodeToStr(sParameters,xMetaData,&pParser->getContext(),sal_True,sal_False); + pColumnRef->getChild(i)->parseNodeToStr(sParameters,xMetaData,&pParser->getContext(),sal_True,bQuote); ::rtl::OUString sOldAlias = aSelEntry->GetAlias(); aSelEntry->SetAlias(::rtl::OUString()); @@ -838,6 +867,11 @@ sal_Bool OSelectionBrowseBox::saveField(const String& _sFieldName,OTableFieldDes sal_Int32 nNewFunctionType = aSelEntry->GetFunctionType() | FKT_NUMERIC; aSelEntry->SetFunctionType(nNewFunctionType); + + aSelEntry->SetFieldType(TAB_NORMAL_FIELD); + + aSelEntry->SetTabWindow(NULL); + aSelEntry->SetField(sParameters); notifyTableFieldChanged(sOldAlias,aSelEntry->GetAlias(),_bListAction, nColumnId); } @@ -2177,7 +2211,8 @@ String OSelectionBrowseBox::GetCellContents(sal_Int32 nCellIndex, USHORT nColId) { DBG_CHKTHIS(OSelectionBrowseBox,NULL); // DBG_ASSERT(nCellIndex < (GetRowCount()-1),"CellIndex ist zu gross"); - SaveModified(); + if ( GetCurColumnId() == nColId ) + SaveModified(); USHORT nPos = GetColumnPos(nColId); OTableFieldDescRef pEntry = getFields()[nPos - 1]; @@ -2219,8 +2254,6 @@ void OSelectionBrowseBox::SetCellContents(sal_Int32 nRow, USHORT nColId, const S break; case BROW_FIELD_ROW: pEntry->SetField(strNewText); - if (strNewText.Len() == 0) // bei leerem Feld auch den Tabellennamen loeschen - pEntry->SetAlias(strNewText); break; case BROW_TABLE_ROW: pEntry->SetAlias(strNewText); @@ -2425,6 +2458,7 @@ void OSelectionBrowseBox::appendUndoAction(const String& _rOldValue,const String { OTabFieldCellModifiedUndoAct* pUndoAct = new OTabFieldCellModifiedUndoAct(this); pUndoAct->SetCellIndex(_nRow); + OSL_ENSURE(GetColumnPos(GetCurColumnId()) != BROWSER_INVALIDID,"Current position isn't valid!"); pUndoAct->SetColumnPosition( GetColumnPos(GetCurColumnId()) ); pUndoAct->SetCellContents(_rOldValue); getDesignView()->getController()->addUndoActionAndInvalidate(pUndoAct); diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx index a923a4fab622..d7b50d7c4010 100644 --- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx @@ -2,9 +2,9 @@ * * $RCSfile: TableWindowListBox.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: oj $ $Date: 2002-06-21 07:09:34 $ + * last change: $Author: hr $ $Date: 2003-03-19 17:52:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -115,10 +115,10 @@ OTableWindowListBox::OTableWindowListBox( OTableWindow* pParent, const String& r ,m_nDropEvent(0) { DBG_CTOR(OTableWindowListBox,NULL); + m_aScrollTimer.SetTimeout( SCROLLING_TIMESPAN ); SetDoubleClickHdl( LINK(this, OTableWindowListBox, DoubleClickHdl) ); - m_aScrollHelper.setUpScrollMethod( LINK(this, OTableWindowListBox, ScrollUpHdl) ); - m_aScrollHelper.setDownScrollMethod( LINK(this, OTableWindowListBox, ScrollDownHdl) ); + SetSelectionMode(SINGLE_SELECTION); SetHighlightRange( ); } @@ -138,7 +138,8 @@ OTableWindowListBox::~OTableWindowListBox() { if (m_nDropEvent) Application::RemoveUserEvent(m_nDropEvent); - + if( m_aScrollTimer.IsActive() ) + m_aScrollTimer.Stop(); m_pTabWin = NULL; DBG_DTOR(OTableWindowListBox,NULL); } @@ -229,30 +230,40 @@ long OTableWindowListBox::PreNotify(NotifyEvent& rNEvt) return SvTreeListBox::PreNotify(rNEvt); return 1L; } -// ----------------------------------------------------------------------------- -void scrollWindow(OTableWindowListBox* _pListBox, const Point& _rPos,sal_Bool _bUp) + +//------------------------------------------------------------------------------ +IMPL_LINK( OTableWindowListBox, ScrollUpHdl, SvTreeListBox*, pBox ) { - SvLBoxEntry* pEntry = _pListBox->GetEntry( _rPos ); + SvLBoxEntry* pEntry = GetEntry( m_aMousePos ); + if( !pEntry ) + return 0; - if( pEntry && pEntry != _pListBox->Last() ) + if( pEntry != Last() ) { - _pListBox->ScrollOutputArea( _bUp ? -1 : 1 ); - pEntry = _pListBox->GetEntry( _rPos ); - _pListBox->Select( pEntry, TRUE ); + ScrollOutputArea( -1 ); + pEntry = GetEntry( m_aMousePos ); + Select( pEntry, TRUE ); +// m_aScrollTimer.Start(); } -} -//------------------------------------------------------------------------------ -IMPL_LINK( OTableWindowListBox, ScrollUpHdl, SvTreeListBox*, EMPTY_ARG ) -{ - scrollWindow(this,m_aMousePos,sal_True); return 0; } //------------------------------------------------------------------------------ -IMPL_LINK( OTableWindowListBox, ScrollDownHdl, SvTreeListBox*, EMPTY_ARG ) +IMPL_LINK( OTableWindowListBox, ScrollDownHdl, SvTreeListBox*, pBox ) { - scrollWindow(this,m_aMousePos,sal_False); + SvLBoxEntry* pEntry = GetEntry( m_aMousePos ); + if( !pEntry ) + return 0; + + if( pEntry != Last() ) + { + ScrollOutputArea( 1 ); + pEntry = GetEntry( m_aMousePos ); + Select( pEntry, TRUE ); +// m_aScrollTimer.Start(); + } + return 0; } @@ -285,6 +296,7 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt ) && OJoinExchObj::isFormatAvailable(GetDataFlavorExVector(),SOT_FORMATSTR_ID_SBA_JOIN) ) { // don't drop into the window if it's the drag source itself + // remove the selection if the dragging operation is leaving the window if (_rEvt.mbLeaving) SelectAll(FALSE); @@ -292,19 +304,49 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt ) { // hit test m_aMousePos = _rEvt.maPosPixel; + Size aOutputSize = GetOutputSizePixel(); SvLBoxEntry* pEntry = GetEntry( m_aMousePos ); - if( pEntry ) + if( !pEntry ) + return DND_ACTION_NONE; + + // Scrolling Areas + Rectangle aBottomScrollArea( Point(0, aOutputSize.Height()-LISTBOX_SCROLLING_AREA), + Size(aOutputSize.Width(), LISTBOX_SCROLLING_AREA) ); + Rectangle aTopScrollArea( Point(0,0), Size(aOutputSize.Width(), LISTBOX_SCROLLING_AREA) ); + + // Wenn Zeiger auf der oberen ScrollingArea steht, nach oben scrollen + if( aBottomScrollArea.IsInside(m_aMousePos) ) + { + if( !m_aScrollTimer.IsActive() ) + { + m_aScrollTimer.SetTimeoutHdl( LINK(this, OTableWindowListBox, ScrollUpHdl) ); + ScrollUpHdl( this ); + } + } + + // Wenn Zeiger auf der oberen ScrollingArea steht, nach unten scrollen + else if( aTopScrollArea.IsInside(m_aMousePos) ) { - m_aScrollHelper.scroll(m_aMousePos,GetOutputSizePixel()); - // Beim Drag automatisch den richtigen Eintrag selektieren - if ((FirstSelected() != pEntry) || (FirstSelected() && NextSelected(FirstSelected()))) - SelectAll(FALSE); - Select(pEntry, TRUE); - - // Auf den ersten Eintrag (*) kann nicht gedroppt werden - if(!( m_pTabWin->GetData()->IsShowAll() && (pEntry==First()) )) - nDND_Action = DND_ACTION_LINK; + if( !m_aScrollTimer.IsActive() ) + { + m_aScrollTimer.SetTimeoutHdl( LINK(this, OTableWindowListBox, ScrollDownHdl) ); + ScrollDownHdl( this ); + } + } + else + { + if( m_aScrollTimer.IsActive() ) + m_aScrollTimer.Stop(); } + + // Beim Drag automatisch den richtigen Eintrag selektieren + if ((FirstSelected() != pEntry) || (FirstSelected() && NextSelected(FirstSelected()))) + SelectAll(FALSE); + Select(pEntry, TRUE); + + // Auf den ersten Eintrag (*) kann nicht gedroppt werden + if(!( m_pTabWin->GetData()->IsShowAll() && (pEntry==First()) )) + nDND_Action = DND_ACTION_LINK; } } return nDND_Action; @@ -320,7 +362,7 @@ IMPL_LINK( OTableWindowListBox, DropHdl, void *, EMPTY_ARG) try { OJoinTableView* pCont = m_pTabWin->getTableView(); - OSL_ENSURE(pCont,"No OJoinTableView!"); + OSL_ENSURE(pCont,"No QueryTableView!"); pCont->AddConnection(m_aDropInfo.aSource, m_aDropInfo.aDest); } catch(const SQLException& e) diff --git a/dbaccess/source/ui/querydesign/query.src b/dbaccess/source/ui/querydesign/query.src index 2f6d161a4576..980930762cbd 100644 --- a/dbaccess/source/ui/querydesign/query.src +++ b/dbaccess/source/ui/querydesign/query.src @@ -2,9 +2,9 @@ * * $RCSfile: query.src,v $ * - * $Revision: 1.77 $ + * $Revision: 1.78 $ * - * last change: $Author: oj $ $Date: 2002-12-12 13:44:48 $ + * last change: $Author: hr $ $Date: 2003-03-19 17:52:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -180,7 +180,7 @@ String STR_QUERY_UNDO_TABWINSHOW Text[ dutch ] = "Tabelvenster toevoegen"; Text[ chinese_simplified ] = "新增表格窗口"; Text[ greek ] = " "; - Text[ korean ] = "시트 창 삽입"; + Text[ korean ] = "테이블 창 추가"; Text[ arabic ] = " "; Text[ turkish ] = "Tablo penceresi ekle"; Text[ language_user1 ] = " "; @@ -210,7 +210,7 @@ String STR_QUERY_UNDO_MOVETABWIN Text[ dutch ] = "Tabelvenster verplaatsen"; Text[ chinese_simplified ] = "移动表格窗口"; Text[ greek ] = " "; - Text[ korean ] = "시트 창 이동"; + Text[ korean ] = "테이블 창 이동"; Text[ arabic ] = " "; Text[ turkish ] = "Tablo penceresini ta"; Text[ language_user1 ] = " "; @@ -239,7 +239,7 @@ String STR_QUERY_UNDO_INSERTCONNECTION Text[ dutch ] = "Verbinding invoegen"; Text[ chinese_simplified ] = "插入连结"; Text[ greek ] = " "; - Text[ korean ] = "연결 삽입"; + Text[ korean ] = "조인 삽입"; Text[ arabic ] = " "; Text[ turkish ] = "Balant ekle"; Text[ language_user1 ] = " "; @@ -257,7 +257,7 @@ String STR_QUERY_UNDO_REMOVECONNECTION Text [ swedish ] = "Radera frbindelse" ; Text [ danish ] = "Slet forbindelse" ; Text [ italian ] = "Termina collegamento" ; - Text [ spanish ] = "Eliminar una conexin" ; + Text [ spanish ] = "Borrar la conexin" ; Text [ french ] = "Supprimer la jointure" ; Text [ dutch ] = "Verbinding wissen" ; Text [ portuguese ] = "Eliminar ligao" ; @@ -269,7 +269,7 @@ String STR_QUERY_UNDO_REMOVECONNECTION Text[ dutch ] = "Verbinding wissen"; Text[ chinese_simplified ] = "删除连结"; Text[ greek ] = " "; - Text[ korean ] = "연결 삭제"; + Text[ korean ] = "조인 삭제"; Text[ arabic ] = " "; Text[ turkish ] = "Balanty sil"; Text[ language_user1 ] = " "; @@ -299,7 +299,7 @@ String STR_QUERY_UNDO_SIZETABWIN Text[ dutch ] = "Tabelvenster - grootte wijzigen"; Text[ chinese_simplified ] = "更改表格窗口大小"; Text[ greek ] = " - "; - Text[ korean ] = "시트 창 크기 조절"; + Text[ korean ] = "테이블 창 크기 변경"; Text[ arabic ] = " "; Text[ turkish ] = "Tablo penceresini yeniden boyutlandr"; Text[ language_user1 ] = " "; @@ -317,7 +317,7 @@ String STR_QUERY_UNDO_TABFIELDDELETE Text [ swedish ] = "Radera kolumn" ; Text [ danish ] = "Slet kolonne" ; Text [ italian ] = "Elimina colonna" ; - Text [ spanish ] = "Eliminar la columna" ; + Text [ spanish ] = "Borrar la columna" ; Text [ french ] = "Supprimer la colonne" ; Text [ dutch ] = "Kolom wissen" ; Text [ portuguese ] = "Eliminar coluna" ; @@ -417,7 +417,7 @@ String RID_STR_TABLE_DOESNT_EXIST Text[ dutch ] = "De uitdrukking is ongeldig omdat de tabel '$name$' niet bestaat!"; Text[ chinese_simplified ] = "这个表达式无效，因为表格 '$name$' 不存在！"; Text[ greek ] = " '$name$'!"; - Text[ korean ] = "시트 '$name$'가 없어 이 식은 유효하지 않습니다 !"; + Text[ korean ] = "식이 잘못되었습니다. 테이블 '$name$'가(이) 없습니다."; Text[ arabic ] = " ɡ '$name$'!"; Text[ turkish ] = "Geersiz deyim. Tablo '$name$' mevcut deil !"; Text[ language_user1 ] = " "; @@ -447,7 +447,7 @@ String RID_STR_FIELD_DOESNT_EXIST Text[ dutch ] = "De uitdrukking is ongeldig omdat de veldnaam '$name$' niet kan worden herleid!"; Text[ chinese_simplified ] = "这个表达式无效，因为无法确认字段名称 '$name$' ！"; Text[ greek ] = " '$name$'!"; - Text[ korean ] = "필드명'$name$'이 분류될 수 없어 이 식은 유효하지 않습니다!"; + Text[ korean ] = "식이 잘못되었습니다. 필드 이름 '$name$'이(가) 없습니다."; Text[ arabic ] = " '$name$'!"; Text[ turkish ] = "Geersiz deyim. Alan ad '$name$' atanamyor !"; Text[ language_user1 ] = " "; @@ -477,7 +477,7 @@ String RID_STR_TOMUCHTABLES Text[ dutch ] = "Query bevat #num# tabellen. Het huidige databasetype kan echter maximaal #maxnum# tabel(len) per instructie verwerken!"; Text[ chinese_simplified ] = "查询含有 #num# 表格。这个类型的数据库在处理一个语句时最多只能够查询 #maxnum# 表格！"; Text[ greek ] = " #num# . #maxnum# /- !"; - Text[ korean ] = "질의에 #num# 개의 시트가 포함되어 있습니다. 그러나 현재 데이터베이스 유형은 문장당 최대 #maxnum#개의 시트를 처리할 수 있습니다!"; + Text[ korean ] = "쿼리에 #num# 개의 테이블이 있습니다. 현재 데이터베이스 유형은 문장 당 최대한 #maxnum#개의 테이블만 처리할 수 있다는 점에 유의하십시오."; Text[ arabic ] = " #num# /. #maxnum# / !"; Text[ turkish ] = "Sorgu #num# tablo ieriyor. Ancak seili veritaban tipi her deyim iin en fazla #maxnum# tablo ileyebilmektedir !"; Text[ finnish ] = "Kysely ksittelee #num# taulua. Valittu tietokantatyyppi voi kuitenkin ksitell enintn #maxnum# taulua kussakin lausekkeessa."; @@ -495,7 +495,7 @@ String STR_QUERY_UNDO_TABWINDELETE Text [ swedish ] = "Radera tabellfnster" ; Text [ danish ] = "Slet tabelvindue" ; Text [ italian ] = "Elimina finestra di tabella" ; - Text [ spanish ] = "Eliminar la ventana de tabla" ; + Text [ spanish ] = "Borrar la ventana de tabla" ; Text [ french ] = "Supprimer la fentre de table" ; Text [ dutch ] = "Tabelvenster wissen" ; Text [ portuguese ] = "Eliminar janela de tabela" ; @@ -507,7 +507,7 @@ String STR_QUERY_UNDO_TABWINDELETE Text[ dutch ] = "Tabelvenster wissen"; Text[ chinese_simplified ] = "清除表格窗口"; Text[ greek ] = " "; - Text[ korean ] = "시트 창 삭제"; + Text[ korean ] = "테이블 창 삭제"; Text[ arabic ] = " "; Text[ turkish ] = "Tablo penceresini sil"; Text[ language_user1 ] = " "; @@ -537,7 +537,7 @@ String STR_QUERY_UNDO_MODIFY_CELL Text[ dutch ] = "Kolombeschrijving wijzigen"; Text[ chinese_simplified ] = "更改列标题"; Text[ greek ] = " "; - Text[ korean ] = "열 설명 변경"; + Text[ korean ] = "열 설명 편집"; Text[ arabic ] = " "; Text[ turkish ] = "Stun aklamasn deitir"; Text[ language_user1 ] = " "; @@ -595,7 +595,7 @@ String STR_QUERY_SORTTEXT Text[ dutch ] = "(niet gesorteerd);oplopend;aflopend"; Text[ chinese_simplified ] = "(不排序);向上;向下"; Text[ greek ] = "( );;"; - Text[ korean ] = "(정렬안됨);오름차순;내림차순"; + Text[ korean ] = "(정렬 안됨);오름차순;내림차순"; Text[ arabic ] = "( )"; Text[ turkish ] = "(sralanmam);artan;azalan"; Text[ language_user1 ] = " "; @@ -652,7 +652,7 @@ String STR_QUERY_NOTABLE Text[ polish ] = "(bez tabeli)"; Text[ portuguese_brazilian ] = "(no table)"; Text[ japanese ] = "(テーブルなし)"; - Text[ korean ] = "(시트 없음)"; + Text[ korean ] = "(테이블 없음)"; Text[ chinese_simplified ] = "(无表格)"; Text[ chinese_traditional ] = "(無表格)"; Text[ arabic ] = "( )"; @@ -670,7 +670,7 @@ String STR_QRY_ORDERBY_UNRELATED Text[ russian ] = " ."; Text[ dutch ] = "De database ondersteunt alleen de sortering voor zichtbare velden."; Text[ french ] = "La base de donnes ne supporte le tri que pour les champs visibles."; - Text[ spanish ] = "La base de datos apoya la clasificacin solo para campos visibles."; + Text[ spanish ] = "La base de datos slo admite la clasificacin de los campos visibles."; Text[ italian ] = "Il database supporta solo la classificazione dei campi visibili."; Text[ danish ] = "Databasen understtter kun sortering for synlige felter."; Text[ swedish ] = "Databasen stder bara sorteringen fr synliga flt."; @@ -682,7 +682,7 @@ String STR_QRY_ORDERBY_UNRELATED Text[ dutch ] = "De database ondersteunt alleen de sortering voor zichtbare velden."; Text[ chinese_simplified ] = "数据库只支持可显示字段的排序。"; Text[ greek ] = " ."; - Text[ korean ] = "데이터베이스는 보이는 필드의 정렬만을 지원합니다."; + Text[ korean ] = "데이터베이스가 지원하는 정렬 대상은 표시되는 필드뿐입니다."; Text[ arabic ] = " ."; Text[ turkish ] = "Veritaban yalnzca grnr alanlar iin sralamay destekler."; Text[ language_user1 ] = " "; @@ -752,7 +752,7 @@ Menu RID_QUERYFUNCTION_POPUPMENU Text[ dutch ] = "Tabelnaam"; Text[ chinese_simplified ] = "表格名称"; Text[ greek ] = " "; - Text[ korean ] = "시트 이름"; + Text[ korean ] = "테이블 이름"; Text[ arabic ] = " "; Text[ turkish ] = "Tablo ad"; Text[ language_user1 ] = " "; @@ -783,7 +783,7 @@ Menu RID_QUERYFUNCTION_POPUPMENU Text[ dutch ] = "Aliasnaam"; Text[ chinese_simplified ] = "别名"; Text[ greek ] = ""; - Text[ korean ] = "별칭 이름"; + Text[ korean ] = "별칭"; Text[ arabic ] = " "; Text[ turkish ] = "Dier ad"; Text[ language_user1 ] = " "; @@ -812,13 +812,13 @@ Menu RID_QUERYFUNCTION_POPUPMENU Text[ swedish ] = "Entydiga vrden"; Text[ polish ] = "Jednoznaczne wartoci"; Text[ portuguese_brazilian ] = "Distinct values"; - Text[ japanese ] = "明瞭値"; + Text[ japanese ] = "固有値"; Text[ chinese_simplified ] = "明确的数值"; Text[ chinese_traditional ] = "明確的數值"; Text[ dutch ] = "Duidelijke waarden"; Text[ chinese_simplified ] = "明确的数值"; Text[ greek ] = " "; - Text[ korean ] = "고유값"; + Text[ korean ] = "명료값"; Text[ arabic ] = " "; Text[ turkish ] = "Benzersiz deerler"; Text[ language_user1 ] = " "; @@ -849,7 +849,7 @@ String STR_QUERY_HANDLETEXT Text[ dutch ] = "Veld;Alias;Tabel;Volgorde;Zichtbaar;Functie;Criterium;of;of"; Text[ chinese_simplified ] = "字段;别名;表格;排序;可见的;功能;条件;或者;或者"; Text[ greek ] = ";;;;;;;;"; - Text[ korean ] = "필드:별칭;시트;정렬;가시적;기능;기준;또는;또는"; + Text[ korean ] = "필드:별칭;테이블;정렬;표시;기능;기준;또는;또는"; Text[ arabic ] = "; ;;;;;;;"; Text[ turkish ] = "Alan;Dier ad;Tablo;Sralama;Grnr;lev;lt;ya da;ya da"; Text[ language_user1 ] = " "; @@ -907,7 +907,7 @@ ErrorBox ERR_QRY_CRITERIA_ON_ASTERISK Message[ polish ] = "Warunek dla pola [*] nie jest moliwy"; Message[ japanese ] = "[*] フィールドに条件は使えません。"; Message[ greek ] = " [*]"; - Message[ korean ] = "필드[*]에는 아무 조건도 지정할 수 없음 "; + Message[ korean ] = "필드[*]에는 아무 조건도 지정할 수 없습니다 "; Message[ chinese_traditional ] = "欄位的條件[*]無效。"; Message[ arabic ] = " [*]"; Message[ turkish ] = "[*] alan iin koul belirlenemiyor"; @@ -936,7 +936,7 @@ String STR_QRY_TOO_LONG_STATEMENT Text[ dutch ] = "Deze SQL-uitdrukking is te lang."; Text[ chinese_simplified ] = "生成的 SQL 表达式太长。"; Text[ greek ] = " SQL ."; - Text[ korean ] = "작성된 SQL문장이 너무 깁니다."; + Text[ korean ] = "작성된 SQL 문장이 너무 깁니다."; Text[ arabic ] = " SQL ."; Text[ turkish ] = "Yaratlan SQL deyimi ok uzun."; Text[ language_user1 ] = " "; @@ -967,7 +967,7 @@ String STR_QRY_TOOCOMPLEX Text[ dutch ] = "De query is te complex"; Text[ chinese_simplified ] = "查询内容太复合"; Text[ greek ] = " "; - Text[ korean ] = "쿼리가 너무 복잡합니다"; + Text[ korean ] = "쿼리가 너무 복잡합니다."; Text[ arabic ] = " "; Text[ turkish ] = "Sorgu ok karmak"; Text[ language_user1 ] = " "; @@ -997,7 +997,7 @@ String STR_QRY_NOSELECT Text[ dutch ] = "De selectie ontbreekt!"; Text[ chinese_simplified ] = "没有选择任何内容！"; Text[ greek ] = " !"; - Text[ korean ] = "선택하신 것이 없습니다"; + Text[ korean ] = "선택하신 것이 없습니다."; Text[ arabic ] = " "; Text[ turkish ] = "Seim yaplmad"; Text[ language_user1 ] = " "; @@ -1027,7 +1027,7 @@ String STR_QRY_TOOMANYCOND Text[ dutch ] = "Teveel zoekcriteria"; Text[ chinese_simplified ] = "太多的搜寻规则"; Text[ greek ] = " "; - Text[ korean ] = "검색기준이 너무 많습니다"; + Text[ korean ] = "검색기준이 너무 많습니다."; Text[ arabic ] = " "; Text[ turkish ] = "Arama lt says ok fazla"; Text[ language_user1 ] = " "; @@ -1084,7 +1084,7 @@ ErrorBox ERR_QRY_ORDERBY_ON_ASTERISK Message[ greek ] = " [*]."; Message[ arabic ] = " [*]."; Message[ chinese_traditional ] = "無法按[*]編排。"; - Message[ korean ] = "[*]에 따라 정렬할 수 없음"; + Message[ korean ] = "[*] 기준으로 정렬할 수 없습니다."; Message[ turkish ] = "[*] sralama lt olarak kullanlamaz."; Message[ language_user1 ] = " "; Message[ finnish ] = "Kohdetta [*] ei voi kytt hakuehtona."; @@ -1201,7 +1201,7 @@ String STR_QRY_NATIVE Text[ dutch ] = "Bij een query in SQL-dialect van database wordt statement niet overgenomen."; Text[ chinese_simplified ] = "不接受数据库的 SQL 方言查询指令。"; Text[ greek ] = " SQL "; - Text[ korean ] = "데이터베이스의 SQL 방언으로 조회하실 경우에는 그 문장이 적용되지 않습니다"; + Text[ korean ] = "데이터베이스의 SQL 방언으로 조회하실 경우에는 문장이 적용되지 않습니다."; Text[ arabic ] = " ɡ SQL "; Text[ turkish ] = "Deyim, sorgunun bu veritabannn SQL dilinde yaplmas halinde kullanlmayacaktr"; Text[ language_user1 ] = " "; @@ -1232,7 +1232,7 @@ ErrorBox ERR_QRY_AMB_FIELD Message[ dutch ] = "Veldnaam niet gevonden of niet duidelijk"; Message[ chinese_simplified ] = "没有找到字段名称或者字段名称不明确。"; Message[ greek ] = " "; - Message[ korean ] = "필드명을 찾지 못했거나 분명하지 않습니다."; + Message[ korean ] = "필드 이름을 찾지 못했거나 고유하지 않습니다."; Message[ arabic ] = " "; Message[ turkish ] = "Alan ad bulunamad ya da benzersiz deil"; Message[ catalan ] = "No s'ha trobat el nom del camp o no s nic"; @@ -1262,7 +1262,7 @@ String STR_QRY_ILLEGAL_JOIN Text[ dutch ] = "Koppeling kon niet tot stand worden gebracht"; Text[ chinese_simplified ] = "无法执行连结功能"; Text[ greek ] = " "; - Text[ korean ] = "결합이 실행되지 못했습니다."; + Text[ korean ] = "조인을 실행하지 못했습니다."; Text[ arabic ] = " "; Text[ turkish ] = "Balant oluturulamad"; Text[ language_user1 ] = " "; @@ -1539,10 +1539,10 @@ ToolBox RID_BRW_QUERYDESIGN_TOOLBOX Text[ swedish ] = "Show Parse Tree"; Text[ polish ] = "Show Parse Tree"; Text[ portuguese_brazilian ] = "Show Parse Tree"; - Text[ japanese ] = "Show Parse Tree"; + Text[ japanese ] = "パースツリーを表示"; Text[ korean ] = "Show Parse Tree"; Text[ chinese_simplified ] = "Show Parse Tree"; - Text[ chinese_traditional ] = "Show Parse Tree"; + Text[ chinese_traditional ] = "顯示剖析樹"; Text[ turkish ] = "Show Parse Tree"; Text[ arabic ] = "Show Parse Tree"; Text[ catalan ] = "Show Parse Tree"; @@ -1596,7 +1596,7 @@ QueryBox QUERY_DESIGN_SAVEMODIFIED Message[ polish ] = "Zmieniono kwerend.\nZapisa zmiany?"; Message[ portuguese_brazilian ] = "The query has been changed.\nDo you want to save the changes?"; Message[ japanese ] = "クエリーは変更されました。\n変更を保存しますか。"; - Message[ korean ] = "질의가 변경되었습니다.\n변경 사항을 저장하겠습니까?"; + Message[ korean ] = "쿼리가 변경되었습니다.\n변경 내용을 저장하시겠습니까?"; Message[ chinese_simplified ] = "这个查询已经更改。\n要存盘更改的内容?"; Message[ chinese_traditional ] = "這個查詢已經變更。\n要儲存變更內容？"; Message[ turkish ] = "The query has been changed.\nDo you want to save the changes?"; @@ -1625,7 +1625,7 @@ QueryBox QUERY_VIEW_DESIGN_SAVEMODIFIED Message[ polish ] = "Zmieniono widok tabeli.\nZapisa zmiany?"; Message[ portuguese_brazilian ] = "The view has been changed.\nDo you want to save the changes?"; Message[ japanese ] = "テーブルビューが変更されています。\n変更を保存しますか。"; - Message[ korean ] = "뷰가 변경되었습니다.\n변경 내용을 저장하겠습니까?"; + Message[ korean ] = "테이블 보기가 변경되었습니다.\n변경 내용을 저장하시겠습니까?"; Message[ chinese_simplified ] = "这个表格视图已经改变。\n要存盘更改的内容?"; Message[ chinese_traditional ] = "這個檢視已經變更。\n要儲存變更內容?"; Message[ turkish ] = "The view has been changed.\nDo you want to save the changes?"; @@ -1669,11 +1669,11 @@ String STR_QUERYDESIGN_NO_VIEW_SUPPORT Text [ ENGLISH ] = "This database doesn't support views!"; Text[ english_us ] = "This database does not support table views!"; Text[ portuguese ] = "Esta base de dados no tem suporte para vistas de tabelas!"; - Text[ russian ] = " !"; + Text[ russian ] = " !"; Text[ greek ] = "This database doesn't support views!"; Text[ dutch ] = "Deze database ondersteunt geen weergave van tabellen!"; Text[ french ] = "Cette base de donnes ne supporte pas les vues !"; - Text[ spanish ] = "Esta base de datos no apoya ninguna visualizacin de tablas!"; + Text[ spanish ] = "Esta base de datos no admite ninguna visualizacin de tablas!"; Text[ finnish ] = "Tm tietokanta ei tue taulunkymi."; Text[ italian ] = "Questo database non supporta la vista tabella"; Text[ danish ] = "Denne database understtter ingen tabelvisninger!"; @@ -1681,7 +1681,7 @@ String STR_QUERYDESIGN_NO_VIEW_SUPPORT Text[ polish ] = "Ta baza danych nie obsuguje widokw tabeli!"; Text[ portuguese_brazilian ] = "This database doesn't support views!"; Text[ japanese ] = "このデータベースはテーブルビューを支援しません。"; - Text[ korean ] = "이 데이터베이스는 표 보기를 지원하지 않습니다.!"; + Text[ korean ] = "이 데이터베이스는 테이블 보기를 지원하지 않습니다."; Text[ chinese_simplified ] = "这个数据库不支持表格视图的功能！"; Text[ chinese_traditional ] = "這個資料庫不支援表格檢視功能！"; Text[ turkish ] = "This database doesn't support views!"; @@ -1708,7 +1708,7 @@ String STR_QUERYDESIGN_NO_VIEW_ASK Text[ polish ] = "Utworzy wzamian kwerend?"; Text[ portuguese_brazilian ] = "Do you want to create a view instead?"; Text[ japanese ] = "その代わりにクエリーを作成しますか。"; - Text[ korean ] = "대신 질의를 작성하겠습니까?"; + Text[ korean ] = "대신 쿼리를 만드시겠습니까?"; Text[ chinese_simplified ] = "要改为生成一个查询？"; Text[ chinese_traditional ] = "改為要建立一個查詢？"; Text[ turkish ] = "Do you want to create a view instead?"; @@ -1734,7 +1734,7 @@ ErrorBox ERR_QRY_NOSTATEMENT Message[ polish ] = "Utworzenie kwerendy nie powiodo si!"; Message[ portuguese_brazilian ] = "No query could be created!"; Message[ japanese ] = "クエリーは作成できませんでした。"; - Message[ korean ] = "질의를 작성하지 못했습니다!"; + Message[ korean ] = "쿼리를 만들지 못했습니다."; Message[ chinese_simplified ] = "无法建立任何查询！"; Message[ chinese_traditional ] = "無法建立查詢！"; Message[ turkish ] = "No query could be created!"; @@ -1761,7 +1761,7 @@ ErrorBox ERR_QRY_NOCRITERIA Message[ polish ] = "Utworzenie kwerendy nie powiodo si, poniewa nie wybrano adnych pl!"; Message[ portuguese_brazilian ] = "No query could be created because no fields were selected!"; Message[ japanese ] = "フィールドが選択されてなかったので、クエリーは作成できませんでした。"; - Message[ korean ] = "필드를 선택하지 않았으므로 질의를 작성하지 못했습니다!"; + Message[ korean ] = "필드가 선택되지 않았으므로 쿼리를 만들지 못했습니다."; Message[ chinese_simplified ] = "因为没有选中任何字段而无法建立查询！"; Message[ chinese_traditional ] = "因為沒有選中任何欄位而無法建立查詢！"; Message[ turkish ] = "No query could be created because no fields were selected!"; @@ -1893,7 +1893,7 @@ Menu RID_QUERY_DESIGN_MAIN_MENU Text[ polish ] = "Przywr"; Text[ portuguese_brazilian ] = "Redo"; Text[ japanese ] = "やり直し"; - Text[ korean ] = "복원"; + Text[ korean ] = "다시 실행"; Text[ chinese_simplified ] = "恢复撤消命令"; Text[ chinese_traditional ] = "恢復撤消指令"; Text[ turkish ] = "Redo"; @@ -2124,7 +2124,7 @@ String STR_DATASOURCE_DELETED Text[ greek ] = "The datasource was deleted. It is not possible to save datasource relevant data."; Text[ dutch ] = "De bijbehorende gegevensbron is gewist. De desbetreffende gegevens kunnen niet worden opgeslagen."; Text[ french ] = "Impossible d'enregistrer les donnes : la source de donnes correspondante a t supprime."; - Text[ spanish ] = "Se ha eliminado la fuente de datos. Los datos correspondientes no se pueden guardar."; + Text[ spanish ] = "Se ha borrado la fuente de datos. Los datos correspondientes no se pueden guardar."; Text[ finnish ] = "Vastaava tietolhde on poistettu. Sen vuoksi tietolhteeseen liittyvi tietoja ei voi tallentaa."; Text[ italian ] = "La sorgente dati stata eliminata. Impossibile salvare i dati corrispondenti."; Text[ danish ] = "Den tilhrende datakilde er blevet slettet. Det er ikke muligt at gemme data med relation til denne."; @@ -2132,7 +2132,7 @@ String STR_DATASOURCE_DELETED Text[ polish ] = "Przynalene rdo danych zostao usunite. Zapisanie dotyczcych go danych nie jest moliwe."; Text[ portuguese_brazilian ] = "The datasource was deleted. It is not possible to save datasource relevant data."; Text[ japanese ] = "従属するデータソースが削除されています。これに関連するデータは保存できません。"; - Text[ korean ] = "해당하는 데이터 소스가 삭제되었습니다. 데이터 소스의 관련 데이터를 저장할 수 없습니다."; + Text[ korean ] = "해당하는 데이터 원본이 삭제되었습니다. 데이터 원본에 관련되는 데이터를 저장할 수 없습니다."; Text[ chinese_simplified ] = "这个数据库已经被删除。因此无法保存任何相关数据。"; Text[ chinese_traditional ] = "這個資料源已經被刪除。因此無法儲存任何資料。"; Text[ turkish ] = "The datasource was deleted. It is not possible to save datasource relevant data."; @@ -2158,7 +2158,7 @@ String STR_QRY_COLUMN_NOT_FOUND Text[ swedish ] = "Kolumnen '$name$' r oknd!"; Text[ polish ] = "The column '$name$' is unknown!"; Text[ japanese ] = "列 '$name$' は不明です。"; - Text[ korean ] = "열 '$name$' 이(가) 불분명합니다."; + Text[ korean ] = "열 '$name$'은(는) 알 수 없습니다."; Text[ chinese_simplified ] = "列 '$name$' 不明！"; Text[ chinese_traditional ] = "欄位 '$name$' 不明！"; Text[ turkish ] = "The column '$name$' is unknown!"; @@ -2206,7 +2206,7 @@ String STR_QRY_LIKE_LEFT_NO_COLUMN Text[ swedish ] = "Det mste st ett kolumnnamn framfr 'SOM'."; Text[ polish ] = "On the left side of a 'LIKE' statement only a column name is allowed."; Text[ japanese ] = "'LIKE' の前に列名を記述する必要があります。"; - Text[ korean ] = "'LIKE' 문장의 왼쪽에는 열 이름을 하나 밖에 사용할 수 없습니다."; + Text[ korean ] = "'LIKE' 앞에 열 이름을 사용해야 합니다."; Text[ chinese_simplified ] = "在 LIKE 之前必须输入一个列名称。"; Text[ chinese_traditional ] = "在 'LIKE' 之前必須輸入一個欄位名稱。"; Text[ turkish ] = "On the left side of a 'LIKE' statement only a column name is allowed."; @@ -2229,7 +2229,7 @@ String STR_QRY_CHECK_CASESENSITIVE Text[ swedish ] = "Kolumnen kunde inte hittas. Observera att databasen gr skillnad p stor och liten bokstav."; Text[ polish ] = "Please check if you are using the correct case."; Text[ japanese ] = "列は見つかりませんでした。データベースでは大文字と小文字が区別されることに注意してください。"; - Text[ korean ] = "단락을 찾지 못했습니다. 데이터베이스가 대소문자를 구분한다는 점을 유의해주십시오."; + Text[ korean ] = "열을 찾지 못했습니다. 데이터베이스가 대소문자를 구분한다는 점에 유의해주십시오."; Text[ chinese_simplified ] = "无法找到列。请注意本数据库区分字母的大小写。"; Text[ chinese_traditional ] = "無法找到欄位。請注意本資料庫區分字母的大小寫。"; Text[ turkish ] = "Please check if you are using the correct case."; @@ -2238,24 +2238,24 @@ String STR_QRY_CHECK_CASESENSITIVE String STR_QUERYDESIGN { - Text = "Abfrageentwurf"; - Text[ english_us ] = "Query Design"; + Text = "Abfrageentwurf:"; + Text[ english_us ] = "Query Design:"; Text[ portuguese ] = "Query Design"; Text[ russian ] = "Query Design"; Text[ greek ] = "Query Design"; Text[ dutch ] = "Query Design"; - Text[ french ] = "Query Design"; - Text[ spanish ] = "Query Design"; + Text[ french ] = "bauche de requte"; + Text[ spanish ] = "Diseo de consulta"; Text[ finnish ] = "Query Design"; - Text[ italian ] = "Query Design"; + Text[ italian ] = "Struttura ricerca:"; Text[ danish ] = "Query Design"; - Text[ swedish ] = "Query Design"; + Text[ swedish ] = "Skningsutkast:"; Text[ polish ] = "Query Design"; Text[ portuguese_brazilian ] = "Query Design"; - Text[ japanese ] = "Query Design"; - Text[ korean ] = "Query Design"; - Text[ chinese_simplified ] = "Query Design"; - Text[ chinese_traditional ] = "Query Design"; + Text[ japanese ] = "クエリーデザイン"; + Text[ korean ] = "쿼리 디자인:"; + Text[ chinese_simplified ] = "查询设计："; + Text[ chinese_traditional ] = "查詢設計："; Text[ turkish ] = "Query Design"; Text[ arabic ] = "Query Design"; Text[ catalan ] = "Query Design"; @@ -2264,24 +2264,24 @@ String STR_QUERYDESIGN String STR_VIEWDESIGN { - Text = "Ansichtsentwurf"; - Text[ english_us ] = "View Design"; + Text = "Ansichtsentwurf:"; + Text[ english_us ] = "View Design:"; Text[ portuguese ] = "View Design"; Text[ russian ] = "View Design"; Text[ greek ] = "View Design"; Text[ dutch ] = "View Design"; - Text[ french ] = "View Design"; - Text[ spanish ] = "View Design"; + Text[ french ] = "bauche de vue"; + Text[ spanish ] = "Diseo de vista"; Text[ finnish ] = "View Design"; - Text[ italian ] = "View Design"; + Text[ italian ] = "Struttura visualizzazione:"; Text[ danish ] = "View Design"; - Text[ swedish ] = "View Design"; + Text[ swedish ] = "Vyutkast:"; Text[ polish ] = "View Design"; Text[ portuguese_brazilian ] = "View Design"; - Text[ japanese ] = "View Design"; - Text[ korean ] = "View Design"; - Text[ chinese_simplified ] = "View Design"; - Text[ chinese_traditional ] = "View Design"; + Text[ japanese ] = "ビューデザイン"; + Text[ korean ] = "디자인 보기:"; + Text[ chinese_simplified ] = "视图设计："; + Text[ chinese_traditional ] = "檢視設計："; Text[ turkish ] = "View Design"; Text[ arabic ] = "View Design"; Text[ catalan ] = "View Design"; @@ -2290,3 +2290,9 @@ String STR_VIEWDESIGN + + + + + + diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index 761f1dbe9c0e..54d439111e51 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -2,9 +2,9 @@ * * $RCSfile: querycontainerwindow.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: oj $ $Date: 2002-06-27 08:04:37 $ + * last change: $Author: hr $ $Date: 2003-03-19 17:52:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -126,6 +126,10 @@ namespace dbaui OQueryContainerWindow::~OQueryContainerWindow() { + { + ::std::auto_ptr<OQueryViewSwitch> aTemp(m_pViewSwitch); + m_pViewSwitch = NULL; + } if ( m_pBeamer ) ::dbaui::notifySystemWindow(this,m_pBeamer,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); m_pBeamer = NULL; @@ -145,10 +149,7 @@ namespace dbaui ::std::auto_ptr<Window> aTemp(m_pSplitter); m_pSplitter = NULL; } - { - ::std::auto_ptr<OQueryViewSwitch> aTemp(m_pViewSwitch); - m_pViewSwitch = NULL; - } + DBG_DTOR(OQueryContainerWindow,NULL); } // ----------------------------------------------------------------------------- @@ -319,34 +320,4 @@ namespace dbaui } // namespace dbaui //......................................................................... -/************************************************************************* - * history: - * $Log: not supported by cvs2svn $ - * Revision 1.8 2002/05/29 08:28:58 oj - * #99650# use of auto_ptr when deleting window - * - * Revision 1.7 2002/05/06 09:52:47 oj - * #96363# change return type of switchView - * - * Revision 1.6 2002/05/02 07:54:11 oj - * #98916# enable F6 key - * - * Revision 1.5 2002/03/01 14:42:07 oj - * #97850# correct F6 handling - * - * Revision 1.4 2002/02/11 12:58:53 oj - * #90580# enable F6 key for components - * - * Revision 1.3 2001/09/20 12:56:16 oj - * #92232# fixes for BIGINT type and new property HELPTEXT - * - * Revision 1.2 2001/09/07 10:05:58 fs - * #65293# syntax - * - * Revision 1.1 2001/08/23 14:39:40 fs - * initial checkin - outsourced from QueryTextView.hxx (the container window for the query design) - * - * - * Revision 1.0 23.08.01 12:15:26 fs - ************************************************************************/ diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index e3a3893c832f..8188ae4ae828 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -2,9 +2,9 @@ * * $RCSfile: querycontroller.cxx,v $ * - * $Revision: 1.88 $ + * $Revision: 1.89 $ * - * last change: $Author: oj $ $Date: 2002-12-12 13:44:48 $ + * last change: $Author: hr $ $Date: 2003-03-19 17:52:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -828,7 +828,7 @@ void OQueryController::setTitle(const ::rtl::OUString& _sName) sName = ::dbtools::createUniqueName(getElements(),aDefaultName); } String aName = String(ModuleRes(m_bCreateView ? STR_VIEWDESIGN : STR_QUERYDESIGN)); - sName = aName + ::rtl::OUString::createFromAscii(": ") + sName; + sName = aName + ::rtl::OUString::createFromAscii(" ") + sName; xProp->setPropertyValue(PROPERTY_TITLE,makeAny(sName)); } } diff --git a/dbaccess/source/ui/querydesign/querydlg.src b/dbaccess/source/ui/querydesign/querydlg.src index 533f56249b62..05d7cf3c0ef4 100644 --- a/dbaccess/source/ui/querydesign/querydlg.src +++ b/dbaccess/source/ui/querydesign/querydlg.src @@ -2,9 +2,9 @@ * * $RCSfile: querydlg.src,v $ * - * $Revision: 1.35 $ + * $Revision: 1.36 $ * - * last change: $Author: kz $ $Date: 2002-12-05 10:31:41 $ + * last change: $Author: hr $ $Date: 2003-03-19 17:53:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -172,7 +172,7 @@ ModalDialog DLG_QRY_JOIN Text [ ENGLISH ] = "Options" ; Text[ english_us ] = "Options"; Text[ portuguese ] = "Opes"; - Text[ russian ] = ""; + Text[ russian ] = " "; Text[ dutch ] = "Opties"; Text[ french ] = "Options"; Text[ spanish ] = "Opciones"; @@ -355,10 +355,10 @@ ModalDialog DLG_QRY_JOIN }; StringList [ korean ] = { - < "내부 결합" ; Default; > ; - < "좌측 결합" ; Default; > ; - < "우측 결합" ; Default; > ; - < "완전 외부 결합" ; Default; > ; + < "내부 조인" ; Default; > ; + < "왼쪽 조인" ; Default; > ; + < "오른쪽 조인" ; Default; > ; + < "완전 외부 조인" ; Default; > ; }; StringList [ chinese_simplified ] = { @@ -450,7 +450,7 @@ ModalDialog DLG_QRY_JOIN Text[ dutch ] = "Verbindingseigenschappen"; Text[ chinese_simplified ] = "连结属性"; Text[ greek ] = " "; - Text[ korean ] = "조인 속성"; + Text[ korean ] = "조인 등록 정보"; Text[ arabic ] = " "; Text[ turkish ] = "Birleme zellikleri"; Text[ language_user1 ] = " "; @@ -480,7 +480,7 @@ String STR_QUERY_INNER_JOIN Text[ dutch ] = "Bevat alleen records waarbij de inhoud van de gekoppelde velden in beide tabellen gelijk is."; Text[ chinese_simplified ] = "只包含两个表格中引用字段相同的数据条目。"; Text[ greek ] = " ."; - Text[ korean ] = "두 개 시트의 링크된 필드 내용이 같은 레코드만을 포함합니다."; + Text[ korean ] = "두 테이블의 관계된 필드 내용이 일치하는 레코드만을 포함합니다."; Text[ arabic ] = " ."; Text[ turkish ] = "Yalnzca her iki tablodaki ilikili alan ieriklerinin ayn olduu kaytlar ierir."; Text[ language_user1 ] = " "; @@ -510,7 +510,7 @@ String STR_QUERY_LEFTRIGHT_JOIN Text[ dutch ] = "Bevat ALLE records uit '%1' en alleen de records uit '%2' waarbij de inhoud van de gekoppelde velden in beide tabellen gelijk is."; Text[ chinese_simplified ] = "含有'%1'中的所有数据条目和'%2'中两个表格引用字段相同的数据条目。"; Text[ greek ] = " '%1' '%2' "; - Text[ korean ] = "시트'%1'에는 모든 레코드, 시트 '%2'에는 두 개 시트의 링크된 필드 내용이 같은 레코드만이 포함됩니다 ."; + Text[ korean ] = "테이블 '%1'에는 모든 레코드가 테이블 '%2'에는 두 테이블의 관계된 필드 내용이 일치하는 레코드만이 포함됩니다."; Text[ arabic ] = " '%1' '%2' ."; Text[ turkish ] = "'%1' tablosundaki kaytlarn TAMAMINI ve '%2' tablosundaki kaytlardan yalnzca her iki tablodaki ilikili alan ierikleri ayn olan kaytlar ierir."; Text[ language_user1 ] = " "; @@ -540,7 +540,7 @@ String STR_QUERY_FULL_JOIN Text[ dutch ] = "Bevat ALLE records uit '%1' en '%2'."; Text[ chinese_simplified ] = "含有 '%1'和'%2'内全部的数据条目"; Text[ greek ] = " '%1' '%2'."; - Text[ korean ] = "시트'%1' 와(과) '%2'의 모든 레코드를 포함합니다."; + Text[ korean ] = "'%1' 와(과) '%2'의 모든 레코드를 포함합니다."; Text[ arabic ] = " '%1' '%2'."; Text[ turkish ] = "'%1' ve '%2' tablolarndaki TM kaytlar ierir."; Text[ language_user1 ] = " "; @@ -565,3 +565,9 @@ String STR_QUERY_FULL_JOIN + + + + + + |