diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-03-12 12:12:36 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-12 12:32:58 +0000 |
commit | 6ba8668e08813948cf931084d251a724224ba11b (patch) | |
tree | ee2ce571f6dc715ae6abfae2cb5985e21593df9a /cui/source/dialogs | |
parent | 5bd78e4c5ceaa27a5180fcc66e87091b302abe71 (diff) |
convert gallery apply progress dialog to .ui
Change-Id: I1fd2f2f1faa51346eb68445688fb5e1ef85b7124
Diffstat (limited to 'cui/source/dialogs')
-rw-r--r-- | cui/source/dialogs/cuigaldlg.cxx | 26 | ||||
-rw-r--r-- | cui/source/dialogs/gallery.src | 34 |
2 files changed, 8 insertions, 52 deletions
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 1550acc2fce4..b96a0915921b 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -334,23 +334,17 @@ void TakeThread::execute() Application::PostUserEvent( LINK( mpProgress, TakeProgress, CleanUpHdl ) ); } - // - TakeProgress - - - -TakeProgress::TakeProgress( Window* pWindow ) : - ModalDialog ( pWindow, CUI_RES( RID_SVXDLG_GALLERY_TAKE_PROGRESS ) ), - aFtTakeFile ( this, CUI_RES( FT_TAKE_FILE ) ), - aFLTakeProgress( this, CUI_RES( FL_TAKE_PROGRESS ) ), - aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ), - window_(pWindow) +TakeProgress::TakeProgress(Window* pWindow) + : ModalDialog(pWindow, "GalleryApplyProgress", + "cui/ui/galleryapplyprogress.ui") + , window_(pWindow) { - FreeResource(); - aBtnCancel.SetClickHdl( LINK( this, TakeProgress, ClickCancelBtn ) ); -} - - + get(m_pFtTakeFile, "file"); + get(m_pBtnCancel, "cancel"); + m_pBtnCancel->SetClickHdl( LINK( this, TakeProgress, ClickCancelBtn ) ); +} void TakeProgress::Terminate() { @@ -358,16 +352,12 @@ void TakeProgress::Terminate() maTakeThread->terminate(); } - - IMPL_LINK_NOARG(TakeProgress, ClickCancelBtn) { Terminate(); return 0L; } - - IMPL_LINK_NOARG(TakeProgress, CleanUpHdl) { if (maTakeThread.is()) diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src index 9bc902be7841..3dbb814b7ff6 100644 --- a/cui/source/dialogs/gallery.src +++ b/cui/source/dialogs/gallery.src @@ -22,38 +22,6 @@ #include "gallery.hrc" #include <svx/exthelpid.hrc> -#define MASKCOLOR MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; - -ModalDialog RID_SVXDLG_GALLERY_TAKE_PROGRESS -{ - HelpId = HID_GALLERY_APPLY ; - OutputSize = TRUE ; - Border = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 124 , 56 ) ; - Text [ en-US ] = "Apply" ; - Moveable = TRUE ; - FixedLine FL_TAKE_PROGRESS - { - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 112 , 8 ) ; - Text [ en-US ] = "File" ; - }; - FixedText FT_TAKE_FILE - { - Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 100 , 10 ) ; - }; - CancelButton BTN_CANCEL - { - Pos = MAP_APPFONT ( 37 , 36 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; -}; - -/******************************************************************************/ - String RID_SVXSTR_GALLERY_NOFILES { Text [ en-US ] = "<No Files>" ; @@ -75,8 +43,6 @@ String RID_SVXSTR_GALLERY_ID_EXISTS Text [ en-US ] = "This ID already exists..." ; }; -/******************************************************************************/ - Bitmap RID_SVXBMP_THEME_NORMAL_BIG { File = "galnorl.bmp" ; |