diff options
author | Gergő Mocsi <gmocsi91@gmail.com> | 2013-04-02 12:57:59 +0200 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2013-04-10 15:00:25 +0000 |
commit | 3a56257e858c6793156a78b387451802593455e0 (patch) | |
tree | 2e766f7b5dbb9a223f61731851e07e5655635b7e /sd/source/ui/view | |
parent | 857adeada9cc3276e79ceb828959a3ffe2d7409b (diff) |
Create Photo Album implementation
Added a checkbox to enable/diable Keep Aspect ratio.
Options 2 images/slide, 4 images/slide implemented.
UI tweaks: dialog window remembers last used directory (via config),
buttons get enabled/disabled according to the content of the ListBox.
ListBox show filename only, full path is shown lower in a label.
Dialog window reopens again, if slide preview is not in focus.
Added a title slide: author, title.
Conflicts:
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
sd/uiconfig/simpress/ui/photoalbum.ui
Change-Id: I68d2a3e00f8c55b909fe4d98aa3958188653390e
Reviewed-on: https://gerrit.libreoffice.org/3169
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
Diffstat (limited to 'sd/source/ui/view')
-rw-r--r-- | sd/source/ui/view/drviews6.cxx | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index 8a136d707afa..caadb1ee3ac9 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -687,14 +687,18 @@ void DrawViewShell::FuTemp04(SfxRequest& rReq) case SID_PHOTOALBUM: { - SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); - VclAbstractDialog* pDlg = pFact ? pFact->CreateSdPhotoAlbumDialog(GetActiveWindow(), - GetDoc() - ) : 0; - if (pDlg) - { - pDlg->Execute(); - } + SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); + VclAbstractDialog* pDlg = pFact ? pFact->CreateSdPhotoAlbumDialog( + GetActiveWindow(), + GetDoc()) : 0; + + if (pDlg) + { + pDlg->Execute(); + delete pDlg; + } + Cancel(); + rReq.Ignore (); } break; |