sd/source/ui/app/strings.src | 5 sd/source/ui/dlg/PhotoAlbumDialog.cxx | 24 - sd/source/ui/dlg/PhotoAlbumDialog.hxx | 3 sd/source/ui/inc/strings.hrc | 1 sd/uiconfig/simpress/ui/photoalbum.ui | 444 ++++++++++++++-------------------- 5 files changed, 196 insertions(+), 281 deletions(-)
New commits: commit 3c480196dd66df48f8ab637a2ac26ffbca328063 Author: Samuel Mehrbrodt <s.mehrbr...@gmail.com> Date: Sat May 11 20:16:30 2013 +0200 Related fdo#35546: Remove the "Text box" function from Photo Album Dialog This has been discussed and approved in the Design Team IRC Chat on 2013-05-11 Change-Id: I70b861c09af2dfa79c9f773a47791b101888c8f9 Reviewed-on: https://gerrit.libreoffice.org/3857 Reviewed-by: Bosdonnat Cedric <cedric.bosdon...@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdon...@free.fr> diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src index eb6b959..8b90e5f 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 351a9d8..ba11647 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 3e75128..d49ec34 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 19816b9..e59dbeb 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 13760d3..d1e7a6c 100644 --- a/sd/uiconfig/simpress/ui/photoalbum.ui +++ b/sd/uiconfig/simpress/ui/photoalbum.ui @@ -58,58 +58,156 @@ </packing> </child> <child> - <object class="GtkFrame" id="frame1"> + <object class="GtkBox" id="box4"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_top">6</property> <property name="vexpand">True</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> <child> - <object class="GtkBox" id="box2"> + <object class="GtkBox" id="box1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">12</property> - <property name="margin_top">6</property> - <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="GtkButtonBox" id="buttonbox2"> + <object class="GtkScrolledWindow" id="scrolledwindow1"> + <property name="width_request">300</property> + <property name="height_request">200</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="images_tree"> + <property name="width_request">300</property> + <property name="height_request">200</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="model">liststore1</property> + <property name="search_column">0</property> + <property name="enable_grid_lines">both</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection"/> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButtonBox" id="buttonbox1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> <property name="layout_style">start</property> <child> - <object class="GtkButton" id="file_btn"> - <property name="label" translatable="yes">Insert Images</property> + <object class="GtkButton" id="add_btn"> + <property name="label">gtk-add</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="use_action_appearance">False</property> + <property name="use_stock">True</property> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> <property name="position">0</property> - <property name="non_homogeneous">True</property> </packing> </child> <child> - <object class="GtkButton" id="textbox_btn"> - <property name="label" translatable="yes">Insert Text Slide</property> + <object class="GtkButton" id="rem_btn"> + <property name="label">gtk-remove</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="has_tooltip">True</property> + <property name="tooltip_markup" translatable="yes">Remove Image from List</property> + <property name="tooltip_text" translatable="yes">Remove Image from List</property> <property name="use_action_appearance">False</property> + <property name="use_stock">True</property> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> <property name="position">1</property> - <property name="non_homogeneous">True</property> </packing> </child> + <child> + <object class="GtkButton" id="up_btn"> + <property name="label">gtk-go-up</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="has_tooltip">True</property> + <property name="tooltip_markup" translatable="yes">Move Image Up</property> + <property name="tooltip_text" translatable="yes">Move Image Up</property> + <property name="use_action_appearance">False</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="down_btn"> + <property name="label">gtk-go-down</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="has_tooltip">True</property> + <property name="tooltip_markup" translatable="yes">Move Image Down</property> + <property name="tooltip_text" translatable="yes">Move Image Down</property> + <property name="use_action_appearance">False</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_left">6</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_bottom">6</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Preview</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> <packing> <property name="expand">False</property> @@ -118,266 +216,108 @@ </packing> </child> <child> - <object class="GtkBox" id="box4"> + <object class="GtkImage" id="preview_img"> + <property name="width_request">200</property> + <property name="height_request">150</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_top">6</property> - <property name="vexpand">True</property> + <property name="valign">start</property> + <property name="yalign">0</property> + <property name="stock">gtk-missing-image</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Album Layout</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_left">12</property> + <property name="spacing">6</property> <child> - <object class="GtkBox" id="box1"> + <object class="GtkLabel" id="label7"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow1"> - <property name="width_request">300</property> - <property name="height_request">200</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTreeView" id="images_tree"> - <property name="width_request">300</property> - <property name="height_request">200</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="model">liststore1</property> - <property name="search_column">0</property> - <property name="enable_grid_lines">both</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection"/> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButtonBox" id="buttonbox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="layout_style">start</property> - <child> - <object class="GtkButton" id="up_btn"> - <property name="label">gtk-go-up</property> - <property name="use_action_appearance">False</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_markup" translatable="yes">Move Image Up</property> - <property name="tooltip_text" translatable="yes">Move Image Up</property> - <property name="use_action_appearance">False</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="down_btn"> - <property name="label">gtk-go-down</property> - <property name="use_action_appearance">False</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_markup" translatable="yes">Move Image Down</property> - <property name="tooltip_text" translatable="yes">Move Image Down</property> - <property name="use_action_appearance">False</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="rem_btn"> - <property name="label">gtk-remove</property> - <property name="use_action_appearance">False</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_markup" translatable="yes">Remove Image from List</property> - <property name="tooltip_text" translatable="yes">Remove Image from List</property> - <property name="use_action_appearance">False</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="label" translatable="yes">Slide Layout</property> + <property name="mnemonic_widget">opt_combo</property> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkBox" id="box3"> + <object class="GtkComboBox" id="opt_combo"> + <property name="width_request">160</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">6</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_bottom">6</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Preview</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkImage" id="preview_img"> - <property name="width_request">200</property> - <property name="height_request">150</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">start</property> - <property name="yalign">0</property> - <property name="stock">gtk-missing-image</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Album Layout</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">12</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label7"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Slide Layout</property> - <property name="mnemonic_widget">opt_combo</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="opt_combo"> - <property name="width_request">160</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="model">liststore2</property> - <property name="active">0</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext1"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> + <property name="model">liststore2</property> + <property name="active">0</property> <child> - <object class="GtkCheckButton" id="asr_check"> - <property name="label" translatable="yes">Keep Aspect Ratio</property> - <property name="use_action_appearance">False</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="margin_left">12</property> - <property name="use_action_appearance">False</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="asr_check"> + <property name="label" translatable="yes">Keep Aspect Ratio</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="margin_left">12</property> + <property name="use_action_appearance">False</property> + <property name="xalign">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> </packing> </child> </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Album Content</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> </object> <packing> @@ -393,12 +333,6 @@ <action-widget response="0">cancel_btn</action-widget> </action-widgets> </object> - <object class="GtkListStore" id="liststore1"> - <columns> - <!-- column-name Filename --> - <column type="gchararray"/> - </columns> - </object> <object class="GtkListStore" id="liststore2"> <columns> <!-- column-name Property --> @@ -419,4 +353,10 @@ </row> </data> </object> + <object class="GtkListStore" id="liststore1"> + <columns> + <!-- column-name Filename --> + <column type="gchararray"/> + </columns> + </object> </interface> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits