Skip to content

C
core
Kaydet (Commit) e9768296 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

convert sort options dialog to .ui 

Change-Id: Ic110c6d2fb1f1fc28344c119eaa1b61d0ba81e6b
üst be9f79cf
Expand all Show whitespace changes
Inline Side-by-side
Showing with 46 additions and 287 deletions
dbaccess/AllLangResTarget_dbu.mk
Dosyayı görüntüle @ e9768296
......@@ -53,7 +53,6 @@ $(eval $(call gb_SrsTarget_add_files,dbaccess/dbu,\
dbaccess/source/ui/dlg/indexdialog.src \
dbaccess/source/ui/dlg/paramdialog.src \
dbaccess/source/ui/dlg/queryfilter.src \
dbaccess/source/ui/dlg/queryorder.src \
dbaccess/source/ui/dlg/RelationDlg.src \
dbaccess/source/ui/dlg/sqlmessage.src \
dbaccess/source/ui/dlg/textconnectionsettings.src \
......
dbaccess/UIConfig_dbaccess.mk
Dosyayı görüntüle @ e9768296
......@@ -16,6 +16,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/generalpagewizard \
dbaccess/uiconfig/ui/querypropertiesdialog \
dbaccess/uiconfig/ui/rowheightdialog \
dbaccess/uiconfig/ui/sortdialog \
))
# vim: set noet sw=4 ts=4:
dbaccess/inc/dbaccess_helpid.hrc
Dosyayı görüntüle @ e9768296
......@@ -23,7 +23,6 @@
#define HID_DSADMIN_CHARSET "DBACCESS_HID_DSADMIN_CHARSET"
#define HID_DLG_FILTERCRIT "DBACCESS_HID_DLG_FILTERCRIT"
#define HID_DLG_ORDERCRIT "DBACCESS_HID_DLG_ORDERCRIT"
#define HID_DATABROWSE_HEADER "DBACCESS_HID_DATABROWSE_HEADER"
#define HID_CTL_TABBROWSER "DBACCESS_HID_CTL_TABBROWSER"
......
dbaccess/source/ui/dlg/queryorder.cxx
Dosyayı görüntüle @ e9768296
......@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "queryorder.hrc"
#include "dbu_tbl.hrc"
#include "queryorder.hxx"
#include "dbustrings.hrc"
#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
......@@ -44,54 +44,45 @@ using namespace ::com::sun::star::beans;
DBG_NAME(DlgOrderCrit)
DlgOrderCrit::DlgOrderCrit( Window * pParent,
DlgOrderCrit::DlgOrderCrit(Window * pParent,
const Reference< XConnection>& _rxConnection,
const Reference< XSingleSelectQueryComposer >& _rxComposer,
const Reference< XNameAccess>& _rxCols)
:ModalDialog( pParent, ModuleRes(DLG_ORDERCRIT) )
,aLB_ORDERFIELD1( this, ModuleRes( LB_ORDERFIELD1 ) )
,aLB_ORDERVALUE1( this, ModuleRes( LB_ORDERVALUE1 ) )
,aLB_ORDERFIELD2( this, ModuleRes( LB_ORDERFIELD2 ) )
,aLB_ORDERVALUE2( this, ModuleRes( LB_ORDERVALUE2 ) )
,aLB_ORDERFIELD3( this, ModuleRes( LB_ORDERFIELD3 ) )
,aLB_ORDERVALUE3( this, ModuleRes( LB_ORDERVALUE3 ) )
,aFT_ORDERFIELD( this, ModuleRes( FT_ORDERFIELD ) )
,aFT_ORDERAFTER1( this, ModuleRes( FT_ORDERAFTER1 ) )
,aFT_ORDERAFTER2( this, ModuleRes( FT_ORDERAFTER2 ) )
,aFT_ORDEROPER( this, ModuleRes( FT_ORDEROPER ) )
,aFT_ORDERDIR( this, ModuleRes( FT_ORDERDIR ) )
,aBT_OK( this, ModuleRes( BT_OK ) )
,aBT_CANCEL( this, ModuleRes( BT_CANCEL ) )
,aBT_HELP( this, ModuleRes( BT_HELP ) )
,aFL_ORDER( this, ModuleRes( FL_ORDER ) )
,aSTR_NOENTRY( ModuleRes( STR_NOENTRY ) )
,m_xQueryComposer( _rxComposer )
,m_xColumns(_rxCols)
,m_xConnection(_rxConnection)
: ModalDialog(pParent, "SortDialog", "dbaccess/ui/sortdialog.ui")
, aSTR_NOENTRY(ModuleRes(STR_VALUE_NONE))
, m_xQueryComposer(_rxComposer)
, m_xColumns(_rxCols)
, m_xConnection(_rxConnection)
{
DBG_CTOR(DlgOrderCrit,NULL);
get(m_pLB_ORDERFIELD1, "field1");
get(m_pLB_ORDERVALUE1, "value1");
get(m_pLB_ORDERFIELD2, "field2");
get(m_pLB_ORDERVALUE2, "value2");
get(m_pLB_ORDERFIELD3, "field3");
get(m_pLB_ORDERVALUE3, "value3");
AllSettings aSettings( GetSettings() );
StyleSettings aStyle( aSettings.GetStyleSettings() );
aStyle.SetAutoMnemonic( sal_False );
aSettings.SetStyleSettings( aStyle );
SetSettings( aSettings );
m_aColumnList[0] = &aLB_ORDERFIELD1;
m_aColumnList[1] = &aLB_ORDERFIELD2;
m_aColumnList[2] = &aLB_ORDERFIELD3;
m_aColumnList[0] = m_pLB_ORDERFIELD1;
m_aColumnList[1] = m_pLB_ORDERFIELD2;
m_aColumnList[2] = m_pLB_ORDERFIELD3;
m_aValueList[0] = &aLB_ORDERVALUE1;
m_aValueList[1] = &aLB_ORDERVALUE2;
m_aValueList[2] = &aLB_ORDERVALUE3;
m_aValueList[0] = m_pLB_ORDERVALUE1;
m_aValueList[1] = m_pLB_ORDERVALUE2;
m_aValueList[2] = m_pLB_ORDERVALUE3;
xub_StrLen j;
for(j=0 ; j < DOG_ROWS ; j++ )
for (int j=0; j < DOG_ROWS; ++j)
{
m_aColumnList[j]->InsertEntry( aSTR_NOENTRY );
}
for( j=0 ; j < DOG_ROWS ; j++ )
for (int j=0; j < DOG_ROWS; ++j)
{
m_aColumnList[j]->SelectEntryPos(0);
m_aValueList[j]->SelectEntryPos(0);
......@@ -114,7 +105,7 @@ DlgOrderCrit::DlgOrderCrit( Window * pParent,
sal_Int32 eColumnSearch = dbtools::getSearchColumnFlag(m_xConnection,nDataType);
if(eColumnSearch != ColumnSearch::NONE)
{
for( j=0 ; j < DOG_ROWS ; j++ )
for (int j=0; j < DOG_ROWS; ++j)
{
m_aColumnList[j]->InsertEntry(*pIter);
}
......@@ -131,10 +122,8 @@ DlgOrderCrit::DlgOrderCrit( Window * pParent,
}
EnableLines();
aLB_ORDERFIELD1.SetSelectHdl(LINK(this,DlgOrderCrit,FieldListSelectHdl));
aLB_ORDERFIELD2.SetSelectHdl(LINK(this,DlgOrderCrit,FieldListSelectHdl));
FreeResource();
m_pLB_ORDERFIELD1->SetSelectHdl(LINK(this,DlgOrderCrit,FieldListSelectHdl));
m_pLB_ORDERFIELD2->SetSelectHdl(LINK(this,DlgOrderCrit,FieldListSelectHdl));
}
DlgOrderCrit::~DlgOrderCrit()
......@@ -187,32 +176,32 @@ void DlgOrderCrit::EnableLines()
{
DBG_CHKTHIS(DlgOrderCrit,NULL);
if ( aLB_ORDERFIELD1.GetSelectEntryPos() == 0 )
if ( m_pLB_ORDERFIELD1->GetSelectEntryPos() == 0 )
{
aLB_ORDERFIELD2.Disable();
aLB_ORDERVALUE2.Disable();
m_pLB_ORDERFIELD2->Disable();
m_pLB_ORDERVALUE2->Disable();
aLB_ORDERFIELD2.SelectEntryPos( 0 );
aLB_ORDERVALUE2.SelectEntryPos( 0 );
m_pLB_ORDERFIELD2->SelectEntryPos( 0 );
m_pLB_ORDERVALUE2->SelectEntryPos( 0 );
}
else
{
aLB_ORDERFIELD2.Enable();
aLB_ORDERVALUE2.Enable();
m_pLB_ORDERFIELD2->Enable();
m_pLB_ORDERVALUE2->Enable();
}
if ( aLB_ORDERFIELD2.GetSelectEntryPos() == 0 )
if ( m_pLB_ORDERFIELD2->GetSelectEntryPos() == 0 )
{
aLB_ORDERFIELD3.Disable();
aLB_ORDERVALUE3.Disable();
m_pLB_ORDERFIELD3->Disable();
m_pLB_ORDERVALUE3->Disable();
aLB_ORDERFIELD3.SelectEntryPos( 0 );
aLB_ORDERVALUE3.SelectEntryPos( 0 );
m_pLB_ORDERFIELD3->SelectEntryPos( 0 );
m_pLB_ORDERVALUE3->SelectEntryPos( 0 );
}
else
{
aLB_ORDERFIELD3.Enable();
aLB_ORDERVALUE3.Enable();
m_pLB_ORDERFIELD3->Enable();
m_pLB_ORDERVALUE3->Enable();
}
}
......
dbaccess/source/ui/dlg/queryorder.hrc deleted 100644 → 0
Dosyayı görüntüle @ be9f79cf
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef DBAUI_QUERYORDER_HRC
#define DBAUI_QUERYORDER_HRC
#include "dbu_dlg.hrc"
#define FT_ORDERFIELD 1
#define FT_ORDERDIR 3
#define FT_ORDERAFTER1 4
#define FT_ORDERAFTER2 5
#define FT_ORDEROPER 6
#define LB_ORDERFIELD1 1
#define LB_ORDERFIELD2 2
#define LB_ORDERFIELD3 3
#define LB_ORDERVALUE1 4
#define LB_ORDERVALUE2 5
#define LB_ORDERVALUE3 6
#define FL_ORDER 1
#define BT_OK 1
#define BT_CANCEL 2
#define BT_HELP 3
#define STR_NOENTRY 1
#endif // DBAUI_QUERYORDER_HRC
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
dbaccess/source/ui/dlg/queryorder.src deleted 100644 → 0
Dosyayı görüntüle @ be9f79cf
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "queryorder.hrc"
#include "dbaccess_helpid.hrc"
ModalDialog DLG_ORDERCRIT
{
OutputSize = TRUE ;
Border = TRUE ;
SVLook = TRUE ;
HelpId = HID_DLG_ORDERCRIT ;
Size = MAP_APPFONT ( 252 , 76 ) ;
Text [ en-US ] = "Sort Order" ;
Moveable = TRUE ;
Closeable = TRUE ;
ListBox LB_ORDERFIELD1
{
HelpID = "dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERFIELD1";
Border = TRUE ;
Pos = MAP_APPFONT ( 59 , 25 ) ;
Size = MAP_APPFONT ( 60 , 72 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
DDExtraWidth = TRUE ;
};
ListBox LB_ORDERVALUE1
{
HelpID = "dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERVALUE1";
Border = TRUE ;
Pos = MAP_APPFONT ( 123 , 25 ) ;
Size = MAP_APPFONT ( 60 , 36 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
CurPos = 0 ;
StringList [ en-US ] =
{
< "ascending" ; Default ; > ;
< "descending" ; Default ; > ;
};
};
ListBox LB_ORDERFIELD2
{
HelpID = "dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERFIELD2";
Border = TRUE ;
Pos = MAP_APPFONT ( 59 , 41 ) ;
Size = MAP_APPFONT ( 60 , 72 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
DDExtraWidth = TRUE ;
};
ListBox LB_ORDERVALUE2
{
HelpID = "dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERVALUE2";
Border = TRUE ;
Pos = MAP_APPFONT ( 123 , 41 ) ;
Size = MAP_APPFONT ( 60 , 36 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
CurPos = 0 ;
StringList [ en-US ] =
{
< "ascending" ; Default ; > ;
< "descending" ; Default ; > ;
};
};
ListBox LB_ORDERFIELD3
{
HelpID = "dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERFIELD3";
Border = TRUE ;
Pos = MAP_APPFONT ( 59 , 57 ) ;
Size = MAP_APPFONT ( 60 , 72 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
DDExtraWidth = TRUE ;
};
ListBox LB_ORDERVALUE3
{
HelpID = "dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERVALUE3";
Border = TRUE ;
Pos = MAP_APPFONT ( 123 , 57 ) ;
Size = MAP_APPFONT ( 60 , 36 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
CurPos = 0 ;
StringList [ en-US ] =
{
< "ascending" ; Default ; > ;
< "descending" ; Default ; > ;
};
};
FixedText FT_ORDERFIELD
{
Pos = MAP_APPFONT ( 58 , 14 ) ;
Size = MAP_APPFONT ( 60 , 8 ) ;
Text [ en-US ] = "Field name" ;
Center = TRUE ;
};
FixedText FT_ORDERAFTER1
{
Pos = MAP_APPFONT ( 12 , 43 ) ;
Size = MAP_APPFONT ( 40 , 8 ) ;
Text [ en-US ] = "and then" ;
};
FixedText FT_ORDERAFTER2
{
Pos = MAP_APPFONT ( 12 , 59 ) ;
Size = MAP_APPFONT ( 40 , 8 ) ;
Text [ en-US ] = "and then" ;
};
FixedText FT_ORDEROPER
{
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 46 , 8 ) ;
Text [ en-US ] = "Operator" ;
};
FixedText FT_ORDERDIR
{
Pos = MAP_APPFONT ( 122 , 14 ) ;
Size = MAP_APPFONT ( 60 , 8 ) ;
Text [ en-US ] = "Order" ;
Center = TRUE ;
};
OKButton BT_OK
{
Pos = MAP_APPFONT ( 196 , 6 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
DefButton = TRUE ;
};
CancelButton BT_CANCEL
{
Pos = MAP_APPFONT ( 196 , 23 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
HelpButton BT_HELP
{
Pos = MAP_APPFONT ( 196 , 43 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
FixedLine FL_ORDER
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 184 , 8 ) ;
Text [ en-US ] = "Sort order" ;
};
String STR_NOENTRY
{
Text [ en-US ] = "<none>" ;
};
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
dbaccess/source/ui/inc/dbu_resource.hrc
Dosyayı görüntüle @ e9768296
......@@ -82,7 +82,6 @@
#define DLG_DATASOURCE_SELECTION RID_DIALOG_START + 4
#define DLG_PARAMETERS RID_DIALOG_START + 5
#define DLG_FILTERCRIT RID_DIALOG_START + 6
#define DLG_ORDERCRIT RID_DIALOG_START + 7
#define DLG_ATTR RID_DIALOG_START + 10
#define DLG_SAVE_AS RID_DIALOG_START + 11
......
dbaccess/source/ui/inc/queryorder.hxx
Dosyayı görüntüle @ e9768296
......@@ -59,21 +59,12 @@ namespace dbaui
class DlgOrderCrit : public ModalDialog
{
protected:
ListBox aLB_ORDERFIELD1;
ListBox aLB_ORDERVALUE1;
ListBox aLB_ORDERFIELD2;
ListBox aLB_ORDERVALUE2;
ListBox aLB_ORDERFIELD3;
ListBox aLB_ORDERVALUE3;
FixedText aFT_ORDERFIELD;
FixedText aFT_ORDERAFTER1;
FixedText aFT_ORDERAFTER2;
FixedText aFT_ORDEROPER;
FixedText aFT_ORDERDIR;
OKButton aBT_OK;
CancelButton aBT_CANCEL;
HelpButton aBT_HELP;
FixedLine aFL_ORDER;
ListBox* m_pLB_ORDERFIELD1;
ListBox* m_pLB_ORDERVALUE1;
ListBox* m_pLB_ORDERFIELD2;
ListBox* m_pLB_ORDERVALUE2;
ListBox* m_pLB_ORDERFIELD3;
ListBox* m_pLB_ORDERVALUE3;
OUString aSTR_NOENTRY;
OUString m_sOrgOrder;
......
dbaccess/uiconfig/ui/sortdialog.ui 0 → 100644
Dosyayı görüntüle @ e9768296
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment