[Libreoffice-commits] core.git: 2 commits - cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk helpcontent2
cui/AllLangResTarget_cui.mk |1
cui/UIConfig_cui.mk |1
cui/source/dialogs/srchxtra.cxx | 46 +
cui/source/dialogs/srchxtra.hrc | 32 -
cui/source/dialogs/srchxtra.src | 68 ---
cui/source/inc/cuires.hrc |1
cui/source/inc/helpid.hrc |2
cui/source/inc/srchxtra.hxx |8 --
cui/uiconfig/ui/searchattrdialog.ui | 126
helpcontent2|2
10 files changed, 148 insertions(+), 139 deletions(-)
New commits:
commit 5b254427b2e884c00c6a7d6d706962c259190622
Author: Caolán McNamara caol...@redhat.com
Date: Thu Dec 26 10:09:10 2013 +
convert search attribute dialog to .ui
Change-Id: Id1d8ac652af38b80d0126bb80f91120d3e12e993
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 16a1feb..4819ae8 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -40,7 +40,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/dialogs/multipat.src \
cui/source/dialogs/passwdomdlg.src \
cui/source/dialogs/scriptdlg.src \
-cui/source/dialogs/srchxtra.src \
cui/source/dialogs/svuidlg.src \
cui/source/options/certpath.src \
cui/source/options/connpooloptions.src \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 95fdba3..cde65d0 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -128,6 +128,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/recordnumberdialog \
cui/uiconfig/ui/rotationtabpage \
cui/uiconfig/ui/scriptorganizer \
+ cui/uiconfig/ui/searchattrdialog \
cui/uiconfig/ui/searchformatdialog \
cui/uiconfig/ui/securityoptionsdialog \
cui/uiconfig/ui/select_persona_dialog \
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index 7000d95..16a0434 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -24,7 +24,6 @@
#include svl/whiter.hxx
#include sfx2/objsh.hxx
#include cuires.hrc
-#include srchxtra.hrc
#include svx/svxitems.hrc
#include svx/dialmgr.hxx
#include editeng/flstitem.hxx
@@ -111,29 +110,20 @@ void SvxSearchFormatDialog::PageCreated( sal_uInt16 nId,
SfxTabPage rPage )
}
}
-// class SvxSearchFormatDialog ---
-
-SvxSearchAttributeDialog::SvxSearchAttributeDialog( Window* pParent,
-SearchAttrItemList rLst,
-const sal_uInt16*
pWhRanges ) :
-
-ModalDialog( pParent, CUI_RES( RID_SVXDLG_SEARCHATTR ) ),
-
-aAttrFL ( this, CUI_RES( FL_ATTR ) ),
-aAttrLB ( this, CUI_RES( LB_ATTR ) ),
-aOKBtn ( this, CUI_RES( BTN_ATTR_OK ) ),
-aEscBtn ( this, CUI_RES( BTN_ATTR_CANCEL ) ),
-aHelpBtn( this, CUI_RES( BTN_ATTR_HELP ) ),
-
-rList( rLst )
-
+SvxSearchAttributeDialog::SvxSearchAttributeDialog(Window* pParent,
+SearchAttrItemList rLst, const sal_uInt16* pWhRanges)
+: ModalDialog(pParent, SearchAttrDialog, cui/ui/searchattrdialog.ui)
+, rList(rLst)
{
-FreeResource();
+get(m_pOKBtn, ok);
+get(m_pAttrLB, treeview);
+m_pAttrLB-set_height_request(m_pAttrLB-GetTextHeight() * 12);
+m_pAttrLB-set_width_request(m_pAttrLB-approximate_char_width() * 56);
-aAttrLB.SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT );
-aAttrLB.GetModel()-SetSortMode( SortAscending );
+m_pAttrLB-SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT );
+m_pAttrLB-GetModel()-SetSortMode( SortAscending );
-aOKBtn.SetClickHdl( LINK( this, SvxSearchAttributeDialog, OKHdl ) );
+m_pOKBtn-SetClickHdl( LINK( this, SvxSearchAttributeDialog, OKHdl ) );
SfxObjectShell* pSh = SfxObjectShell::Current();
DBG_ASSERT( pSh, No DocShell );
@@ -164,21 +154,21 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog(
Window* pParent,
sal_uInt32 nId = aAttrNames.FindIndex( nSlot );
SvTreeListEntry* pEntry = NULL;
if ( RESARRAY_INDEX_NOTFOUND != nId )
-pEntry = aAttrLB.SvTreeListBox::InsertEntry(
aAttrNames.GetString(nId) );
+pEntry = m_pAttrLB-SvTreeListBox::InsertEntry(
aAttrNames.GetString(nId) );
else
SAL_WARN( cui.dialogs, no resource for slot id
static_castsal_Int32(nSlot) );
if ( pEntry )
{
-aAttrLB.SetCheckButtonState( pEntry, bChecked ?
SV_BUTTON_CHECKED : SV_BUTTON_UNCHECKED );
+m_pAttrLB-SetCheckButtonState( pEntry, bChecked ?
SV_BUTTON_CHECKED : SV_BUTTON_UNCHECKED );
pEntry-SetUserData( (void*)(sal_uLong)nSlot );
}
}
nWhich = aIter.NextWhich();
}
-aAttrLB.SetHighlightRange();
-aAttrLB.SelectEntryPos( 0 );
+
[Libreoffice-commits] core.git: 2 commits - cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk helpcontent2
cui/AllLangResTarget_cui.mk |1
cui/UIConfig_cui.mk |1
cui/source/dialogs/cuitbxform.cxx | 21 +-
cui/source/dialogs/fmsearch.hrc |1
cui/source/dialogs/tbxform.src| 60 ---
cui/source/inc/cuitbxform.hxx | 14 +---
cui/uiconfig/ui/recordnumberdialog.ui | 105 ++
helpcontent2 |2
8 files changed, 118 insertions(+), 87 deletions(-)
New commits:
commit 1bb4a66904509faf1954a87e95c7299f5f502580
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 16 12:57:52 2013 +
convert goto record dialog to .ui
Change-Id: I2bc2c5837556da73cc60e0e5b906ddb4f01844d9
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 15966db..3265c7e 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -43,7 +43,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/dialogs/showcols.src \
cui/source/dialogs/srchxtra.src \
cui/source/dialogs/svuidlg.src \
-cui/source/dialogs/tbxform.src \
cui/source/options/certpath.src \
cui/source/options/connpooloptions.src \
cui/source/options/dbregister.src \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index c540b0e..d90ef32 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -118,6 +118,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/querynoloadedfiledialog \
cui/uiconfig/ui/querynosavefiledialog \
cui/uiconfig/ui/querysavelistdialog \
+ cui/uiconfig/ui/recordnumberdialog \
cui/uiconfig/ui/rotationtabpage \
cui/uiconfig/ui/scriptorganizer \
cui/uiconfig/ui/securityoptionsdialog \
diff --git a/cui/source/dialogs/cuitbxform.cxx
b/cui/source/dialogs/cuitbxform.cxx
index 263102d..3c1f7cf 100644
--- a/cui/source/dialogs/cuitbxform.cxx
+++ b/cui/source/dialogs/cuitbxform.cxx
@@ -30,25 +30,16 @@
#include cuitbxform.hxx
#include sfx2/viewfrm.hxx
#include sfx2/viewsh.hxx
-#include fmsearch.hrc
-
-//
-// class FmInputRecordNoDialog
-//
FmInputRecordNoDialog::FmInputRecordNoDialog(Window * pParent)
-:ModalDialog( pParent, CUI_RES(RID_SVX_DLG_INPUTRECORDNO))
-,m_aLabel(this, CUI_RES(1))
-,m_aRecordNo(this, CUI_RES(1))
-,m_aOk(this, CUI_RES(1))
-,m_aCancel(this, CUI_RES(1))
+: ModalDialog( pParent, RecordNumberDialog,
cui/ui/recordnumberdialog.ui)
{
-m_aRecordNo.SetMin(1);
-m_aRecordNo.SetMax(0x7FFF);
-m_aRecordNo.SetStrictFormat(sal_True);
-m_aRecordNo.SetDecimalDigits(0);
+get(m_pRecordNo, entry-nospin);
-FreeResource();
+m_pRecordNo-SetMin(1);
+m_pRecordNo-SetMax(0x7FFF);
+m_pRecordNo-SetStrictFormat(sal_True);
+m_pRecordNo-SetDecimalDigits(0);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/fmsearch.hrc b/cui/source/dialogs/fmsearch.hrc
index a58ecb8..3b65fdb 100644
--- a/cui/source/dialogs/fmsearch.hrc
+++ b/cui/source/dialogs/fmsearch.hrc
@@ -21,7 +21,6 @@
#include svl/solar.hrc
-#define RID_SVX_DLG_INPUTRECORDNO (RID_FORMS_START + 10)
#define RID_SVX_DLG_SHOWGRIDCOLUMNS (RID_FORMS_START + 11)
#define RID_SVXDLG_SEARCHFORM (RID_FORMS_START + 7)
#define RID_STR_SEARCH_ANYWHERE (RID_FORMS_START + 85)
diff --git a/cui/source/dialogs/tbxform.src b/cui/source/dialogs/tbxform.src
deleted file mode 100644
index 5b6fc4a..000
--- a/cui/source/dialogs/tbxform.src
+++ /dev/null
@@ -1,60 +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 fmsearch.hrc
-
-ModalDialog RID_SVX_DLG_INPUTRECORDNO
-{
-HelpID = cui:ModalDialog:RID_SVX_DLG_INPUTRECORDNO;
-OutputSize = TRUE ;
-SVLook = TRUE ;
-Size = MAP_APPFONT ( 130 , 45 ) ;
-Moveable = TRUE ;
-Closeable = TRUE ;
-Text [ en-US ] = Record Number;
-
-FixedText 1
-{
-
