diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src index eb6b959741b3..8b90e5f309cc 100644 --- a/sd/source/ui/app/strings.src +++ b/sd/source/ui/app/strings.src @@ -1273,9 +1273,4 @@ String STR_PHOTO_ALBUM_EMPTY_WARNING Text [ en-US ] = "Please add Images to the Album." ; }; -String STR_PHOTO_ALBUM_TEXTBOX -{ - Text [ en-US ] = "Text Slide"; -}; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx index 351a9d8171ef..ba1164783737 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx @@ -45,8 +45,7 @@ SdPhotoAlbumDialog::SdPhotoAlbumDialog(Window* pWindow, SdDrawDocument* pActDoc) get(pCancelBtn, "cancel_btn"); get(pCreateBtn, "create_btn"); - get(pFileBtn, "file_btn"); - get(pTextBtn, "textbox_btn"); + get(pAddBtn, "add_btn"); get(pUpBtn, "up_btn"); get(pDownBtn, "down_btn"); get(pRemoveBtn, "rem_btn"); @@ -60,8 +59,7 @@ SdPhotoAlbumDialog::SdPhotoAlbumDialog(Window* pWindow, SdDrawDocument* pActDoc) pCancelBtn->SetClickHdl(LINK(this, SdPhotoAlbumDialog, CancelHdl)); pCreateBtn->SetClickHdl(LINK(this, SdPhotoAlbumDialog, CreateHdl)); - pFileBtn->SetClickHdl(LINK(this, SdPhotoAlbumDialog, FileHdl)); - pTextBtn->SetClickHdl(LINK(this, SdPhotoAlbumDialog, TextHdl)); + pAddBtn->SetClickHdl(LINK(this, SdPhotoAlbumDialog, FileHdl)); pUpBtn->SetClickHdl(LINK(this, SdPhotoAlbumDialog, UpHdl)); pUpBtn->Disable(); pDownBtn->SetClickHdl(LINK(this, SdPhotoAlbumDialog, DownHdl)); @@ -72,7 +70,7 @@ SdPhotoAlbumDialog::SdPhotoAlbumDialog(Window* pWindow, SdDrawDocument* pActDoc) mpGraphicFilter = new GraphicFilter; sDirUrl = ""; - pFileBtn->GrabFocus(); + pAddBtn->GrabFocus(); pImagesLst->Clear(); } @@ -610,22 +608,6 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, FileHdl) return 0; } -IMPL_LINK_NOARG(SdPhotoAlbumDialog, TextHdl) -{ - sal_Int16 nPos; - sal_Int16 nInsertPos = pImagesLst->GetSelectEntryPos(); - if (nInsertPos < 0) - nPos = pImagesLst->InsertEntry( OUString(SD_RESSTR(STR_PHOTO_ALBUM_TEXTBOX))); - else - nPos = pImagesLst->InsertEntry( OUString(SD_RESSTR(STR_PHOTO_ALBUM_TEXTBOX)), nInsertPos); - - OUString sStr(SD_RESSTR(STR_PHOTO_ALBUM_TEXTBOX)); - pImagesLst->SetEntryData(nPos, (void*)new OUString(sStr)); - - EnableDisableButtons(); - return 0; -} - IMPL_LINK_NOARG(SdPhotoAlbumDialog, UpHdl) { if (pImagesLst->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.hxx b/sd/source/ui/dlg/PhotoAlbumDialog.hxx index 3e751285beb1..d49ec34ffb9b 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.hxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.hxx @@ -54,8 +54,7 @@ private: CancelButton* pCancelBtn; PushButton* pCreateBtn; - PushButton* pFileBtn; - PushButton* pTextBtn; + PushButton* pAddBtn; PushButton* pUpBtn; PushButton* pDownBtn; PushButton* pRemoveBtn; diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc index 19816b985920..e59dbebcc2e8 100644 --- a/sd/source/ui/inc/strings.hrc +++ b/sd/source/ui/inc/strings.hrc @@ -416,7 +416,6 @@ #define STR_ACC_DIALOG_DESC (RID_APP_START+728) #define STR_PHOTO_ALBUM_EMPTY_WARNING (RID_APP_START+729) -#define STR_PHOTO_ALBUM_TEXTBOX (RID_APP_START+730) /****************************************************************************** * The ids in glob.hrc start at RID_APP_START+750! diff --git a/sd/uiconfig/simpress/ui/photoalbum.ui b/sd/uiconfig/simpress/ui/photoalbum.ui index 13760d3c7516..d1e7a6c527bb 100644 --- a/sd/uiconfig/simpress/ui/photoalbum.ui +++ b/sd/uiconfig/simpress/ui/photoalbum.ui @@ -58,57 +58,40 @@ - + True False + 6 True - 0 - none - + True False - 12 - 6 - True vertical - + + 300 + 200 True - False - 6 - start + True + True + True + in - - Insert Images - False + + 300 + 200 True True - True - False + True + True + liststore1 + 0 + both + + + - - False - True - 0 - True - - - - - Insert Text Slide - False - True - True - True - False - - - False - True - 1 - True - @@ -118,114 +101,38 @@ - + True False - 6 - True + start - + + gtk-add + False True - False - vertical - - - 300 - 200 - True - True - True - True - in - - - 300 - 200 - True - True - True - True - liststore1 - 0 - both - - - - - - - - False - True - 0 - - - - - True - False - start - - - gtk-go-up - False - True - True - True - Move Image Up - Move Image Up - False - True - - - False - True - 0 - - - - - gtk-go-down - False - True - True - True - Move Image Down - Move Image Down - False - True - - - False - True - 1 - - - - - gtk-remove - False - True - True - True - Remove Image from List - Remove Image from List - False - True - - - False - True - 2 - - - - - False - True - 1 - - + True + True + False + True + + + False + True + 0 + + + + + gtk-remove + False + True + True + True + True + Remove Image from List + Remove Image from List + False + True False @@ -234,125 +141,17 @@ - + + gtk-go-up + False True - False - 6 - vertical - - - True - False - 6 - 0 - Preview - - - - - - False - True - 0 - - - - - 200 - 150 - True - False - start - 0 - gtk-missing-image - - - False - True - 1 - - - - - True - False - 0 - Album Layout - - - - - - False - True - 2 - - - - - True - False - 12 - 6 - - - True - False - Slide Layout - opt_combo - - - False - True - 0 - - - - - 160 - True - False - liststore2 - 0 - - - - 0 - - - - - False - True - 1 - - - - - False - True - 3 - - - - - Keep Aspect Ratio - False - True - True - False - 12 - False - 0 - True - True - - - False - True - 4 - - + True + True + True + Move Image Up + Move Image Up + False + True False @@ -360,6 +159,25 @@ 2 + + + gtk-go-down + False + True + True + True + True + Move Image Down + Move Image Down + False + True + + + False + True + 3 + + False @@ -368,16 +186,138 @@ + + False + True + 1 + - - + + True False - Album Content - - - + 6 + vertical + + + True + False + 6 + 0 + Preview + + + + + + False + True + 0 + + + + + 200 + 150 + True + False + start + 0 + gtk-missing-image + + + False + True + 1 + + + + + True + False + 0 + Album Layout + + + + + + False + True + 2 + + + + + True + False + 12 + 6 + + + True + False + Slide Layout + opt_combo + + + False + True + 0 + + + + + 160 + True + False + liststore2 + 0 + + + + 0 + + + + + False + True + 1 + + + + + False + True + 3 + + + + + Keep Aspect Ratio + False + True + True + False + 12 + False + 0 + True + True + + + False + True + 4 + + + + False + True + 2 + @@ -393,12 +333,6 @@ cancel_btn - - - - - - @@ -419,4 +353,10 @@ + + + + + +