[PATCH] Object name, description dialog and messagebox ported to UI ...
Roth Robert (via Code Review)
gerrit at gerrit.libreoffice.org
Thu Jan 24 17:37:55 PST 2013
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1857
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/57/1857/1
Object name, description dialog and messagebox ported to UI files
Change-Id: Iad23998c9ccde22abad9d894af3dd6df7c92564f
---
M cui/AllLangResTarget_cui.mk
M cui/UI_cui.mk
M cui/source/dialogs/dlgname.cxx
D cui/source/dialogs/dlgname.hrc
D cui/source/dialogs/dlgname.src
M cui/source/factory/dlgfact.cxx
M cui/source/inc/cuires.hrc
M cui/source/inc/dlgname.hxx
M cui/source/tabpages/tpbitmap.cxx
M cui/source/tabpages/tpcolor.cxx
M cui/source/tabpages/tpgradnt.cxx
M cui/source/tabpages/tphatch.cxx
M cui/source/tabpages/tplnedef.cxx
A cui/uiconfig/ui/namedialog.ui
14 files changed, 588 insertions(+), 415 deletions(-)
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 967d702..92231f6 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -58,7 +58,6 @@
cui/source/dialogs/commonlingui.src \
cui/source/dialogs/cuiimapdlg.src \
cui/source/dialogs/cuires.src \
- cui/source/dialogs/dlgname.src \
cui/source/dialogs/fmsearch.src \
cui/source/dialogs/gallery.src \
cui/source/dialogs/grfflt.src \
diff --git a/cui/UI_cui.mk b/cui/UI_cui.mk
index e67ffac..c260e11 100644
--- a/cui/UI_cui.mk
+++ b/cui/UI_cui.mk
@@ -20,6 +20,7 @@
cui/uiconfig/ui/insertplugin \
cui/uiconfig/ui/insertrowcolumn \
cui/uiconfig/ui/macroselectordialog \
+ cui/uiconfig/ui/namedialog \
cui/uiconfig/ui/numberingformatpage \
cui/uiconfig/ui/numberingoptionspage \
cui/uiconfig/ui/numberingpositionpage \
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index 66b465c..a3af8bd 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -24,7 +24,6 @@
#include "dlgname.hxx"
#include "defdlgname.hxx"
-#include "dlgname.hrc"
#include <dialmgr.hxx>
#define MAX_DESCRIPTION_LINES ((long)5)
@@ -36,40 +35,37 @@
\************************************************************************/
SvxNameDialog::SvxNameDialog( Window* pWindow, const String& rName, const String& rDesc ) :
- ModalDialog ( pWindow, CUI_RES( RID_SVXDLG_NAME ) ),
- aFtDescription ( this, CUI_RES( FT_DESCRIPTION ) ),
- aEdtName ( this, CUI_RES( EDT_STRING ) ),
- aBtnOK ( this, CUI_RES( BTN_OK ) ),
- aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ),
- aBtnHelp ( this, CUI_RES( BTN_HELP ) )
+ ModalDialog ( pWindow, "NameDialog", "cui/ui/namedialog.ui" )
{
- FreeResource();
+ get(pBtnOK, "ok");
+ get(pFtDescription, "description_label");
+ get(pEdtName, "name_entry");
- aFtDescription.SetText( rDesc );
- aEdtName.SetText( rName );
- aEdtName.SetSelection(Selection(SELECTION_MIN, SELECTION_MAX));
- ModifyHdl(&aEdtName);
- aEdtName.SetModifyHdl(LINK(this, SvxNameDialog, ModifyHdl));
+ pFtDescription->SetText( rDesc );
+ pEdtName->SetText( rName );
+ pEdtName->SetSelection(Selection(SELECTION_MIN, SELECTION_MAX));
+ ModifyHdl(&pEdtName);
+ pEdtName->SetModifyHdl(LINK(this, SvxNameDialog, ModifyHdl));
// dynamic height of the description field
- Size aSize = aFtDescription.GetSizePixel();
- long nTxtWidth = aFtDescription.GetCtrlTextWidth( rDesc );
+ Size aSize = pFtDescription->GetSizePixel();
+ long nTxtWidth = pFtDescription->GetCtrlTextWidth( rDesc );
if ( nTxtWidth > aSize.Width() )
{
- long nLines = Min( ( nTxtWidth / aSize.Width() + 1 ), MAX_DESCRIPTION_LINES );
+ long nLines = Min( ( nTxtWidth / (aSize.Width()+1) + 1 ), MAX_DESCRIPTION_LINES );
long nHeight = aSize.Height();
aSize.Height() = nHeight * nLines;
- aFtDescription.SetSizePixel( aSize );
- Point aPnt = aEdtName.GetPosPixel();
+ pFtDescription->SetSizePixel( aSize );
+ Point aPnt = pEdtName->GetPosPixel();
aPnt.Y() += ( aSize.Height() - nHeight );
- aEdtName.SetPosPixel( aPnt );
+ pEdtName->SetPosPixel( aPnt );
}
}
IMPL_LINK_NOARG(SvxNameDialog, ModifyHdl)
{
if(aCheckNameHdl.IsSet())
- aBtnOK.Enable(aCheckNameHdl.Call(this) > 0);
+ pBtnOK->Enable(aCheckNameHdl.Call(this) > 0);
return 0;
}
@@ -80,31 +76,25 @@
SvxObjectNameDialog::SvxObjectNameDialog(
Window* pWindow,
- const String& rName)
-: ModalDialog(pWindow, CUI_RES(RID_SVXDLG_OBJECT_NAME)),
- aFtName(this, CUI_RES(NTD_FT_NAME)),
- aEdtName(this, CUI_RES(NTD_EDT_NAME)),
- aFlSeparator(this, CUI_RES(FL_SEPARATOR_A)),
- aBtnHelp(this, CUI_RES(BTN_HELP)),
- aBtnOK(this, CUI_RES(BTN_OK)),
- aBtnCancel(this, CUI_RES(BTN_CANCEL))
+ const String& rName) :
+ ModalDialog ( pWindow, "ObjectNameDialog", "cui/ui/namedialog.ui" )
{
- FreeResource();
-
+ get(pBtnOK, "object_name_ok");
+ get(pEdtName, "object_name_entry");
// set name
- aEdtName.SetText(rName);
+ pEdtName->SetText(rName);
// activate name
- aEdtName.SetSelection(Selection(SELECTION_MIN, SELECTION_MAX));
- ModifyHdl(&aEdtName);
- aEdtName.SetModifyHdl(LINK(this, SvxObjectNameDialog, ModifyHdl));
+ pEdtName->SetSelection(Selection(SELECTION_MIN, SELECTION_MAX));
+ ModifyHdl(&pEdtName);
+ pEdtName->SetModifyHdl(LINK(this, SvxObjectNameDialog, ModifyHdl));
}
IMPL_LINK_NOARG(SvxObjectNameDialog, ModifyHdl)
{
if(aCheckNameHdl.IsSet())
{
- aBtnOK.Enable(aCheckNameHdl.Call(this) > 0);
+ pBtnOK->Enable(aCheckNameHdl.Call(this) > 0);
}
return 0;
@@ -117,25 +107,17 @@
SvxObjectTitleDescDialog::SvxObjectTitleDescDialog(
Window* pWindow,
const String& rTitle,
- const String& rDescription)
-: ModalDialog(pWindow, CUI_RES(RID_SVXDLG_OBJECT_TITLE_DESC)),
- aFtTitle(this, CUI_RES(NTD_FT_TITLE)),
- aEdtTitle(this, CUI_RES(NTD_EDT_TITLE)),
- aFtDescription(this, CUI_RES(NTD_FT_DESC)),
- aEdtDescription(this, CUI_RES(NTD_EDT_DESC)),
- aFlSeparator(this, CUI_RES(FL_SEPARATOR_B)),
- aBtnHelp(this, CUI_RES(BTN_HELP)),
- aBtnOK(this, CUI_RES(BTN_OK)),
- aBtnCancel(this, CUI_RES(BTN_CANCEL))
+ const String& rDescription) :
+ ModalDialog ( pWindow, "ObjectTitleDescDialog", "cui/ui/namedialog.ui" )
{
- FreeResource();
-
+ get(pEdtTitle, "object_title_entry");
+ get(pEdtDescription, "desc_entry");
// set title & desc
- aEdtTitle.SetText(rTitle);
- aEdtDescription.SetText(rDescription);
+ pEdtTitle->SetText(rTitle);
+ pEdtDescription->SetText(rDescription);
// activate title
- aEdtTitle.SetSelection(Selection(SELECTION_MIN, SELECTION_MAX));
+ pEdtTitle->SetSelection(Selection(SELECTION_MIN, SELECTION_MAX));
}
///////////////////////////////////////////////////////////////////////////////////////////////
@@ -147,30 +129,27 @@
\************************************************************************/
SvxMessDialog::SvxMessDialog( Window* pWindow, const String& rText, const String& rDesc, Image* pImg ) :
- ModalDialog ( pWindow, CUI_RES( RID_SVXDLG_MESSBOX ) ),
- aFtDescription ( this, CUI_RES( FT_DESCRIPTION ) ),
- aBtn1 ( this, CUI_RES( BTN_1 ) ),
- aBtn2 ( this, CUI_RES( BTN_2 ) ),
- aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ),
- aFtImage ( this )
+ ModalDialog ( pWindow, "MessBox", "cui/ui/namedialog.ui" )
{
- FreeResource();
-
+ get(pBtn1, "mess_box_btn1");
+ get(pBtn2, "mess_box_btn2");
+ get(pFtDescription, "mess_box_description");
+ get(pFtImage, "mess_box_image");
if( pImg )
{
pImage = new Image( *pImg );
- aFtImage.SetImage( *pImage );
- aFtImage.SetStyle( ( aFtImage.GetStyle()/* | WB_NOTABSTOP */) & ~WB_3DLOOK );
- aFtImage.SetPosSizePixel( LogicToPixel( Point( 3, 6 ), MAP_APPFONT ),
- aFtImage.GetImage().GetSizePixel() );
- aFtImage.Show();
+ pFtImage->SetImage( *pImage );
+ pFtImage->SetStyle( ( pFtImage->GetStyle()/* | WB_NOTABSTOP */) & ~WB_3DLOOK );
+ pFtImage->SetPosSizePixel( LogicToPixel( Point( 3, 6 ), MAP_APPFONT ),
+ pFtImage->GetImage().GetSizePixel() );
+ pFtImage->Show();
}
SetText( rText );
- aFtDescription.SetText( rDesc );
+ pFtDescription->SetText( rDesc );
- aBtn1.SetClickHdl( LINK( this, SvxMessDialog, Button1Hdl ) );
- aBtn2.SetClickHdl( LINK( this, SvxMessDialog, Button2Hdl ) );
+ pBtn1->SetClickHdl( LINK( this, SvxMessDialog, Button1Hdl ) );
+ pBtn2->SetClickHdl( LINK( this, SvxMessDialog, Button2Hdl ) );
}
SvxMessDialog::~SvxMessDialog()
@@ -204,15 +183,15 @@
switch ( nBtnId )
{
case MESS_BTN_1:
- aBtn1.SetText( rNewTxt );
+ pBtn1->SetText( rNewTxt );
break;
case MESS_BTN_2:
- aBtn2.SetText( rNewTxt );
+ pBtn2->SetText( rNewTxt );
break;
default:
- OSL_FAIL( "Falsche Button-Nummer!!!" );
+ OSL_FAIL( "Invalid button number!!!" );
}
}
diff --git a/cui/source/dialogs/dlgname.hrc b/cui/source/dialogs/dlgname.hrc
deleted file mode 100644
index f034cd6..0000000
--- a/cui/source/dialogs/dlgname.hrc
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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 .
- */
-
-#define EDT_STRING 1
-#define BTN_OK 1
-#define BTN_CANCEL 1
-#define BTN_HELP 1
-#define FT_DESCRIPTION 1
-#define BTN_1 1
-#define BTN_2 2
-
-// #i68101#
-#define NTD_FT_NAME 2
-#define NTD_EDT_NAME 2
-#define NTD_FT_TITLE 3
-#define NTD_EDT_TITLE 3
-#define NTD_FT_DESC 4
-#define NTD_EDT_DESC 4
-#define FL_SEPARATOR_A 1
-#define FL_SEPARATOR_B 2
-
diff --git a/cui/source/dialogs/dlgname.src b/cui/source/dialogs/dlgname.src
deleted file mode 100644
index 14c464c..0000000
--- a/cui/source/dialogs/dlgname.src
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * 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 <cuires.hrc>
-#include "helpid.hrc"
-#include "dlgname.hrc"
-
-// RID_SVXDLG_NAME ----------------------------------------------------------
-
-ModalDialog RID_SVXDLG_NAME
-{
- HelpId = HID_DLG_NAME ;
- OutputSize = TRUE ;
- SvLook = TRUE ;
- Size = MAP_APPFONT ( 180 , 63 ) ;
- Text [ en-US ] = "Name" ;
- Moveable = TRUE ;
- FixedText FT_DESCRIPTION
- {
- Pos = MAP_APPFONT ( 6 , 6 ) ;
- Size = MAP_APPFONT ( 112 , 8 ) ;
- WordBreak = TRUE ;
- };
- Edit EDT_STRING
- {
- HelpID = "cui:Edit:RID_SVXDLG_NAME:EDT_STRING";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 6 , 17 ) ;
- Size = MAP_APPFONT ( 112 , 12 ) ;
- TabStop = TRUE ;
- };
- OKButton BTN_OK
- {
- Pos = MAP_APPFONT ( 124 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- DefButton = TRUE ;
- };
- CancelButton BTN_CANCEL
- {
- Pos = MAP_APPFONT ( 124 , 23 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- HelpButton BTN_HELP
- {
- Pos = MAP_APPFONT ( 124 , 43 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
-};
-
-// #i68101#
-// RID_SVXDLG_OBJECT_NAME ----------------------------------------------------------
-
-ModalDialog RID_SVXDLG_OBJECT_NAME
-{
- HelpId = HID_DLG_OBJECT_NAME;
- OutputSize = TRUE ;
- SvLook = TRUE ;
- Size = MAP_APPFONT ( 180 , 54 + 2) ;
- Text [ en-US ] = "Name" ;
- Moveable = TRUE ;
-
- // name
- FixedText NTD_FT_NAME
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 168 , 8 ) ;
- Text [ en-US ] = "~Name";
- };
- Edit NTD_EDT_NAME
- {
- HelpID = "cui:Edit:RID_SVXDLG_OBJECT_NAME:NTD_EDT_NAME";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 6 , 14 ) ;
- Size = MAP_APPFONT ( 168 , 12 ) ;
- TabStop = TRUE ;
- };
-
- // divider
- FixedLine FL_SEPARATOR_A
- {
- Pos = MAP_APPFONT ( 0 , 39 - 6 - 2 ) ;
- Size = MAP_APPFONT ( 180 , 8 ) ;
- };
-
- // Buttons
- HelpButton BTN_HELP
- {
- Pos = MAP_APPFONT ( 6, 39 - 3 + 3) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- OKButton BTN_OK
- {
- Pos = MAP_APPFONT ( 174 - (50 + 50 + 6), 39 - 3 + 3) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- DefButton = TRUE ;
- };
- CancelButton BTN_CANCEL
- {
- Pos = MAP_APPFONT ( 174 - (50), 39 - 3 + 3) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
-};
-
-// #i68101#
-// RID_SVXDLG_OBJECTTITLE_DESC ----------------------------------------------------------
-
-ModalDialog RID_SVXDLG_OBJECT_TITLE_DESC
-{
- HelpId = HID_DLG_OBJECT_TITLE_DESC;
- OutputSize = TRUE ;
- SvLook = TRUE ;
- Size = MAP_APPFONT ( 180 , 78 + 27 ) ;
- Text [ en-US ] = "Description" ;
- Moveable = TRUE ;
-
- // title
- FixedText NTD_FT_TITLE
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 168 , 8 ) ;
- WordBreak = TRUE ;
- Text [ en-US ] = "~Title";
- };
- Edit NTD_EDT_TITLE
- {
- HelpID = "cui:Edit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_TITLE";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 6 , 14 ) ;
- Size = MAP_APPFONT ( 168 , 12 ) ;
- TabStop = TRUE ;
- };
-
- // description
- FixedText NTD_FT_DESC
- {
- Pos = MAP_APPFONT ( 6 , 30 ) ;
- Size = MAP_APPFONT ( 168 , 8 ) ;
- WordBreak = TRUE ;
- Text [ en-US ] = "~Description";
- };
- MultiLineEdit NTD_EDT_DESC
- {
- HelpID = "cui:MultiLineEdit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_DESC";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 6 , 41 ) ;
- Size = MAP_APPFONT ( 168 , (12 * 3) - 2 ) ;
- TabStop = TRUE ;
- IgnoreTab = TRUE;
- VScroll = TRUE;
- };
-
- // divider
- FixedLine FL_SEPARATOR_B
- {
- Pos = MAP_APPFONT ( 0 , 41 + 39 ) ;
- Size = MAP_APPFONT ( 180 , 8 ) ;
- };
-
- // Buttons
- HelpButton BTN_HELP
- {
- Pos = MAP_APPFONT ( 6, 41 + 39 + 3 + 5) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- OKButton BTN_OK
- {
- Pos = MAP_APPFONT ( 174 - (50 + 50 + 6), 41 + 39 + 3 + 5) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- DefButton = TRUE ;
- };
- CancelButton BTN_CANCEL
- {
- Pos = MAP_APPFONT ( 174 - (50), 41 + 39 + 3 + 5) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
-};
-
-// RID_SVXDLG_MESSBOX -------------------------------------------------------
-
-ModalDialog RID_SVXDLG_MESSBOX
-{
- HelpId = HID_DLG_MESSBOX ;
- OutputSize = TRUE ;
- SvLook = TRUE ;
- Size = MAP_APPFONT ( 212 , 64 ) ;
- Text = "" ;
- Moveable = TRUE ;
- PushButton BTN_1
- {
- HelpID = "cui:PushButton:RID_SVXDLG_MESSBOX:BTN_1";
- Pos = MAP_APPFONT ( 25 , 44 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- PushButton BTN_2
- {
- HelpID = "cui:PushButton:RID_SVXDLG_MESSBOX:BTN_2";
- Pos = MAP_APPFONT ( 78 , 44 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- CancelButton BTN_CANCEL
- {
- Pos = MAP_APPFONT ( 131 , 44 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- FixedText FT_DESCRIPTION
- {
- Pos = MAP_APPFONT ( 28 , 6 ) ;
- Size = MAP_APPFONT ( 200 , 35 ) ;
- WordBreak = TRUE ;
- };
-};
- // ********************************************************************** EOF
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 4ada5e3..26532ef 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1475,22 +1475,11 @@
return new AbstractSvxObjectTitleDescDialog_Impl(new SvxObjectTitleDescDialog(pParent, rTitle, rDescription));
}
-AbstractSvxMessDialog * AbstractDialogFactory_Impl::CreateSvxMessDialog( Window* pParent, sal_uInt32 nResId,
+AbstractSvxMessDialog * AbstractDialogFactory_Impl::CreateSvxMessDialog( Window* pParent, sal_uInt32,
const String& rText, const String& rDesc, Image* pImg )
{
- SvxMessDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXDLG_MESSBOX :
- pDlg = new SvxMessDialog( pParent, rText, rDesc, pImg );
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractSvxMessDialog_Impl( pDlg );
- return 0;
+ SvxMessDialog* pDlg = new SvxMessDialog( pParent, rText, rDesc, pImg );
+ return new AbstractSvxMessDialog_Impl( pDlg );
}
AbstractSvxMultiPathDialog * AbstractDialogFactory_Impl::CreateSvxMultiPathDialog( Window* pParent, sal_Bool bEmptyAllowed )
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 8b3ce61..d8d9ef0 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -245,12 +245,6 @@
#define RID_SVX_IMAPDLG_START (RID_SVX_START + 100)
#define RID_SVXDLG_IMAPURL (RID_SVX_IMAPDLG_START + 2)
-// name dialog
-#define RID_SVXDLG_NAME (RID_SVX_START + 62)
-#define RID_SVXDLG_MESSBOX (RID_SVX_START + 63)
-#define RID_SVXDLG_OBJECT_NAME (RID_SVX_START + 64)
-#define RID_SVXDLG_OBJECT_TITLE_DESC (RID_SVX_START + 67)
-
// hangulhanja
#define RID_SVX_MDLG_HANGULHANJA (RID_SVX_START + 1 )
#define RID_SVX_MDLG_HANGULHANJA_OPT ( RID_SVX_START + 4 )
diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx
index de64052..99c89db 100644
--- a/cui/source/inc/dlgname.hxx
+++ b/cui/source/inc/dlgname.hxx
@@ -32,11 +32,9 @@
class SvxNameDialog : public ModalDialog
{
private:
- FixedText aFtDescription;
- Edit aEdtName;
- OKButton aBtnOK;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
+ FixedText* pFtDescription;
+ Edit* pEdtName;
+ OKButton* pBtnOK;
Link aCheckNameHdl;
@@ -45,7 +43,7 @@
public:
SvxNameDialog( Window* pWindow, const String& rName, const String& rDesc );
- void GetName( String& rName ){rName = aEdtName.GetText();}
+ void GetName( String& rName ){rName = pEdtName->GetText();}
/** add a callback Link that is called whenever the content of the edit
field is changed. The Link result determines whether the OK
@@ -66,29 +64,23 @@
{
aCheckNameHdl = rLink;
if ( bCheckImmediately )
- aBtnOK.Enable( rLink.Call( this ) > 0 );
+ pBtnOK->Enable( rLink.Call( this ) > 0 );
}
- void SetEditHelpId( const rtl::OString& aHelpId) {aEdtName.SetHelpId(aHelpId);}
+ void SetEditHelpId( const rtl::OString& aHelpId) {pEdtName->SetHelpId(aHelpId);}
};
/** #i68101#
- Dialog for editing Object Title and Description
+ Dialog for editing Object name
plus uniqueness-callback-linkHandler */
class SvxObjectNameDialog : public ModalDialog
{
private:
// name
- FixedText aFtName;
- Edit aEdtName;
-
- // separator
- FixedLine aFlSeparator;
+ Edit* pEdtName;
// buttons
- HelpButton aBtnHelp;
- OKButton aBtnOK;
- CancelButton aBtnCancel;
+ OKButton* pBtnOK;
// callback link for name uniqueness
Link aCheckNameHdl;
@@ -100,7 +92,7 @@
SvxObjectNameDialog(Window* pWindow, const String& rName);
// data access
- void GetName(String& rName) {rName = aEdtName.GetText(); }
+ void GetName(String& rName) {rName = pEdtName->GetText(); }
// set handler
void SetCheckNameHdl(const Link& rLink, bool bCheckImmediately = false)
@@ -109,7 +101,7 @@
if(bCheckImmediately)
{
- aBtnOK.Enable(rLink.Call(this) > 0);
+ pBtnOK->Enable(rLink.Call(this) > 0);
}
}
};
@@ -120,39 +112,31 @@
{
private:
// title
- FixedText aFtTitle;
- Edit aEdtTitle;
+ Edit* pEdtTitle;
// description
- FixedText aFtDescription;
- MultiLineEdit aEdtDescription;
-
- // separator
- FixedLine aFlSeparator;
+ MultiLineEdit* pEdtDescription;
// buttons
- HelpButton aBtnHelp;
- OKButton aBtnOK;
- CancelButton aBtnCancel;
+ OKButton* pBtnOK;
public:
// constructor
SvxObjectTitleDescDialog(Window* pWindow, const String& rTitle, const String& rDesc);
// data access
- void GetTitle(String& rTitle) {rTitle = aEdtTitle.GetText(); }
- void GetDescription(String& rDescription) {rDescription = aEdtDescription.GetText(); }
+ void GetTitle(String& rTitle) {rTitle = pEdtTitle->GetText(); }
+ void GetDescription(String& rDescription) {rDescription = pEdtDescription->GetText(); }
};
/// Dialog to cancel, save, or add
class SvxMessDialog : public ModalDialog
{
private:
- FixedText aFtDescription;
- PushButton aBtn1;
- PushButton aBtn2;
- CancelButton aBtnCancel;
- FixedImage aFtImage;
+ FixedText* pFtDescription;
+ PushButton* pBtn1;
+ PushButton* pBtn2;
+ FixedImage* pFtImage;
Image* pImage;
DECL_LINK(Button1Hdl, void *);
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 0510868..713adee 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -43,6 +43,7 @@
#include "cuitabarea.hxx"
#include "tabarea.hrc"
#include "defdlgname.hxx"
+#include "dlgname.hxx"
#include <svx/svxdlg.hxx>
#include <dialmgr.hxx>
#include "sfx2/opengrf.hxx"
@@ -512,9 +513,7 @@
{
ResMgr& rMgr = CUI_MGR();
Image aWarningBoxImage = WarningBox::GetStandardImage();
- SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");
- AbstractSvxMessDialog* aMessDlg = pFact->CreateSvxMessDialog( GetParentDialog(), RID_SVXDLG_MESSBOX,
+ SvxMessDialog* aMessDlg = new SvxMessDialog(GetParentDialog(),
String( SVX_RES( RID_SVXSTR_BITMAP ) ),
String( CUI_RES( RID_SVXSTR_ASK_CHANGE_BITMAP ) ),
&aWarningBoxImage );
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 25c394f..0cc1d1c 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -43,6 +43,7 @@
#include "cuitabarea.hxx"
#include "tabarea.hrc"
#include "defdlgname.hxx"
+#include "dlgname.hxx"
#include <svx/svxdlg.hxx>
#include <dialmgr.hxx>
#include <cuitabline.hxx>
@@ -525,8 +526,7 @@
{
ResMgr& rMgr = CUI_MGR();
Image aWarningBoxImage = WarningBox::GetStandardImage();
- SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- AbstractSvxMessDialog* aMessDlg = pFact->CreateSvxMessDialog( GetParentDialog(), RID_SVXDLG_MESSBOX,
+ SvxMessDialog* aMessDlg = new SvxMessDialog(GetParentDialog(),
SVX_RESSTR( RID_SVXSTR_COLOR ),
String( ResId( RID_SVXSTR_ASK_CHANGE_COLOR, rMgr ) ),
&aWarningBoxImage );
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index c8fcb05..8aa86a4 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -37,6 +37,7 @@
#include "cuitabarea.hxx"
#include "tabarea.hrc"
#include "defdlgname.hxx"
+#include "dlgname.hxx"
#include <svx/svxdlg.hxx>
#include <dialmgr.hxx>
#include <svx/dialmgr.hxx>
@@ -260,9 +261,7 @@
{
ResMgr& rMgr = CUI_MGR();
Image aWarningBoxImage = WarningBox::GetStandardImage();
- SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");
- AbstractSvxMessDialog* aMessDlg = pFact->CreateSvxMessDialog( GetParentDialog(), RID_SVXDLG_MESSBOX,
+ SvxMessDialog* aMessDlg = new SvxMessDialog(GetParentDialog(),
SVX_RESSTR( RID_SVXSTR_GRADIENT ),
CUI_RESSTR( RID_SVXSTR_ASK_CHANGE_GRADIENT ),
&aWarningBoxImage );
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 07d7267..ba211f3 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -37,6 +37,7 @@
#include "svx/drawitem.hxx"
#include "cuitabarea.hxx"
#include "defdlgname.hxx"
+#include "dlgname.hxx"
#include <svx/svxdlg.hxx>
#include <dialmgr.hxx>
#include "svx/dlgutil.hxx"
@@ -238,9 +239,7 @@
{
ResMgr& rMgr = CUI_MGR();
Image aWarningBoxImage = WarningBox::GetStandardImage();
- SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");
- AbstractSvxMessDialog* aMessDlg = pFact->CreateSvxMessDialog( GetParentDialog(), RID_SVXDLG_MESSBOX,
+ SvxMessDialog* aMessDlg = new SvxMessDialog(GetParentDialog(),
SVX_RESSTR( RID_SVXSTR_HATCH ),
CUI_RESSTR( RID_SVXSTR_ASK_CHANGE_HATCH ),
&aWarningBoxImage );
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 4718ec5..d707364 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -38,6 +38,7 @@
#include "svx/drawitem.hxx"
#include "cuitabline.hxx"
+#include "dlgname.hxx"
#include "defdlgname.hxx"
#include <svx/svxdlg.hxx>
#include <dialmgr.hxx>
@@ -232,9 +233,7 @@
{
ResMgr& rMgr = CUI_MGR();
Image aWarningBoxImage = WarningBox::GetStandardImage();
- SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "Dialogdiet fail!");
- AbstractSvxMessDialog* aMessDlg = pFact->CreateSvxMessDialog( GetParentDialog(), RID_SVXDLG_MESSBOX,
+ SvxMessDialog* aMessDlg = new SvxMessDialog(GetParentDialog(),
SVX_RESSTR( RID_SVXSTR_LINESTYLE ),
String( ResId( RID_SVXSTR_ASK_CHANGE_LINESTYLE, rMgr ) ),
&aWarningBoxImage );
diff --git a/cui/uiconfig/ui/namedialog.ui b/cui/uiconfig/ui/namedialog.ui
new file mode 100644
index 0000000..d0a7d83
--- /dev/null
+++ b/cui/uiconfig/ui/namedialog.ui
@@ -0,0 +1,506 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="MessBox">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox6">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area6">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="mess_box_btn1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">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="mess_box_btn2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">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="mess_box_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">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="GtkBox" id="box4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkImage" id="mess_box_image">
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="stock">gtk-missing-image</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="mess_box_description">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">mess_box_btn1</action-widget>
+ <action-widget response="0">mess_box_btn2</action-widget>
+ <action-widget response="0">mess_box_cancel</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="NameDialog">
+ <property name="width_request">475</property>
+ <property name="height_request">120</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Name</property>
+ <property name="resizable">False</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="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="height_request">120</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="layout_style">end</property>
+ <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>
+ <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>
+ <property name="secondary">True</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>
+ <property name="secondary">True</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="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="description_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="wrap">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="name_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">help</action-widget>
+ <action-widget response="-3">ok</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="ObjectNameDialog">
+ <property name="width_request">475</property>
+ <property name="height_request">120</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Name</property>
+ <property name="resizable">False</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox3">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area3">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="object_name_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">0</property>
+ <property name="secondary">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="object_name_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">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="object_name_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">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="GtkBox" id="box2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="object_name_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Name</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">name_entry</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="object_name_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </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">object_name_help</action-widget>
+ <action-widget response="-3">object_name_ok</action-widget>
+ <action-widget response="0">object_name_cancel</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkDialog" id="ObjectTitleDescDialog">
+ <property name="width_request">475</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Description</property>
+ <property name="resizable">False</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox5">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area5">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="object_title_desc_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">0</property>
+ <property name="secondary">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="object_title_desc_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">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="object_title_desc_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">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="GtkBox" id="box3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="object_title_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Title</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">object_title_entry</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="object_title_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="desc_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Description</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">desc_entry</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTextView" id="desc_entry">
+ <property name="height_request">88</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="vadjustment">adjustment1</property>
+ <property name="wrap_mode">word</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">object_title_desc_help</action-widget>
+ <action-widget response="-3">object_title_desc_ok</action-widget>
+ <action-widget response="0">object_title_desc_cancel</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkAdjustment" id="adjustment2">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+</interface>
--
To view, visit https://gerrit.libreoffice.org/1857
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad23998c9ccde22abad9d894af3dd6df7c92564f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Roth Robert <robert.roth.off at gmail.com>
More information about the LibreOffice
mailing list