mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Related fdo#35546: Remove the "Text box" function from Photo Album Dialog

Browse Source 
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.bosdonnat@free.fr>
Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
This commit is contained in:
Samuel Mehrbrodt
2013-05-11 20:16:30 +02:00
committed by Bosdonnat Cedric
parent ba489418be
commit 3c480196dd
5 changed files with 216 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sd/source/ui/app/strings.src
View File

@@ -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: */

24
sd/source/ui/dlg/PhotoAlbumDialog.cxx
View File

@@ -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

3
sd/source/ui/dlg/PhotoAlbumDialog.hxx
View File

@@ -54,8 +54,7 @@ private:
CancelButton* pCancelBtn;
PushButton* pCreateBtn;
PushButton* pFileBtn;
PushButton* pTextBtn;
PushButton* pAddBtn;
PushButton* pUpBtn;
PushButton* pDownBtn;
PushButton* pRemoveBtn;

1
sd/source/ui/inc/strings.hrc
View File

@@ -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!

134
sd/uiconfig/simpress/ui/photoalbum.ui
View File

@@ -57,66 +57,6 @@
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkBox" id="box2">
<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">
<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>
<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>
</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>
<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>
</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>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box4">
<property name="visible">True</property>
@@ -166,14 +106,12 @@
<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>
<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="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>
@@ -184,14 +122,15 @@
</packing>
</child>
<child>
<object class="GtkButton" id="down_btn">
<property name="label">gtk-go-down</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="tooltip_markup" translatable="yes">Move Image Down</property>
<property name="tooltip_text" translatable="yes">Move Image Down</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>
@@ -202,14 +141,15 @@
</packing>
</child>
<child>
<object class="GtkButton" id="rem_btn">
<property name="label">gtk-remove</property>
<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">Remove Image from List</property>
<property name="tooltip_text" translatable="yes">Remove Image from List</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>
@@ -219,6 +159,25 @@
<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>
@@ -369,36 +328,11 @@
</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>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
<action-widgets>
<action-widget response="0">create_btn</action-widget>
<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>