Skip to content

C
core
Kaydet (Commit) cdae06a6 authored tarafından Andre Fischer's avatar Andre Fischer
Dosyalara gözat
Seçenekler

#78400# Template scanning reimplemented using UCB

üst 30ace279
Hide whitespace changes
Inline Side-by-side
Showing with 184 additions and 408 deletions
sd/source/ui/dlg/dlgass.cxx
Dosyayı görüntüle @ cdae06a6
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: dlgass.cxx,v $ * $RCSfile: dlgass.cxx,v $
* *
* $Revision: 1.4 $ * $Revision: 1.5 $
* *
* last change: $Author: ka $ $Date: 2001-03-30 15:45:02 $ * last change: $Author: af $ $Date: 2001-04-06 12:15:01 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -90,33 +90,6 @@ ...@@ -90,33 +90,6 @@
#include <svtools/lstner.hxx> #include <svtools/lstner.hxx>
#endif #endif
/* no chaos, no fun
#ifndef _CNTAPI_HXX // class CntAnchor
#include <chaos/cntapi.hxx>
#endif
#ifndef _CNTRULES_HXX // Cnt Rules
#define ITEMID_RULESET WID_RULES
#include <chaos/cntrules.hxx>
#endif
#ifndef _SVTOOLS_CTYPEITM_HXX // CntContentTypeItem
#include <svtools/ctypeitm.hxx>
#endif
#ifndef _CNTSYS_HXX //!!!TEMP
#include <chaos/cntsys.hxx>
#endif
#ifndef _CNTCCITM_HXX // class CntCmpCommandItem
#include <chaos/cntccitm.hxx>
#endif
#ifndef _CSTRITEM_HXX // class CntStringItem
#include <chaos/cstritem.hxx>
#endif
*/
#ifndef _SFXDOCINF_HXX // SfxDocumentInfo #ifndef _SFXDOCINF_HXX // SfxDocumentInfo
#include <sfx2/docinf.hxx> #include <sfx2/docinf.hxx>
#endif #endif
...@@ -177,6 +150,23 @@ ...@@ -177,6 +150,23 @@
#include <sfx2/dispatch.hxx> #include <sfx2/dispatch.hxx>
#endif #endif
#ifndef _COM_SUN_STAR_SDBC_XRESULTSET_HPP_
#include <com/sun/star/sdbc/XResultSet.hpp>
#endif
#ifndef INCLUDED_SVTOOLS_HISTORYOPTIONS_HXX
#include <svtools/historyoptions.hxx>
#endif
#ifndef _URLOBJ_HXX
#include <tools/urlobj.hxx>
#endif
#ifndef _OSL_FILE_HXX_
#include <osl/file.hxx>
#endif
#include "sdpage.hxx" #include "sdpage.hxx"
#include "helpids.h" #include "helpids.h"
#include "assclass.hxx" #include "assclass.hxx"
...@@ -185,9 +175,16 @@ ...@@ -185,9 +175,16 @@
#include "dlgctrls.hxx" #include "dlgctrls.hxx"
#include "strings.hrc" #include "strings.hrc"
#include "dlgassim.hxx" #include "dlgassim.hxx"
#include "TemplateThread.hxx"
using namespace ::com::sun::star; using namespace ::com::sun::star;
// This prefix is used to find impress files in the file history.
// Should probably be determined dynamically.
const rtl::OUString IMPRESS_PREFIX = rtl::OUString::createFromAscii ("simpress:");
void InterpolateFixedBitmap( FixedBitmap * pBitmap ) void InterpolateFixedBitmap( FixedBitmap * pBitmap )
{ {
Bitmap aBmp( pBitmap->GetBitmap() ); Bitmap aBmp( pBitmap->GetBitmap() );
...@@ -211,31 +208,6 @@ UINT32 PageHelpIds[] = ...@@ -211,31 +208,6 @@ UINT32 PageHelpIds[] =
// ==================================================================== // ====================================================================
class TemplateEntry
{
public:
TemplateEntry( const String& rTitle, const String& rPath ) { m_aTitle = rTitle; m_aPath = rPath; }
String m_aTitle;
String m_aPath;
};
DECLARE_LIST( TemplateEntryList, TemplateEntry * );
class TemplateDir
{
public:
TemplateDir( const String& rRegion, const String& rUrl ) { m_aRegion = rRegion; m_aUrl = rUrl; }
String m_aRegion;
String m_aUrl;
TemplateEntryList m_aEntrys;
};
DECLARE_LIST( TemplateDirList, TemplateDir * );
DECLARE_LIST( StringPtrList, String * );
class PasswordEntry class PasswordEntry
{ {
public: public:
...@@ -253,18 +225,30 @@ public: ...@@ -253,18 +225,30 @@ public:
AssistentDlgImpl( Window* pWindow, const Link& rFinishLink, BOOL bAutoPilot ); AssistentDlgImpl( Window* pWindow, const Link& rFinishLink, BOOL bAutoPilot );
~AssistentDlgImpl(); ~AssistentDlgImpl();
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); SfxObjectShellLock GetDocument();
SfxObjectShellLock GetDocument(); /** @descr Extract form the history list of recently used files the
impress files and insert them into a listbox.
*/
void ScanDocmenu (void);
/** @descr Extract from the list of template files the impress templates
and layouts and store them for later use in m_aPresentList.
*/
void ScanTemplates (void);
/** @desrc This callback is called from the thread that scans the
template files to update the dialog in order to display the
found impress templates. This sets the flag m_bTemplatesReady
to TRUE.
*/
void TemplateScanDone (void);
void TemplateScanDone(); /** @descr Flag that is set to TRUE after the impress templates have been
// void AddTemplateDir( CntAnchorRef xRoot ); scanned.
// void ScanTemplateDir( CntAnchorRef xDir ); */
void ScanTemplates(); BOOL m_bTemplatesReady;
void DocmenuScanDone();
void ScanDocmenu();
Window* m_pWindow; Window* m_pWindow;
...@@ -273,24 +257,25 @@ public: ...@@ -273,24 +257,25 @@ public:
String GetPassword( const String rPath ); String GetPassword( const String rPath );
void DeletePassords(); void DeletePassords();
// chaos PasswordEntryList m_aPasswordList;
String m_aDocFile; String m_aDocFile;
String m_aLayoutFile; String m_aLayoutFile;
String GetDocFileName(); String GetDocFileName();
String GetLayoutFileName(); String GetLayoutFileName();
StringPtrList m_aOpenFilesList; /// @descr List of URLs of recently used impress files.
std::vector<String*> m_aOpenFilesList;
/// @descr The thread that scans the template files for impress templates
TemplateThread * m_aThread;
/// @descr List of folders containing data about impress templates.
std::vector<TemplateDir*> m_aPresentList;
/// @descr Currently selected template folder.
TemplateDir* m_pTemplateRegion; TemplateDir* m_pTemplateRegion;
/// @descr Currently selected layout folder.
TemplateDir* m_pLayoutRegion; TemplateDir* m_pLayoutRegion;
// CntAnchorRef m_xRoot;
// CntAnchor* m_pTemplateDir;
TemplateDirList m_aPresentList;
PasswordEntryList m_aPasswordList;
BOOL m_bTemplatesReady;
// BOOL m_bOpenReady;
// preview // preview
BOOL m_bUserDataDirty; BOOL m_bUserDataDirty;
...@@ -305,7 +290,6 @@ public: ...@@ -305,7 +290,6 @@ public:
USHORT m_nShowPage; USHORT m_nShowPage;
BOOL m_bDocPreview; BOOL m_bDocPreview;
// CntAnchorRef m_xDocmenu;
ULONG m_nTemplate; ULONG m_nTemplate;
String m_aPageListFile; String m_aPageListFile;
...@@ -314,9 +298,6 @@ public: ...@@ -314,9 +298,6 @@ public:
void UpdatePageList(); void UpdatePageList();
void UpdateUserData(); void UpdateUserData();
// templates
TemplateCache m_aCache;
BOOL IsOwnFormat( const String& rPath ); BOOL IsOwnFormat( const String& rPath );
// dlg status // dlg status
...@@ -415,6 +396,8 @@ public: ...@@ -415,6 +396,8 @@ public:
CheckBox* m_pPage5SummaryCB; CheckBox* m_pPage5SummaryCB;
}; };
// ==================================================================== // ====================================================================
AssistentDlgImpl::AssistentDlgImpl( Window* pWindow, const Link& rFinishLink, BOOL bAutoPilot ) : AssistentDlgImpl::AssistentDlgImpl( Window* pWindow, const Link& rFinishLink, BOOL bAutoPilot ) :
...@@ -434,11 +417,11 @@ AssistentDlgImpl::AssistentDlgImpl( Window* pWindow, const Link& rFinishLink, BO ...@@ -434,11 +417,11 @@ AssistentDlgImpl::AssistentDlgImpl( Window* pWindow, const Link& rFinishLink, BO
m_nShowPage(0), m_nShowPage(0),
// m_aPageListFile('?'), // m_aPageListFile('?'),
m_bUserDataDirty(FALSE), m_bUserDataDirty(FALSE),
m_aAssistentFunc(5) m_aAssistentFunc(5),
m_aThread (NULL)
{ {
m_aPageListFile += sal_Unicode('?'), m_aPageListFile += sal_Unicode('?'),
m_bTemplatesReady = FALSE; m_bTemplatesReady = FALSE;
// m_bOpenReady = FALSE;
m_pWindow = pWindow; m_pWindow = pWindow;
...@@ -647,41 +630,32 @@ AssistentDlgImpl::AssistentDlgImpl( Window* pWindow, const Link& rFinishLink, BO ...@@ -647,41 +630,32 @@ AssistentDlgImpl::AssistentDlgImpl( Window* pWindow, const Link& rFinishLink, BO
ChangePage(); ChangePage();
} }
AssistentDlgImpl::~AssistentDlgImpl() AssistentDlgImpl::~AssistentDlgImpl()
{ {
DeletePassords(); DeletePassords();
/*
if(m_pTemplateDir)
EndListening(*m_pTemplateDir);
*/
TemplateDir* pDir = m_aPresentList.First();
while(pDir)
{
TemplateEntry* pEntry = pDir->m_aEntrys.First();
while(pEntry)
{
delete pEntry;
pEntry = pDir->m_aEntrys.Next();
}
pDir = m_aPresentList.Next();
}
/* // Delete the template file infos.
if(m_xRoot) std::vector<TemplateDir*>::iterator I;
std::vector<TemplateEntry*>::iterator J;
for (I=m_aPresentList.begin(); I!=m_aPresentList.end(); I++)
{ {
m_xRoot->Collapse(); for (J=(*I)->m_aEntries.begin(); J!=(*I)->m_aEntries.end(); J++)
EndListening(*(CntAnchor*)m_xRoot); delete (*J);
m_xRoot = NULL; delete (*I);
} }
*/
/* // Terminate or join the thread for scanning the template files.
if(m_xDocmenu) if (m_aThread != NULL)
{ {
EndListening( *(CntAnchor*)m_xDocmenu ); if (m_aThread->isRunning())
m_xDocmenu = NULL; m_aThread->terminate ();
else
m_aThread->join ();
delete m_aThread;
} }
*/
// Seite 1 // Seite 1
delete m_pPage1FB; delete m_pPage1FB;
...@@ -737,11 +711,10 @@ AssistentDlgImpl::~AssistentDlgImpl() ...@@ -737,11 +711,10 @@ AssistentDlgImpl::~AssistentDlgImpl()
delete m_pPage5PageListCT; delete m_pPage5PageListCT;
delete m_pPage5SummaryCB; delete m_pPage5SummaryCB;
for( ULONG nIdx = 0; nIdx < m_aOpenFilesList.Count(); nIdx++ ) // Delete the file history list.
delete m_aOpenFilesList.GetObject(nIdx); std::vector<String*>::iterator I2;
for (I2=m_aOpenFilesList.begin(); I2!=m_aOpenFilesList.end(); I2++)
if( m_bTemplatesReady && m_aCache.ClearInvalidEntrys() ) delete *I2;
m_aCache.Save();
} }
void AssistentDlgImpl::EndDialog( long nResult ) void AssistentDlgImpl::EndDialog( long nResult )
...@@ -749,311 +722,116 @@ void AssistentDlgImpl::EndDialog( long nResult ) ...@@ -749,311 +722,116 @@ void AssistentDlgImpl::EndDialog( long nResult )
m_pWindow = NULL; m_pWindow = NULL;
} }
// ********************************************************************
// I/O Chaos
// ********************************************************************
void AssistentDlgImpl::ScanTemplates()
{
/*
m_pTemplateDir = NULL;
m_nTemplate = 0;
m_xRoot = new CntAnchor( NULL, ".component:Template/" );
StartListening( *m_xRoot );
m_xRoot->MakeVisible( TRUE );
m_xRoot->MarkAsRoot();
m_xRoot->DontThread();
CntOpenModeItem aItem( WID_OPEN, CNT_OPEN_FOLDERS );
m_xRoot->Put( aItem );
*/
}
/*
void AssistentDlgImpl::ScanTemplateDir( CntAnchorRef xDir )
{
StartListening( *xDir );
xDir->MakeVisible( TRUE );
xDir->MarkAsRoot();
xDir->DontThread();
xDir->Put(CntOpenModeItem( WID_OPEN, CNT_OPEN_ALL )); void TemplateScanDoneCallback (void * pObject)
{
reinterpret_cast<AssistentDlgImpl*>(pObject)->TemplateScanDone ();
} }
*/
/*
void AssistentDlgImpl::AddTemplateDir( CntAnchorRef xRoot )
{
const ULONG nCount = xRoot->SubAnchorCount();
if( nCount == 0 )
return;
TemplateDir* pPresntDir = NULL;
TemplateDir* pLayoutDir = NULL;
INetURLObject aRootUrl( xRoot->GetViewURL() ); void AssistentDlgImpl::ScanDocmenu (void)
{
CntContentTypeItem aImpressType1( 0, CONTENT_TYPE_APP_STARIMPRESS ); uno::Sequence<uno::Sequence<beans::PropertyValue> > aHistory =
CntContentTypeItem aImpressType2( 0, CONTENT_TYPE_APP_VND_IMPRESS ); SvtHistoryOptions().GetList (eHISTORY);
for( ULONG i = 0; i < nCount; i++ ) sal_uInt32 nCount = aHistory.getLength();
for (sal_uInt32 nItem=0; nItem<nCount; ++nItem)
{ {
CntAnchor* pSubAnchor = xRoot->GetSubAnchor( i ); // Get the current history item's properties.
uno::Sequence<beans::PropertyValue> aPropertySet = aHistory[nItem];
DateTime aTime; rtl::OUString sURL;
rtl::OUString sFilter;
if((pSubAnchor->GetItemState(WID_DATE_MODIFIED) & SFX_ITEM_SET) == SFX_ITEM_SET) rtl::OUString sTitle;
aTime = ((SfxDateTimeItem&)pSubAnchor->Get(WID_DATE_MODIFIED)).GetDateTime(); rtl::OUString sPassword;
sal_uInt32 nPropertyCount = aPropertySet.getLength();
TemplateCacheInfo* pEntry = m_aCache.GetFileInfo( pSubAnchor->GetViewURL() ); for (sal_uInt32 nProperty=0; nProperty<nPropertyCount; ++nProperty)
if(pEntry && pEntry->GetDateTime() >= aTime) if (aPropertySet[nProperty].Name == HISTORY_PROPERTYNAME_URL)
{ aPropertySet[nProperty].Value >>= sURL;
pEntry->SetValid( TRUE ); else if (aPropertySet[nProperty].Name == HISTORY_PROPERTYNAME_FILTER)
aPropertySet[nProperty].Value >>= sFilter;
if(!pEntry->IsImpress()) else if (aPropertySet[nProperty].Name == HISTORY_PROPERTYNAME_TITLE)
continue; aPropertySet[nProperty].Value >>= sTitle;
} else if (aPropertySet[nProperty].Name == HISTORY_PROPERTYNAME_PASSWORD)
else aPropertySet[nProperty].Value >>= sPassword;
{
if(pEntry == NULL) // If the entry is an impress file then insert it into the
pEntry = m_aCache.AddFileInfo( pSubAnchor->GetViewURL() ); // history list and the list box.
if (sFilter.indexOf (IMPRESS_PREFIX) == 0)
pEntry->SetDateTime( aTime );
pEntry->SetValid( TRUE );
pEntry->SetModified(TRUE);
pSubAnchor->Put(SfxVoidItem(WID_GETDATA));
const CntContentTypeItem& rContentType = (const CntContentTypeItem&)pSubAnchor->Get(WID_CONTENT_TYPE);
if( rContentType != aImpressType1 && rContentType != aImpressType2 )
{
pEntry->SetImpress(FALSE);
continue;
}
else
{
pEntry->SetImpress(TRUE);
}
}
String aTitle;
const SfxPoolItem* pItem;
if ( pSubAnchor->GetItemState( WID_TITLE, TRUE, &pItem ) == SFX_ITEM_SET )
aTitle = ( (CntStringItem*)pItem )->GetValue();
else
{ {
INetURLObject aUrl( pSubAnchor->GetViewURL() ); INetURLObject aURL;
aTitle = aUrl.GetName(); aURL.SetSmartURL (sURL);
aURL.SetPass (sPassword);
m_aOpenFilesList.push_back (new String (aURL.GetMainURL()));
m_pPage1OpenLB->InsertEntry (aURL.GetName());
} }
if( pPresntDir == NULL )
{
String aRootTitle;
const SfxPoolItem* pItem;
if ( xRoot->GetItemState( WID_TITLE, TRUE, &pItem ) == SFX_ITEM_SET )
aRootTitle = ( (CntStringItem*)pItem )->GetValue();
else
aRootTitle = aRootUrl.GetName();
pPresntDir = new TemplateDir( aRootTitle, aRootUrl.GetLastName() );
}
pPresntDir->m_aEntrys.Insert( new TemplateEntry( aTitle, pSubAnchor->GetViewURL() ), CONTAINER_APPEND);
} }
}
if(pPresntDir != NULL)
m_aPresentList.Insert( pPresntDir, CONTAINER_APPEND );
}
*/
void AssistentDlgImpl::TemplateScanDone() void AssistentDlgImpl::ScanTemplates (void)
{ {
/* m_aThread = new TemplateThread (
if(m_pTemplateDir) m_aPresentList,
{ TemplateScanDoneCallback,
EndListening(*m_pTemplateDir); this);
m_pTemplateDir = NULL; // This starts the thread. It exists until it is, depending on wether
} // it has finished by then, either joined or terminated in the destructor.
m_aThread->create ();
}
EndListening( *m_xRoot );
m_xRoot = NULL;
void AssistentDlgImpl::TemplateScanDone (void)
{
// This method is called from a thread. Therefore we get the solar mutex.
::vos::OGuard aGuard (Application::GetSolarMutex());
// Fill in the list box on the first page.
int nFirstEntry = 0; int nFirstEntry = 0;
m_pPage1RegionLB->Clear(); m_pPage1RegionLB->Clear();
const ULONG nCount = m_aPresentList.Count(); std::vector<TemplateDir*>::iterator I;
for( ULONG i = 0; i < nCount; i++ ) int i;
for (i=0,I=m_aPresentList.begin(); I!=m_aPresentList.end(); I++,i++)
{ {
TemplateDir* pDir = m_aPresentList.GetObject(i); TemplateDir * pDir = *I;
if(pDir->m_aUrl == "presnt") //HACK! presnt Verzeichnis immer als erste Zeigen //HACK! presnt directory is always initially selected.
if (pDir->m_aUrl.SearchAscii ("presnt") != STRING_NOTFOUND)
nFirstEntry = i; nFirstEntry = i;
m_pPage1RegionLB->InsertEntry( pDir->m_aRegion ); m_pPage1RegionLB->InsertEntry (pDir->m_aRegion);
} }
m_pPage1RegionLB->SelectEntryPos(nFirstEntry); m_pPage1RegionLB->SelectEntryPos (nFirstEntry);
m_pPage1RegionLB->Update(); m_pPage1RegionLB->Update();
SelectTemplateRegion( m_pPage1RegionLB->GetSelectEntry() ); SelectTemplateRegion (m_pPage1RegionLB->GetSelectEntry());
// Fill in the list box on the second page.
nFirstEntry = 0; nFirstEntry = 0;
m_pPage2RegionLB->Clear(); m_pPage2RegionLB->Clear();
for( i = 0; i < nCount; i++ ) for (i=0,I=m_aPresentList.begin(); I!=m_aPresentList.end(); I++,i++)
{ {
TemplateDir* pDir = m_aPresentList.GetObject(i); TemplateDir * pDir = *I;
if(pDir->m_aUrl == "layout") //HACK! layout directory is always initially selected.
if (pDir->m_aUrl.SearchAscii ("layout") != STRING_NOTFOUND)
nFirstEntry = i; nFirstEntry = i;
m_pPage2RegionLB->InsertEntry( pDir->m_aRegion ); m_pPage2RegionLB->InsertEntry (pDir->m_aRegion);
} }
m_pPage2RegionLB->SelectEntryPos(nFirstEntry); m_pPage2RegionLB->SelectEntryPos (nFirstEntry);
m_pPage2RegionLB->Update(); m_pPage2RegionLB->Update();
SelectLayoutRegion( m_pPage2RegionLB->GetSelectEntry() ); SelectLayoutRegion (m_pPage2RegionLB->GetSelectEntry());
m_bTemplatesReady = nCount != 0;
if( m_pWindow ) // Make the changes visible.
m_bTemplatesReady = TRUE;
if (m_pWindow)
UpdatePage(); UpdatePage();
*/
}
void AssistentDlgImpl::ScanDocmenu()
{
/*
m_xDocmenu = new CntAnchor(NULL, ".component:Docmenu/");
m_xDocmenu->MakeVisible( TRUE );
m_xDocmenu->MarkAsRoot();
m_xDocmenu->DontThread();
StartListening( *m_xDocmenu );
m_xDocmenu->Put(CntOpenModeItem( WID_OPEN, CNT_OPEN_ALL ));
*/
}
void AssistentDlgImpl::DocmenuScanDone()
{
/*
EndListening( *m_xDocmenu );
const ULONG nCount = m_xDocmenu->SubAnchorCount();
CntContentTypeItem aImpressType1( 0, CONTENT_TYPE_APP_STARIMPRESS );
CntContentTypeItem aImpressType2( 0, CONTENT_TYPE_APP_VND_IMPRESS );
for( ULONG i = 0; i < nCount; i++ )
{
CntAnchor* pSubAnchor = m_xDocmenu->GetSubAnchor( i );
String aCommand;
const CntCmpCommandItem& rCmdItem = (const CntCmpCommandItem&)pSubAnchor->Get(WID_COMPONENT_COMMAND);
String aCmpCommand( OUStringToString( rCmdItem.GetCommand(), CHARSET_SYSTEM) );
//#endif
INetURLObject aUrl( aCmpCommand );
if( INET_PROT_FILE != aUrl.GetProtocol())
continue;
String aExt = aUrl.GetExtension().Lower();
BOOL bImpress = FALSE;
if(aExt.Compare( "sdd" ) == COMPARE_EQUAL)
{
bImpress = TRUE;
}
else if( aExt.Compare( "ppt" ) == COMPARE_EQUAL )
{
bImpress = TRUE;
}
else if( aExt.Compare( "vor" ) == COMPARE_EQUAL )
{
CntAnchorRef xAnchor = new CntAnchor( 0, aUrl.GetMainURL() );
xAnchor->Put(SfxVoidItem(WID_GETDATA));
const CntContentTypeItem& rContentType = (const CntContentTypeItem&)xAnchor->Get(WID_CONTENT_TYPE);
bImpress = rContentType == aImpressType1 || rContentType == aImpressType2;
}
if( bImpress)
{
m_aOpenFilesList.Insert( new String( aUrl.GetMainURL() ), CONTAINER_APPEND);
m_pPage1OpenLB->InsertEntry( aUrl.GetName() );
// m_bOpenReady = TRUE;
}
}
m_xDocmenu = NULL;
UpdatePage();
*/
} }
void AssistentDlgImpl::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
/*
NAMESPACE_VOS( OGuard ) aGuard( Application::GetSolarMutex() );
if( rHint.ISA(CntStatusHint) )
{
const CntStatusHint& rStatusHint = (const CntStatusHint&)rHint;
USHORT nWhich = rStatusHint.GetRequest() ?
rStatusHint.GetRequest()->Which() : 0;
switch( rStatusHint.GetStatus() )
{
case CNT_STATUS_DONE:
{
if( nWhich != WID_OPEN )
break;
CntAnchor* pBC = PTR_CAST( CntAnchor, &rBC );
if(pBC == m_xDocmenu )
{
DocmenuScanDone();
}
else
{
if( pBC == m_xRoot )
{
// das Template Root Verzeichnis wurde komplett eingelesen
// jetzt beginnen diese Verzeichnisse einzulesen
m_nTemplate = (ULONG)0;
}
else if( pBC == m_pTemplateDir )
{
// aktuell eingelessenes Template Verzeichnis speichern
AddTemplateDir( m_pTemplateDir );
EndListening( *m_pTemplateDir );
m_pTemplateDir = NULL;
m_nTemplate += 1;
}
else
DBG_ERROR("CNT_STATUS_DONE from unknown CntAnchor!");
if( m_nTemplate < m_xRoot->SubAnchorCount() )
{
// nchstes Template Verzeichniss einlesen
m_pTemplateDir = m_xRoot->GetSubAnchor( m_nTemplate );
ScanTemplateDir( m_pTemplateDir );
}
else
{
// alle Template Verzeichnisse fertig eingelesen
TemplateScanDone();
}
}
break;
}
case CNT_STATUS_ERROR:
// Fehlermeldung ausgeben
break;
}
}
*/
}
// ******************************************************************** // ********************************************************************
// Status Methoden // Status Methoden
...@@ -1098,7 +876,7 @@ String AssistentDlgImpl::GetDocFileName() ...@@ -1098,7 +876,7 @@ String AssistentDlgImpl::GetDocFileName()
const USHORT nEntry = m_pPage1TemplateLB->GetSelectEntryPos(); const USHORT nEntry = m_pPage1TemplateLB->GetSelectEntryPos();
TemplateEntry* pEntry = NULL; TemplateEntry* pEntry = NULL;
if(nEntry != (USHORT)-1) if(nEntry != (USHORT)-1)
pEntry = m_pTemplateRegion->m_aEntrys.GetObject(nEntry); pEntry = m_pTemplateRegion->m_aEntries[nEntry];
if(pEntry) if(pEntry)
{ {
...@@ -1113,7 +891,7 @@ String AssistentDlgImpl::GetDocFileName() ...@@ -1113,7 +891,7 @@ String AssistentDlgImpl::GetDocFileName()
{ {
const USHORT nEntry = m_pPage1OpenLB->GetSelectEntryPos(); const USHORT nEntry = m_pPage1OpenLB->GetSelectEntryPos();
if(nEntry != (USHORT)-1 && nEntry > 0) if(nEntry != (USHORT)-1 && nEntry > 0)
aDocFile = *m_aOpenFilesList.GetObject(nEntry-1); aDocFile = *m_aOpenFilesList[nEntry-1];
} }
if(m_pWindow) if(m_pWindow)
...@@ -1128,7 +906,7 @@ String AssistentDlgImpl::GetLayoutFileName() ...@@ -1128,7 +906,7 @@ String AssistentDlgImpl::GetLayoutFileName()
const USHORT nEntry = m_pPage2LayoutLB->GetSelectEntryPos(); const USHORT nEntry = m_pPage2LayoutLB->GetSelectEntryPos();
TemplateEntry* pEntry = NULL; TemplateEntry* pEntry = NULL;
if(nEntry != (USHORT)-1 && nEntry > 0) if(nEntry != (USHORT)-1 && nEntry > 0)
pEntry = m_pLayoutRegion->m_aEntrys.GetObject(nEntry-1); pEntry = m_pLayoutRegion->m_aEntries[nEntry-1];
if(pEntry) if(pEntry)
aFile = pEntry->m_aPath; aFile = pEntry->m_aPath;
...@@ -1279,10 +1057,8 @@ void AssistentDlgImpl::UpdatePage() ...@@ -1279,10 +1057,8 @@ void AssistentDlgImpl::UpdatePage()
IMPL_LINK( AssistentDlgImpl, StartScanHdl, void *, EMPTYARG ) IMPL_LINK( AssistentDlgImpl, StartScanHdl, void *, EMPTYARG )
{ {
m_aCache.Load(); ScanDocmenu ();
ScanTemplates ();
ScanDocmenu();
ScanTemplates();
UpdatePreview(TRUE); UpdatePreview(TRUE);
...@@ -1319,6 +1095,7 @@ IMPL_LINK( AssistentDlgImpl, EffectPreviewHdl, Button *, EMPTYARG ) ...@@ -1319,6 +1095,7 @@ IMPL_LINK( AssistentDlgImpl, EffectPreviewHdl, Button *, EMPTYARG )
} }
IMPL_LINK( AssistentDlgImpl, PreviewFlagHdl, CheckBox *, EMPTYARG ) IMPL_LINK( AssistentDlgImpl, PreviewFlagHdl, CheckBox *, EMPTYARG )
{ {
if( m_aPreviewFlag.IsChecked() != m_bPreview ) if( m_aPreviewFlag.IsChecked() != m_bPreview )
{ {
...@@ -1441,19 +1218,16 @@ IMPL_LINK( AssistentDlgImpl, UpdateUserDataHdl, Edit*, EMPTYARG ) ...@@ -1441,19 +1218,16 @@ IMPL_LINK( AssistentDlgImpl, UpdateUserDataHdl, Edit*, EMPTYARG )
void AssistentDlgImpl::SelectTemplateRegion( const String& rRegion ) void AssistentDlgImpl::SelectTemplateRegion( const String& rRegion )
{ {
m_pPage1TemplateLB->Clear(); m_pPage1TemplateLB->Clear();
ULONG i = m_aPresentList.Count(); std::vector<TemplateDir*>::iterator I;
while( i > 0 ) for (I=m_aPresentList.begin(); I!=m_aPresentList.end(); I++)
{ {
i--; TemplateDir * pDir = *I;
TemplateDir* pDir = m_aPresentList.GetObject(i); m_pTemplateRegion = *I;
m_pTemplateRegion = pDir; if (pDir->m_aRegion.Equals( rRegion ) )
if( pDir->m_aRegion.Equals( rRegion ) )
{ {
for( i = 0; i < pDir->m_aEntrys.Count(); i++ ) std::vector<TemplateEntry*>::iterator J;
{ for (J=pDir->m_aEntries.begin(); J!=pDir->m_aEntries.end(); J++)
TemplateEntry* pEntry = pDir->m_aEntrys.GetObject(i); m_pPage1TemplateLB->InsertEntry ((*J)->m_aTitle);
m_pPage1TemplateLB->InsertEntry( pEntry->m_aTitle );
}
m_pPage1TemplateLB->Update(); m_pPage1TemplateLB->Update();
if(GetStartType() == ST_TEMPLATE) if(GetStartType() == ST_TEMPLATE)
{ {
...@@ -1469,20 +1243,17 @@ void AssistentDlgImpl::SelectLayoutRegion( const String& rRegion ) ...@@ -1469,20 +1243,17 @@ void AssistentDlgImpl::SelectLayoutRegion( const String& rRegion )
{ {
m_pPage2LayoutLB->Clear(); m_pPage2LayoutLB->Clear();
m_pPage2LayoutLB->InsertEntry(String(SdResId(STR_WIZARD_ORIGINAL))); m_pPage2LayoutLB->InsertEntry(String(SdResId(STR_WIZARD_ORIGINAL)));
ULONG i = m_aPresentList.Count(); std::vector<TemplateDir*>::iterator I;
while( i > 0 ) for (I=m_aPresentList.begin(); I!=m_aPresentList.end(); I++)
{ {
i--; TemplateDir * pDir = *I;
TemplateDir* pDir = m_aPresentList.GetObject(i); m_pLayoutRegion = *I;
m_pLayoutRegion = pDir;
if( pDir->m_aRegion.Equals( rRegion ) ) if (pDir->m_aRegion.Equals (rRegion))
{ {
for( i = 0; i < pDir->m_aEntrys.Count(); i++ ) std::vector<TemplateEntry*>::iterator J;
{ for (J=pDir->m_aEntries.begin(); J!=pDir->m_aEntries.end(); J++)
TemplateEntry* pEntry = pDir->m_aEntrys.GetObject(i); m_pPage2LayoutLB->InsertEntry ((*J)->m_aTitle);
m_pPage2LayoutLB->InsertEntry( pEntry->m_aTitle );
}
m_pPage2LayoutLB->Update(); m_pPage2LayoutLB->Update();
break; break;
} }
......
sd/source/ui/dlg/makefile.mk
Dosyayı görüntüle @ cdae06a6
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
# #
# $RCSfile: makefile.mk,v $ # $RCSfile: makefile.mk,v $
# #
# $Revision: 1.3 $ # $Revision: 1.4 $
# #
# last change: $Author: os $ $Date: 2001-04-04 06:56:19 $ # last change: $Author: af $ $Date: 2001-04-06 12:17:10 $
# #
# The Contents of this file are made available subject to the terms of # The Contents of this file are made available subject to the terms of
# either of the following licenses # either of the following licenses
...@@ -125,7 +125,8 @@ CXXFILES = $(PRJ)$/util$/sd.cxx \ ...@@ -125,7 +125,8 @@ CXXFILES = $(PRJ)$/util$/sd.cxx \
htmlattr.cxx \ htmlattr.cxx \
vectdlg.cxx \ vectdlg.cxx \
docprev.cxx \ docprev.cxx \
packgdlg.cxx packgdlg.cxx \
TemplateThread.cxx
SRCFILES =\ SRCFILES =\
ins_page.src\ ins_page.src\
...@@ -210,7 +211,11 @@ SLOFILES = \ ...@@ -210,7 +211,11 @@ SLOFILES = \
$(SLO)$/htmlattr.obj \ $(SLO)$/htmlattr.obj \
$(SLO)$/vectdlg.obj \ $(SLO)$/vectdlg.obj \
$(SLO)$/docprev.obj \ $(SLO)$/docprev.obj \
$(SLO)$/packgdlg.obj $(SLO)$/packgdlg.obj \
$(SLO)$/TemplateThread.obj
EXCEPTIONSFILES= \
$(SLO)$/TemplateThread.obj
.IF "$(GUI)" == "WIN" .IF "$(GUI)" == "WIN"
......
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