Skip to content

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

convert macro dialog to .ui format 

Change-Id: I5c832f3eaa6aefe2d652173289ef306e8743d4e0
üst daccedee
Hide whitespace changes
Inline Side-by-side
Showing with 353 additions and 313 deletions
cui/UI_cui.mk
Dosyayı görüntüle @ 3f7f957e
......@@ -17,6 +17,7 @@ $(eval $(call gb_UI_add_uifiles,cui,\
cui/uiconfig/ui/insertoleobject \
cui/uiconfig/ui/insertplugin \
cui/uiconfig/ui/insertrowcolumn \
cui/uiconfig/ui/scriptorganizer \
cui/uiconfig/ui/macroselectordialog \
cui/uiconfig/ui/positionpage \
cui/uiconfig/ui/specialcharacters \
......
cui/source/customize/acccfg.hrc
Dosyayı görüntüle @ 3f7f957e
......@@ -36,12 +36,6 @@
#define STR_LOADACCELCONFIG 46
#define STR_SAVEACCELCONFIG 47
#define IMG_HARDDISK 48
#define STR_PRODMACROS 50
#define STR_MYMACROS 51
#define IMG_LIB 52
#define IMG_MACRO 54
#define IMG_DOC 56
#define STR_GROUP_STYLES 58
#define STR_PDF_EXPORT_SEND 59
#define IMG_INFO 61
......@@ -49,6 +43,5 @@
#define BMP_COLLAPSED 63
#define BMP_EXPANDED 64
#define STR_BASICMACROS 67
#define STR_DLG_MACROS 68
#define STR_HUMAN_APPNAME 69
#define STR_FILTERNAME_CFG 70
cui/source/customize/acccfg.src
Dosyayı görüntüle @ 3f7f957e
......@@ -198,22 +198,10 @@ TabPage RID_SVXPAGE_KEYBOARD
Resource RID_SVXPAGE_CONFIGGROUPBOX
{
String STR_MYMACROS
{
Text [ en-US ] = "My Macros";
};
String STR_PRODMACROS
{
Text [ en-US ] = "%PRODUCTNAME Macros";
};
String STR_BASICMACROS
{
Text [ en-US ] = "BASIC Macros" ;
};
String STR_DLG_MACROS
{
Text [ en-US ] = "%PRODUCTNAME Macros" ;
};
String STR_HUMAN_APPNAME
{
TEXT = "%PRODUCTNAME" ;
......@@ -222,26 +210,6 @@ Resource RID_SVXPAGE_CONFIGGROUPBOX
{
Text [ en-US ] = "Styles" ;
};
Image IMG_HARDDISK
{
ImageBitmap = Bitmap { File = "harddisk_16.bmp" ; };
MASKCOLOR
};
Image IMG_LIB
{
ImageBitmap = Bitmap { File = "im30820.png"; };
MASKCOLOR
};
Image IMG_MACRO
{
ImageBitmap = Bitmap { File = "im30821.png"; };
MASKCOLOR
};
Image IMG_DOC
{
ImageBitmap = Bitmap { File = "im30826.png"; };
MASKCOLOR
};
Image BMP_COLLAPSED
{
ImageBitmap = Bitmap
......
cui/source/customize/cfgutil.cxx
Dosyayı görüntüle @ 3f7f957e
......@@ -387,16 +387,16 @@ struct SvxConfigGroupBoxResource_Impl : public Resource
SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() :
Resource(CUI_RES(RID_SVXPAGE_CONFIGGROUPBOX)),
m_hdImage(CUI_RES(IMG_HARDDISK)),
m_libImage(CUI_RES(IMG_LIB)),
m_macImage(CUI_RES(IMG_MACRO)),
m_docImage(CUI_RES(IMG_DOC)),
m_sMyMacros(String(CUI_RES(STR_MYMACROS))),
m_sProdMacros(String(CUI_RES(STR_PRODMACROS))),
m_sMacros(String(CUI_RES(STR_BASICMACROS))),
m_sDlgMacros(String(CUI_RES(STR_DLG_MACROS))),
m_aHumanAppName(String(CUI_RES(STR_HUMAN_APPNAME))),
m_aStrGroupStyles(String(CUI_RES(STR_GROUP_STYLES))),
m_hdImage(CUI_RES(RID_CUIIMG_HARDDISK)),
m_libImage(CUI_RES(RID_CUIIMG_LIB)),
m_macImage(CUI_RES(RID_CUIIMG_MACRO)),
m_docImage(CUI_RES(RID_CUIIMG_DOC)),
m_sMyMacros(CUI_RESSTR(RID_SVXSTR_MYMACROS)),
m_sProdMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS)),
m_sMacros(CUI_RESSTR(STR_BASICMACROS)),
m_sDlgMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS)),
m_aHumanAppName(CUI_RESSTR(STR_HUMAN_APPNAME)),
m_aStrGroupStyles(CUI_RESSTR(STR_GROUP_STYLES)),
m_collapsedImage(CUI_RES(BMP_COLLAPSED)),
m_expandedImage(CUI_RES(BMP_EXPANDED))
{
......
cui/source/dialogs/scriptdlg.cxx
Dosyayı görüntüle @ 3f7f957e
......@@ -71,16 +71,8 @@ void ShowErrorDialog( const Any& aException )
delete pDlg;
}
SFTreeListBox::SFTreeListBox( Window* pParent, const ResId& rResId ) :
SvTreeListBox( pParent, ResId( rResId.GetId(),*rResId.GetResMgr() ) ),
m_hdImage(ResId(IMG_HARDDISK,*rResId.GetResMgr())),
m_libImage(ResId(IMG_LIB,*rResId.GetResMgr())),
m_macImage(ResId(IMG_MACRO,*rResId.GetResMgr())),
m_docImage(ResId(IMG_DOCUMENT,*rResId.GetResMgr())),
m_sMyMacros(String(ResId(STR_MYMACROS,*rResId.GetResMgr()))),
m_sProdMacros(String(ResId(STR_PRODMACROS,*rResId.GetResMgr())))
void SFTreeListBox::Init()
{
FreeResource();
SetSelectionMode( SINGLE_SELECTION );
SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL |
......@@ -91,6 +83,36 @@ SFTreeListBox::SFTreeListBox( Window* pParent, const ResId& rResId ) :
nMode = 0xFF; // everything
}
SFTreeListBox::SFTreeListBox(Window* pParent, const ResId& rResId)
: SvTreeListBox(pParent, ResId(rResId.GetId(),*rResId.GetResMgr()))
, m_hdImage(CUI_RES(RID_CUIIMG_HARDDISK))
, m_libImage(CUI_RES(RID_CUIIMG_LIB))
, m_macImage(CUI_RES(RID_CUIIMG_MACRO))
, m_docImage(CUI_RES(RID_CUIIMG_DOC))
, m_sMyMacros(CUI_RESSTR(RID_SVXSTR_MYMACROS))
, m_sProdMacros(CUI_RES(RID_SVXSTR_PRODMACROS))
{
FreeResource();
Init();
}
SFTreeListBox::SFTreeListBox(Window* pParent)
: SvTreeListBox(pParent)
, m_hdImage(CUI_RES(RID_CUIIMG_HARDDISK))
, m_libImage(CUI_RES(RID_CUIIMG_LIB))
, m_macImage(CUI_RES(RID_CUIIMG_MACRO))
, m_docImage(CUI_RES(RID_CUIIMG_DOC))
, m_sMyMacros(CUI_RESSTR(RID_SVXSTR_MYMACROS))
, m_sProdMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS))
{
Init();
}
extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSFTreeListBox(Window *pParent, VclBuilder::stringmap &)
{
return new SFTreeListBox(pParent);
}
SFTreeListBox::~SFTreeListBox()
{
deleteAllTree();
......@@ -235,7 +257,7 @@ void SFTreeListBox::Init( const ::rtl::OUString& language )
getLangNodeFromRootNode( children[ n ], lang );
SAL_WNODEPRECATED_DECLARATIONS_PUSH
insertEntry( uiName, app ? IMG_HARDDISK : IMG_DOCUMENT,
insertEntry( uiName, app ? RID_CUIIMG_HARDDISK : RID_CUIIMG_DOC,
0, true, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_SFROOT, langEntries, xDocumentModel )), factoryURL );
SAL_WNODEPRECATED_DECLARATIONS_POP
}
......@@ -324,7 +346,7 @@ void SFTreeListBox:: RequestSubEntries( SvTreeListEntry* pRootEntry, Reference<
if ( children[ n ]->getType() != browse::BrowseNodeTypes::SCRIPT)
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
insertEntry( name, IMG_LIB, pRootEntry, true, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_SCRIPTCONTAINER, children[ n ],model )));
insertEntry( name, RID_CUIIMG_LIB, pRootEntry, true, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_SCRIPTCONTAINER, children[ n ],model )));
SAL_WNODEPRECATED_DECLARATIONS_POP
}
else
......@@ -332,7 +354,7 @@ void SFTreeListBox:: RequestSubEntries( SvTreeListEntry* pRootEntry, Reference<
if ( children[ n ]->getType() == browse::BrowseNodeTypes::SCRIPT )
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
insertEntry( name, IMG_MACRO, pRootEntry, false, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_METHOD, children[ n ],model )));
insertEntry( name, RID_CUIIMG_MACRO, pRootEntry, false, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_METHOD, children[ n ],model )));
SAL_WNODEPRECATED_DECLARATIONS_POP
}
......@@ -355,7 +377,7 @@ SvTreeListEntry * SFTreeListBox::insertEntry(
bool bChildrenOnDemand, std::auto_ptr< SFEntry > aUserData, ::rtl::OUString factoryURL )
{
SvTreeListEntry * p;
if( nBitmap == IMG_DOCUMENT && !factoryURL.isEmpty() )
if( nBitmap == RID_CUIIMG_DOC && !factoryURL.isEmpty() )
{
Image aImage = SvFileInformationManager::GetFileImage( INetURLObject(factoryURL), false );
p = InsertEntry(
......@@ -376,19 +398,19 @@ SvTreeListEntry * SFTreeListBox::insertEntry(
bool bChildrenOnDemand, std::auto_ptr< SFEntry > aUserData )
{
Image aImage;
if( nBitmap == IMG_HARDDISK )
if( nBitmap == RID_CUIIMG_HARDDISK )
{
aImage = m_hdImage;
}
else if( nBitmap == IMG_LIB )
else if( nBitmap == RID_CUIIMG_LIB )
{
aImage = m_libImage;
}
else if( nBitmap == IMG_MACRO )
else if( nBitmap == RID_CUIIMG_MACRO )
{
aImage = m_macImage;
}
else if( nBitmap == IMG_DOCUMENT )
else if( nBitmap == RID_CUIIMG_DOC )
{
aImage = m_docImage;
}
......@@ -488,57 +510,53 @@ CuiInputDialog::~CuiInputDialog()
// ScriptOrgDialog ------------------------------------------------------------
// ----------------------------------------------------------------------------
SvxScriptOrgDialog::SvxScriptOrgDialog( Window* pParent, ::rtl::OUString language )
: SfxModalDialog( pParent, CUI_RES( RID_DLG_SCRIPTORGANIZER ) ),
aScriptsTxt( this, CUI_RES( SF_TXT_SCRIPTS ) ),
aScriptsBox( this, CUI_RES( SF_CTRL_SCRIPTSBOX ) ),
aRunButton( this, CUI_RES( SF_PB_RUN ) ),
aCloseButton( this, CUI_RES( SF_PB_CLOSE ) ),
aCreateButton( this, CUI_RES( SF_PB_CREATE ) ),
aEditButton( this, CUI_RES( SF_PB_EDIT ) ),
aRenameButton(this, CUI_RES( SF_PB_RENAME ) ),
aDelButton( this, CUI_RES( SF_PB_DEL ) ),
aHelpButton( this, CUI_RES( SF_PB_HELP ) ),
m_sLanguage( language ),
m_delErrStr( CUI_RES( RID_SVXSTR_DELFAILED ) ),
m_delErrTitleStr( CUI_RES( RID_SVXSTR_DELFAILED_TITLE ) ),
m_delQueryStr( CUI_RES( RID_SVXSTR_DELQUERY ) ),
m_delQueryTitleStr( CUI_RES( RID_SVXSTR_DELQUERY_TITLE ) ) ,
m_createErrStr( CUI_RES ( RID_SVXSTR_CREATEFAILED ) ),
m_createDupStr( CUI_RES ( RID_SVXSTR_CREATEFAILEDDUP ) ),
m_createErrTitleStr( CUI_RES( RID_SVXSTR_CREATEFAILED_TITLE ) ),
m_renameErrStr( CUI_RES ( RID_SVXSTR_RENAMEFAILED ) ),
m_renameErrTitleStr( CUI_RES( RID_SVXSTR_RENAMEFAILED_TITLE ) )
: SfxModalDialog(pParent, "ScriptOrganizerDialog", "cui/ui/scriptorganizer.ui")
, m_sLanguage(language)
, m_delErrStr(CUI_RESSTR(RID_SVXSTR_DELFAILED))
, m_delErrTitleStr(CUI_RESSTR(RID_SVXSTR_DELFAILED_TITLE))
, m_delQueryStr(CUI_RES(RID_SVXSTR_DELQUERY))
, m_delQueryTitleStr(CUI_RESSTR(RID_SVXSTR_DELQUERY_TITLE))
, m_createErrStr(CUI_RESSTR(RID_SVXSTR_CREATEFAILED))
, m_createDupStr(CUI_RESSTR(RID_SVXSTR_CREATEFAILEDDUP))
, m_createErrTitleStr(CUI_RESSTR(RID_SVXSTR_CREATEFAILED_TITLE))
, m_renameErrStr(CUI_RESSTR(RID_SVXSTR_RENAMEFAILED))
, m_renameErrTitleStr(CUI_RESSTR(RID_SVXSTR_RENAMEFAILED_TITLE))
{
get(m_pScriptsBox, "scripts");
get(m_pRunButton, "run");
get(m_pCloseButton, "close");
get(m_pCreateButton, "create");
get(m_pEditButton, "edit");
get(m_pRenameButton, "rename");
get(m_pDelButton, "delete");
// must be a neater way to deal with the strings than as above
// append the language to the dialog title
String winTitle( GetText() );
winTitle.SearchAndReplace( rtl::OUString( "%MACROLANG" ), m_sLanguage );
SetText( winTitle );
aScriptsBox.SetSelectHdl( LINK( this, SvxScriptOrgDialog, ScriptSelectHdl ) );
aRunButton.SetClickHdl( LINK( this, SvxScriptOrgDialog, ButtonHdl ) );
aCloseButton.SetClickHdl( LINK( this, SvxScriptOrgDialog, ButtonHdl ) );
aRenameButton.SetClickHdl( LINK( this, SvxScriptOrgDialog, ButtonHdl ) );
aEditButton.SetClickHdl( LINK( this, SvxScriptOrgDialog, ButtonHdl ) );
aDelButton.SetClickHdl( LINK( this, SvxScriptOrgDialog, ButtonHdl ) );
aCreateButton.SetClickHdl( LINK( this, SvxScriptOrgDialog, ButtonHdl ) );
aRunButton.Disable();
aRenameButton.Disable();
aEditButton.Disable();
aDelButton.Disable();
aCreateButton.Disable();
aScriptsBox.Init( m_sLanguage );
m_pScriptsBox->SetSelectHdl( LINK( this, SvxScriptOrgDialog, ScriptSelectHdl ) );
m_pRunButton->SetClickHdl( LINK( this, SvxScriptOrgDialog, ButtonHdl ) );
m_pCloseButton->SetClickHdl( LINK( this, SvxScriptOrgDialog, ButtonHdl ) );
m_pRenameButton->SetClickHdl( LINK( this, SvxScriptOrgDialog, ButtonHdl ) );
m_pEditButton->SetClickHdl( LINK( this, SvxScriptOrgDialog, ButtonHdl ) );
m_pDelButton->SetClickHdl( LINK( this, SvxScriptOrgDialog, ButtonHdl ) );
m_pCreateButton->SetClickHdl( LINK( this, SvxScriptOrgDialog, ButtonHdl ) );
m_pRunButton->Disable();
m_pRenameButton->Disable();
m_pEditButton->Disable();
m_pDelButton->Disable();
m_pCreateButton->Disable();
m_pScriptsBox->Init( m_sLanguage );
RestorePreviousSelection();
FreeResource();
}
SvxScriptOrgDialog::~SvxScriptOrgDialog()
{
// clear the SelectHdl so that it isn't called during the dtor
aScriptsBox.SetSelectHdl( Link() );
m_pScriptsBox->SetSelectHdl( Link() );
};
short SvxScriptOrgDialog::Execute()
......@@ -560,7 +578,7 @@ short SvxScriptOrgDialog::Execute()
pDoc = SfxObjectShell::GetNext(*pDoc);
}
aScriptsBox.ExpandAllTrees();
m_pScriptsBox->ExpandAllTrees();
Window* pPrevDlgParent = Application::GetDefDialogParent();
Application::SetDefDialogParent( this );
......@@ -575,20 +593,20 @@ void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode >& node )
{
if ( node->getType() == browse::BrowseNodeTypes::SCRIPT)
{
aRunButton.Enable();
m_pRunButton->Enable();
}
else
{
aRunButton.Disable();
m_pRunButton->Disable();
}
Reference< beans::XPropertySet > xProps( node, UNO_QUERY );
if ( !xProps.is() )
{
aEditButton.Disable();
aDelButton.Disable();
aCreateButton.Disable();
aRunButton.Disable();
m_pEditButton->Disable();
m_pDelButton->Disable();
m_pCreateButton->Disable();
m_pRunButton->Disable();
return;
}
......@@ -596,54 +614,54 @@ void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode >& node )
if ( getBoolProperty( xProps, sName ) )
{
aEditButton.Enable();
m_pEditButton->Enable();
}
else
{
aEditButton.Disable();
m_pEditButton->Disable();
}
sName = rtl::OUString("Deletable") ;
if ( getBoolProperty( xProps, sName ) )
{
aDelButton.Enable();
m_pDelButton->Enable();
}
else
{
aDelButton.Disable();
m_pDelButton->Disable();
}
sName = rtl::OUString("Creatable") ;
if ( getBoolProperty( xProps, sName ) )
{
aCreateButton.Enable();
m_pCreateButton->Enable();
}
else
{
aCreateButton.Disable();
m_pCreateButton->Disable();
}
sName = rtl::OUString("Renamable") ;
if ( getBoolProperty( xProps, sName ) )
{
aRenameButton.Enable();
m_pRenameButton->Enable();
}
else
{
aRenameButton.Disable();
m_pRenameButton->Disable();
}
}
else
{
// no node info available, disable all configurable actions
aDelButton.Disable();
aCreateButton.Disable();
aEditButton.Disable();
aRunButton.Disable();
aRenameButton.Disable();
m_pDelButton->Disable();
m_pCreateButton->Disable();
m_pEditButton->Disable();
m_pRunButton->Disable();
m_pRenameButton->Disable();
}
}
......@@ -675,21 +693,21 @@ IMPL_LINK( SvxScriptOrgDialog, ScriptSelectHdl, SvTreeListBox *, pBox )
IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton )
{
if ( pButton == &aCloseButton )
if ( pButton == m_pCloseButton )
{
StoreCurrentSelection();
EndDialog( 0 );
}
if ( pButton == &aEditButton ||
pButton == &aCreateButton ||
pButton == &aDelButton ||
pButton == &aRunButton ||
pButton == &aRenameButton )
if ( pButton == m_pEditButton ||
pButton == m_pCreateButton ||
pButton == m_pDelButton ||
pButton == m_pRunButton ||
pButton == m_pRenameButton )
{
if ( aScriptsBox.IsSelected( aScriptsBox.GetHdlEntry() ) )
if ( m_pScriptsBox->IsSelected( m_pScriptsBox->GetHdlEntry() ) )
{
SvTreeListEntry* pEntry = aScriptsBox.GetHdlEntry();
SvTreeListEntry* pEntry = m_pScriptsBox->GetHdlEntry();
SFEntry* userData = 0;
if ( !pEntry )
{
......@@ -709,7 +727,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton )
return 0;
}
if ( pButton == &aRunButton )
if ( pButton == m_pRunButton )
{
::rtl::OUString tmpString;
Reference< beans::XPropertySet > xProp( node, UNO_QUERY );
......@@ -735,12 +753,12 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton )
}
SvTreeListEntry* pParent = aScriptsBox.GetParent( pEntry );
SvTreeListEntry* pParent = m_pScriptsBox->GetParent( pEntry );
while ( pParent && !mspNode.is() )
{
SFEntry* mspUserData = (SFEntry*)pParent->GetUserData();
mspNode.set( mspUserData->GetNode() , UNO_QUERY );
pParent = aScriptsBox.GetParent( pParent );
pParent = m_pScriptsBox->GetParent( pParent );
}
xProp->getPropertyValue( rtl::OUString("URI" ) ) >>= tmpString;
const String scriptURL( tmpString );
......@@ -782,7 +800,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton )
StoreCurrentSelection();
EndDialog( 0 );
}
else if ( pButton == &aEditButton )
else if ( pButton == m_pEditButton )
{
Reference< script::XInvocation > xInv( node, UNO_QUERY );
if ( xInv.is() )
......@@ -804,15 +822,15 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton )
}
}
}
else if ( pButton == &aCreateButton )
else if ( pButton == m_pCreateButton )
{
createEntry( pEntry );
}
else if ( pButton == &aDelButton )
else if ( pButton == m_pDelButton )
{
deleteEntry( pEntry );
}
else if ( pButton == &aRenameButton )
else if ( pButton == m_pRenameButton )
{
renameEntry( pEntry );
}
......@@ -864,7 +882,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry )
::rtl::OUString aNewName;
::rtl::OUString aNewStdName;
sal_uInt16 nMode = INPUTMODE_NEWLIB;
if( aScriptsBox.GetModel()->GetDepth( pEntry ) == 0 )
if( m_pScriptsBox->GetModel()->GetDepth( pEntry ) == 0 )
{
aNewStdName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Library") ) ;
}
......@@ -967,7 +985,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry )
while ( !bValid );
// open up parent node (which ensures it's loaded)
aScriptsBox.RequestingChildren( pEntry );
m_pScriptsBox->RequestingChildren( pEntry );
Sequence< Any > args( 1 );
args[ 0 ] <<= aNewName;
......@@ -1006,16 +1024,16 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry )
if ( aChildNode->getType() == browse::BrowseNodeTypes::SCRIPT )
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
pNewEntry = aScriptsBox.insertEntry( aChildName,
IMG_MACRO, pEntry, false, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_METHOD, aChildNode,xDocumentModel ) ) );
pNewEntry = m_pScriptsBox->insertEntry( aChildName,
RID_CUIIMG_MACRO, pEntry, false, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_METHOD, aChildNode,xDocumentModel ) ) );
SAL_WNODEPRECATED_DECLARATIONS_POP
}
else
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
pNewEntry = aScriptsBox.insertEntry( aChildName,
IMG_LIB, pEntry, false, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_SCRIPTCONTAINER, aChildNode,xDocumentModel ) ) );
pNewEntry = m_pScriptsBox->insertEntry( aChildName,
RID_CUIIMG_LIB, pEntry, false, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_SCRIPTCONTAINER, aChildNode,xDocumentModel ) ) );
SAL_WNODEPRECATED_DECLARATIONS_POP
// If the Parent is not loaded then set to
......@@ -1028,8 +1046,8 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry )
userData->setLoaded();
}
}
aScriptsBox.SetCurEntry( pNewEntry );
aScriptsBox.Select( aScriptsBox.GetCurEntry() );
m_pScriptsBox->SetCurEntry( pNewEntry );
m_pScriptsBox->Select( m_pScriptsBox->GetCurEntry() );
}
else
......@@ -1105,9 +1123,9 @@ void SvxScriptOrgDialog::renameEntry( SvTreeListEntry* pEntry )
}
if ( aChildNode.is() )
{
aScriptsBox.SetEntryText( pEntry, aChildNode->getName() );
aScriptsBox.SetCurEntry( pEntry );
aScriptsBox.Select( aScriptsBox.GetCurEntry() );
m_pScriptsBox->SetEntryText( pEntry, aChildNode->getName() );
m_pScriptsBox->SetCurEntry( pEntry );
m_pScriptsBox->Select( m_pScriptsBox->GetCurEntry() );
}
else
......@@ -1155,8 +1173,8 @@ void SvxScriptOrgDialog::deleteEntry( SvTreeListEntry* pEntry )
if ( result == sal_True )
{
aScriptsBox.deleteTree( pEntry );
aScriptsBox.GetModel()->Remove( pEntry );
m_pScriptsBox->deleteTree( pEntry );
m_pScriptsBox->GetModel()->Remove( pEntry );
}
else
{
......@@ -1220,13 +1238,13 @@ Selection_hash SvxScriptOrgDialog::m_lastSelection;
void SvxScriptOrgDialog::StoreCurrentSelection()
{
String aDescription;
if ( aScriptsBox.IsSelected( aScriptsBox.GetHdlEntry() ) )
if ( m_pScriptsBox->IsSelected( m_pScriptsBox->GetHdlEntry() ) )
{
SvTreeListEntry* pEntry = aScriptsBox.GetHdlEntry();
SvTreeListEntry* pEntry = m_pScriptsBox->GetHdlEntry();
while( pEntry )
{
aDescription.Insert( aScriptsBox.GetEntryText( pEntry ), 0 );
pEntry = aScriptsBox.GetParent( pEntry );
aDescription.Insert( m_pScriptsBox->GetEntryText( pEntry ), 0 );
pEntry = m_pScriptsBox->GetParent( pEntry );
if ( pEntry )
aDescription.Insert( ';', 0 );
}
......@@ -1245,21 +1263,21 @@ void SvxScriptOrgDialog::RestorePreviousSelection()
while ( nIndex != STRING_NOTFOUND )
{
String aTmp( aStoredEntry.GetToken( 0, ';', nIndex ) );
SvTreeListEntry* pTmpEntry = aScriptsBox.FirstChild( pEntry );
SvTreeListEntry* pTmpEntry = m_pScriptsBox->FirstChild( pEntry );
while ( pTmpEntry )
{
if ( aScriptsBox.GetEntryText( pTmpEntry ) == aTmp )
if ( m_pScriptsBox->GetEntryText( pTmpEntry ) == aTmp )
{
pEntry = pTmpEntry;
break;
}
pTmpEntry = aScriptsBox.NextSibling( pTmpEntry );
pTmpEntry = m_pScriptsBox->NextSibling( pTmpEntry );
}
if ( !pTmpEntry )
break;
aScriptsBox.RequestingChildren( pEntry );
m_pScriptsBox->RequestingChildren( pEntry );
}
aScriptsBox.SetCurEntry( pEntry );
m_pScriptsBox->SetCurEntry( pEntry );
}
::rtl::OUString ReplaceString(
......
cui/source/dialogs/scriptdlg.hrc
Dosyayı görüntüle @ 3f7f957e
......@@ -21,22 +21,6 @@
#include <svl/solar.hrc>
// ScriptOrgDialog
#define SF_TXT_SCRIPTS 1
#define SF_CTRL_SCRIPTSBOX 2
#define SF_PB_RUN 3
#define SF_PB_CLOSE 4
#define SF_PB_CREATE 5
#define SF_PB_EDIT 6
#define SF_PB_RENAME 7
#define SF_PB_DEL 8
#define SF_PB_HELP 9
#define IMG_HARDDISK 1
#define IMG_LIB 3
#define IMG_MACRO 5
#define IMG_DOCUMENT 7
// NewObjectDialog
#define FT_NEWLIB 10
#define STR_FT_NEWMACRO 11
......@@ -48,15 +32,4 @@
#define STR_FT_RENAME 18
#define STR_RENAME 19
// Others
/*
Please be aware that these strings are global resources, don't use self-defined values!
You have to use the RID_SVXSTART macro do avoid ID clashes with other resource files. Sfx2 delivers
some of its own resource files to svx - where they are added to svx resource file!!
*/
#define STR_MYMACROS 32
#define STR_PRODMACROS 33
#endif // _SCRIPTDLG_HRC
#endif
cui/source/dialogs/scriptdlg.src
Dosyayı görüntüle @ 3f7f957e
......@@ -20,116 +20,6 @@
#include "scriptdlg.hrc"
#include "helpid.hrc"
#define MASKCOLOR MaskColor = \
Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
ModalDialog RID_DLG_SCRIPTORGANIZER
{
OutputSize = TRUE ;
Size = MAP_APPFONT ( 210 , 165 ) ;
Moveable = TRUE ;
Text [ en-US ] = "%MACROLANG Macros";
Closeable = TRUE ;
HelpId = HID_SCRIPTORG_DIALOG;
FixedText SF_TXT_SCRIPTS
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 100 , 10 ) ;
Text [ en-US ] = "~Macros" ;
};
Control SF_CTRL_SCRIPTSBOX
{
HelpId = HID_SCRIPTSBOX ;
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 16 ) ;
Size = MAP_APPFONT ( 130 , 144 ) ;
TabStop = TRUE ;
Image IMG_HARDDISK
{
ImageBitmap = Bitmap { File = "harddisk_16.bmp" ; };
MASKCOLOR
};
Image IMG_LIB
{
ImageBitmap = Bitmap { File = "im30820.png"; };
MASKCOLOR
};
Image IMG_MACRO
{
ImageBitmap = Bitmap { File = "im30821.png"; };
MASKCOLOR
};
Image IMG_DOCUMENT
{
ImageBitmap = Bitmap { File = "im30826.png"; };
MASKCOLOR
};
String STR_MYMACROS
{
Text [ en-US ] = "My Macros";
};
String STR_PRODMACROS
{
Text [ en-US ] = "%PRODUCTNAME Macros";
};
};
PushButton SF_PB_RUN
{
HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RUN";
Pos = MAP_APPFONT ( 144 , 6 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
DefButton = TRUE;
Text [ en-US ] = "R~un" ;
};
CancelButton SF_PB_CLOSE
{
Pos = MAP_APPFONT ( 144 , 23 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Close" ;
};
PushButton SF_PB_CREATE
{
HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_CREATE";
Size = MAP_APPFONT ( 60 , 14 ) ;
Pos = MAP_APPFONT ( 144 , 60 ) ;
Text [ en-US ] = "~Create..." ;
TabStop = TRUE ;
};
PushButton SF_PB_EDIT
{
HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_EDIT";
Size = MAP_APPFONT ( 60 , 14 ) ;
Pos = MAP_APPFONT ( 144 , 77 ) ;
Text [ en-US ] = "~Edit" ;
TabStop = TRUE ;
};
PushButton SF_PB_RENAME
{
HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RENAME";
Pos = MAP_APPFONT ( 144 , 94 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
Text [ en-US ] = "Rename..." ;
};
PushButton SF_PB_DEL
{
HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_DEL";
Pos = MAP_APPFONT ( 144 , 114 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
Text [ en-US ] = "~Delete..." ;
TabStop = TRUE ;
};
HelpButton SF_PB_HELP
{
Pos = MAP_APPFONT ( 144 , 131 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
TabStop = TRUE ;
};
};
ModalDialog RID_DLG_NEWLIB
{
HelpID = "cui:ModalDialog:RID_DLG_NEWLIB";
......
cui/source/inc/helpid.hrc
Dosyayı görüntüle @ 3f7f957e
......@@ -250,8 +250,6 @@
#define HID_HANGULHANJA_EDIT_DLG "CUI_HID_HANGULHANJA_EDIT_DLG"
#define HID_HANGULHANJA_OPT_DICTS_LB "CUI_HID_HANGULHANJA_OPT_DICTS_LB"
#define HID_MULTIPATH "CUI_HID_MULTIPATH"
#define HID_SCRIPTORG_DIALOG "CUI_HID_SCRIPTORG_DIALOG"
#define HID_SCRIPTSBOX "CUI_HID_SCRIPTSBOX"
#define HID_SPELLCHECK "CUI_HID_SPELLCHECK"
#define HID_TPSIZE_CTRL "CUI_HID_TPSIZE_CTRL"
#define HID_TPROTATION_CTRL1 "CUI_HID_TPROTATION_CTRL1"
......
cui/source/inc/scriptdlg.hxx
Dosyayı görüntüle @ 3f7f957e
......@@ -69,6 +69,8 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, ::rtl::OUString& docName );
void Init();
protected:
void ExpandTree( SvTreeListEntry* pRootEntry );
virtual void RequestingChildren( SvTreeListEntry* pParent );
......@@ -78,7 +80,8 @@ public:
void Init( const ::rtl::OUString& language );
void RequestSubEntries( SvTreeListEntry* pRootEntry, ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node,
::com::sun::star::uno::Reference< com::sun::star::frame::XModel>& model );
SFTreeListBox( Window* pParent, const ResId& rRes );
SFTreeListBox(Window* pParent, const ResId& rRes);
SFTreeListBox(Window* pParent);
~SFTreeListBox();
void ExpandAllTrees();
......@@ -139,16 +142,14 @@ public:
class SvxScriptOrgDialog : public SfxModalDialog
{
protected:
FixedText aScriptsTxt;
SFTreeListBox aScriptsBox;
PushButton aRunButton;
CancelButton aCloseButton;
PushButton aCreateButton;
PushButton aEditButton;
PushButton aRenameButton;
PushButton aDelButton;
HelpButton aHelpButton;
SFTreeListBox* m_pScriptsBox;
PushButton* m_pRunButton;
PushButton* m_pCloseButton;
PushButton* m_pCreateButton;
PushButton* m_pEditButton;
PushButton* m_pRenameButton;
PushButton* m_pDelButton;
::rtl::OUString m_sLanguage;
static Selection_hash m_lastSelection;
......
cui/uiconfig/ui/scriptorganizer.ui 0 → 100644
Dosyayı görüntüle @ 3f7f957e
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="ScriptOrganizerDialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">%MACROLANG Macros</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="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="layout_style">start</property>
<child>
<object class="GtkButton" id="run">
<property name="label">Run</property>
<property name="use_action_appearance">False</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_action_appearance">False</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="close">
<property name="label">gtk-close</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</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="create">
<property name="label">Create...</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
<property name="secondary">True</property>
</packing>
</child>
<child>
<object class="GtkButton" id="edit">
<property name="label">gtk-edit</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
<property name="image_position">bottom</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
<property name="secondary">True</property>
</packing>
</child>
<child>
<object class="GtkButton" id="rename">
<property name="label">Rename...</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">4</property>
<property name="secondary">True</property>
</packing>
</child>
<child>
<object class="GtkButton" id="delete">
<property name="label">Delete...</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">5</property>
<property name="secondary">True</property>
</packing>
</child>
<child>
<object class="GtkButton" id="help">
<property name="label">gtk-help</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">6</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="GtkFrame" id="frame2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">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="hexpand">True</property>
<property name="vexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="cuilo:SFTreeListBox" id="scripts">
<property name="height_request">300</property>
<property name="width_request">280</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
</object>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="macrosft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Macros</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</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">run</action-widget>
<action-widget response="0">close</action-widget>
<action-widget response="0">create</action-widget>
<action-widget response="0">edit</action-widget>
<action-widget response="0">rename</action-widget>
<action-widget response="0">delete</action-widget>
<action-widget response="0">help</action-widget>
</action-widgets>
</object>
</interface>
cui/util/hidother.src
Dosyayı görüntüle @ 3f7f957e
......@@ -148,7 +148,6 @@ hidspecial HID_REDLINING_DLG { HelpID = HID_REDLINING_DLG; };
hidspecial HID_REDLINING_EDIT { HelpID = HID_REDLINING_EDIT; };
hidspecial HID_REDLINING_NEXT { HelpID = HID_REDLINING_NEXT; };
hidspecial HID_REDLINING_PREV { HelpID = HID_REDLINING_PREV; };
hidspecial HID_SCRIPTSBOX { HelpId = HID_SCRIPTSBOX; };
hidspecial HID_SPLDLG_BUTTON_CHANGE { HelpID = HID_SPLDLG_BUTTON_CHANGE ; };
hidspecial HID_SPLDLG_BUTTON_CHANGEALL { HelpID = HID_SPLDLG_BUTTON_CHANGEALL ; };
hidspecial HID_SPLDLG_BUTTON_CLOSE { HelpID = HID_SPLDLG_BUTTON_CLOSE ; };
......
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