[Libreoffice-commits] core.git: dbaccess/AllLangResTarget_dbu.mk dbaccess/inc dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk
Caolán McNamara
caolanm at redhat.com
Thu Jan 9 01:29:57 PST 2014
dbaccess/AllLangResTarget_dbu.mk | 1
dbaccess/UIConfig_dbaccess.mk | 1
dbaccess/inc/dbaccess_helpid.hrc | 1
dbaccess/source/ui/dlg/queryorder.cxx | 95 ++++------
dbaccess/source/ui/dlg/queryorder.hrc | 47 -----
dbaccess/source/ui/dlg/queryorder.src | 172 -------------------
dbaccess/source/ui/inc/dbu_resource.hrc | 1
dbaccess/source/ui/inc/queryorder.hxx | 21 --
dbaccess/uiconfig/ui/sortdialog.ui | 285 ++++++++++++++++++++++++++++++++
9 files changed, 334 insertions(+), 290 deletions(-)
New commits:
commit e9768296581a07913cd3a94705851acc597a357d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 9 09:10:11 2014 +0000
convert sort options dialog to .ui
Change-Id: Ic110c6d2fb1f1fc28344c119eaa1b61d0ba81e6b
diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk
index a991293..55715cd 100644
--- a/dbaccess/AllLangResTarget_dbu.mk
+++ b/dbaccess/AllLangResTarget_dbu.mk
@@ -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 \
diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index e6e003c..8fee67b 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -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:
diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc
index cfccb9e..f7488c6 100644
--- a/dbaccess/inc/dbaccess_helpid.hrc
+++ b/dbaccess/inc/dbaccess_helpid.hrc
@@ -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"
diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx
index 0536bab..3909cff 100644
--- a/dbaccess/source/ui/dlg/queryorder.cxx
+++ b/dbaccess/source/ui/dlg/queryorder.cxx
@@ -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,
- 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)
+DlgOrderCrit::DlgOrderCrit(Window * pParent,
+ const Reference< XConnection>& _rxConnection,
+ const Reference< XSingleSelectQueryComposer >& _rxComposer,
+ const Reference< XNameAccess>& _rxCols)
+ : 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();
}
}
diff --git a/dbaccess/source/ui/dlg/queryorder.hrc b/dbaccess/source/ui/dlg/queryorder.hrc
deleted file mode 100644
index 5365b96..0000000
--- a/dbaccess/source/ui/dlg/queryorder.hrc
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- 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: */
diff --git a/dbaccess/source/ui/dlg/queryorder.src b/dbaccess/source/ui/dlg/queryorder.src
deleted file mode 100644
index ce0af56..0000000
--- a/dbaccess/source/ui/dlg/queryorder.src
+++ /dev/null
@@ -1,172 +0,0 @@
-/* -*- 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: */
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index dc0ed4f..501828e 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -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
diff --git a/dbaccess/source/ui/inc/queryorder.hxx b/dbaccess/source/ui/inc/queryorder.hxx
index 8a99708..9dedf1c 100644
--- a/dbaccess/source/ui/inc/queryorder.hxx
+++ b/dbaccess/source/ui/inc/queryorder.hxx
@@ -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;
diff --git a/dbaccess/uiconfig/ui/sortdialog.ui b/dbaccess/uiconfig/ui/sortdialog.ui
new file mode 100644
index 0000000..4ac32b6
--- /dev/null
+++ b/dbaccess/uiconfig/ui/sortdialog.ui
@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Thu Jan 9 09:23:55 2014 -->
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="SortDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Sort Order</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Operator</property>
+ <property name="ellipsize">end</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">and then</property>
+ <property name="ellipsize">end</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">and then</property>
+ <property name="ellipsize">end</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Field name</property>
+ <property name="ellipsize">end</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Order</property>
+ <property name="ellipsize">end</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="field1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="value1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <items>
+ <item translatable="yes">ascending</item>
+ <item translatable="yes">descending</item>
+ </items>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="field2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="field3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="value2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <items>
+ <item translatable="yes">ascending</item>
+ <item translatable="yes">descending</item>
+ </items>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="value3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <items>
+ <item translatable="yes">ascending</item>
+ <item translatable="yes">descending</item>
+ </items>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Sort order</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">ok</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ <action-widget response="0">help</action-widget>
+ </action-widgets>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list