Kaydet (Commit) d80f1a63 authored tarafından Vladimir Glazounov's avatar Vladimir Glazounov

INTEGRATION: CWS asyncdialogs (1.4.22); FILE MERGED

2006/10/31 14:56:23 pb 1.4.22.4: RESYNC: (1.6-1.7); FILE MERGED
2006/07/12 15:50:59 pb 1.4.22.3: RESYNC: (1.5-1.6); FILE MERGED
2005/12/08 00:44:33 kso 1.4.22.2: RESYNC: (1.4-1.5); FILE MERGED
2005/11/01 14:28:22 kso 1.4.22.1: #i57125# - dialog adaptions for Threading Framework.
üst b2e7c13a
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: cuigaldlg.hxx,v $ * $RCSfile: cuigaldlg.hxx,v $
* *
* $Revision: 1.7 $ * $Revision: 1.8 $
* *
* last change: $Author: obo $ $Date: 2006-10-12 12:09:23 $ * last change: $Author: vg $ $Date: 2006-11-22 10:34:34 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -56,6 +56,12 @@ ...@@ -56,6 +56,12 @@
#ifndef _COM_SUN_STAR_MEDIA_XPLAYER_HPP_ #ifndef _COM_SUN_STAR_MEDIA_XPLAYER_HPP_
#include <com/sun/star/media/XPlayer.hpp> #include <com/sun/star/media/XPlayer.hpp>
#endif #endif
#ifndef _COM_SUN_STAR_UI_XFOLDERPICKER_HPP_
#include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
#endif
#ifndef _SVTOOLS_DIALOGCLOSEDLISTENER_HXX
#include <svtools/dialogclosedlistener.hxx>
#endif
// ------------ // ------------
// - Forwards - // - Forwards -
...@@ -76,18 +82,6 @@ struct FilterEntry ...@@ -76,18 +82,6 @@ struct FilterEntry
String aFilterName; String aFilterName;
}; };
//CHINA001 // ----------------
//CHINA001 // - ExchangeData -
//CHINA001 // ----------------
//CHINA001
//CHINA001 struct ExchangeData
//CHINA001 {
//CHINA001 GalleryTheme* pTheme;
//CHINA001 String aEditedTitle;
//CHINA001 Date aThemeChangeDate;
//CHINA001 Time aThemeChangeTime;
//CHINA001 };
// ---------------- // ----------------
// - SearchThread - // - SearchThread -
// ---------------- // ----------------
...@@ -140,6 +134,7 @@ public: ...@@ -140,6 +134,7 @@ public:
DECL_LINK( CleanUpHdl, void* ); DECL_LINK( CleanUpHdl, void* );
virtual short Execute(); virtual short Execute();
virtual void StartExecuteModal( const Link& rEndDialogHdl );
void SetFileType( const String& rType ) { aFtSearchType.SetText( rType ); } void SetFileType( const String& rType ) { aFtSearchType.SetText( rType ); }
void SetDirectory( const INetURLObject& rURL ) { aFtSearchDir.SetText( GetReducedString( rURL, 30 ) ); } void SetDirectory( const INetURLObject& rURL ) { aFtSearchDir.SetText( GetReducedString( rURL, 30 ) ); }
}; };
...@@ -191,6 +186,7 @@ public: ...@@ -191,6 +186,7 @@ public:
void SetFile( const INetURLObject& rURL ) { aFtTakeFile.SetText( GetReducedString( rURL, 30 ) ); } void SetFile( const INetURLObject& rURL ) { aFtTakeFile.SetText( GetReducedString( rURL, 30 ) ); }
virtual short Execute(); virtual short Execute();
virtual void StartExecuteModal( const Link& rEndDialogHdl );
}; };
// --------------------- // ---------------------
...@@ -350,7 +346,9 @@ class TPGalleryThemeProperties : public SfxTabPage ...@@ -350,7 +346,9 @@ class TPGalleryThemeProperties : public SfxTabPage
BOOL bTakeAll; BOOL bTakeAll;
BOOL bSearchRecursive; BOOL bSearchRecursive;
::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > xMediaPlayer; ::com::sun::star::uno::Reference< ::svt::DialogClosedListener > xDialogListener;
::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > xMediaPlayer;
::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFolderPicker > xFolderPicker;
virtual void Reset( const SfxItemSet& /*rSet*/ ) {} virtual void Reset( const SfxItemSet& /*rSet*/ ) {}
virtual BOOL FillItemSet( SfxItemSet& /*rSet*/ ) { return TRUE; } virtual BOOL FillItemSet( SfxItemSet& /*rSet*/ ) { return TRUE; }
...@@ -371,6 +369,8 @@ class TPGalleryThemeProperties : public SfxTabPage ...@@ -371,6 +369,8 @@ class TPGalleryThemeProperties : public SfxTabPage
DECL_LINK( SelectFileTypeHdl, void* ); DECL_LINK( SelectFileTypeHdl, void* );
DECL_LINK( DClickFoundHdl, void* ); DECL_LINK( DClickFoundHdl, void* );
DECL_LINK( PreviewTimerHdl, void* ); DECL_LINK( PreviewTimerHdl, void* );
DECL_LINK( EndSearchProgressHdl, SearchProgress* );
DECL_LINK( DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent* );
public: public:
TPGalleryThemeProperties( Window* pWindow, const SfxItemSet& rSet ); TPGalleryThemeProperties( Window* pWindow, const SfxItemSet& rSet );
...@@ -379,6 +379,8 @@ public: ...@@ -379,6 +379,8 @@ public:
void SetXChgData( ExchangeData* pData ); void SetXChgData( ExchangeData* pData );
const ExchangeData* GetXChgData() const { return pData; } const ExchangeData* GetXChgData() const { return pData; }
void StartSearchFiles( const String& _rFolderURL, short _nDlgResult );
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
}; };
......
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