Hi, I have submitted a patch for review:
https://gerrit.libreoffice.org/2582 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/82/2582/1 fdo#35546, in progress Created the dialog window (called photoalbum.ui), and started to integrate it. Change-Id: I14b337187dc5d373fcd28489098fda813b5fd5f6 --- M officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu M sd/AllLangResTarget_sd.mk M sd/Library_sdui.mk M sd/UI_simpress.mk M sd/inc/app.hrc M sd/inc/sdabstdlg.hxx M sd/inc/sdcommands.h M sd/sdi/outlnvsh.sdi M sd/sdi/sdraw.sdi A sd/source/ui/dlg/PhotoAlbumDialog.cxx A sd/source/ui/dlg/PhotoAlbumDialog.hxx A sd/source/ui/dlg/PhotoAlbumDialog.src M sd/source/ui/dlg/sddlgfact.cxx M sd/source/ui/dlg/sddlgfact.hxx A sd/source/ui/inc/PhotoAlbumDialog.hrc M sd/source/ui/view/drviews6.cxx M sd/uiconfig/simpress/menubar/menubar.xml A sd/uiconfig/simpress/ui/photoalbum/photoalbum.ui M sd/uiconfig/simpress/ui/printeroptions.ui 19 files changed, 629 insertions(+), 2 deletions(-) diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index d52bafc..e1fe537 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -60,6 +60,15 @@ <value>1</value> </prop> </node> + <node oor:name=".uno:PhotoAlbumDialog" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + + <value xml:lang="en-US">Create Photo Album</value> + </prop> + <prop oor:name="Properties" oor:type="xs:int"> + <value>1</value> + </prop> + </node> <node oor:name=".uno:Dia" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk index 4068afc..d736f51 100644 --- a/sd/AllLangResTarget_sd.mk +++ b/sd/AllLangResTarget_sd.mk @@ -97,6 +97,7 @@ sd/source/ui/dlg/tpaction.src \ sd/source/ui/dlg/tpoption.src \ sd/source/ui/dlg/vectdlg.src \ + sd/source/ui/dlg/PhotoAlbumDialog.src \ sd/source/ui/slideshow/slideshow.src \ sd/source/ui/table/TableDesignPane.src \ sd/source/ui/view/DocumentRenderer.src \ diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk index 601fb2a..d24dfb1 100644 --- a/sd/Library_sdui.mk +++ b/sd/Library_sdui.mk @@ -106,6 +106,7 @@ sd/source/ui/dlg/tpaction \ sd/source/ui/dlg/tpoption \ sd/source/ui/dlg/vectdlg \ + sd/source/ui/dlg/PhotoAlbumDialog \ )) # $(WORKDIR)/inc/sd/sddll0.hxx : diff --git a/sd/UI_simpress.mk b/sd/UI_simpress.mk index 3ddeac9..592251c 100644 --- a/sd/UI_simpress.mk +++ b/sd/UI_simpress.mk @@ -11,6 +11,7 @@ $(eval $(call gb_UI_add_uifiles,modules/simpress,\ sd/uiconfig/simpress/ui/printeroptions \ + sd/uiconfig/simpress/ui/photoalbum/photoalbum \ )) # vim: set noet sw=4 ts=4: diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc index 950a930..b74d308 100644 --- a/sd/inc/app.hrc +++ b/sd/inc/app.hrc @@ -213,7 +213,6 @@ #define SID_LINE_ARROW_SQUARE (SID_SD_START+177) #define SID_LINE_SQUARE_ARROW (SID_SD_START+178) // und noch weitere... - #define ID_VAL_ENDINTENS (SID_SD_START+197) #define ID_VAL_STARTINTENS (SID_SD_START+198) #define ID_VAL_BORDER (SID_SD_START+199) @@ -355,6 +354,7 @@ #define SID_CUSTOM_ANIMATION_SCHEMES_PANEL (SID_SD_START+333) #define SID_SLIDE_TRANSITIONS_PANEL (SID_SD_START+334) // free +#define SID_PHOTOALBUM (SID_SD_START+336) #define SID_REMOTE_DLG (SID_SD_START+337) #define SID_CONNECTION_DLG (SID_SD_START+338) #define SID_PRESENTATION_DLG (SID_SD_START+339) diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx index b3cde08..96be39f 100644 --- a/sd/inc/sdabstdlg.hxx +++ b/sd/inc/sdabstdlg.hxx @@ -213,6 +213,8 @@ virtual CreateTabPage GetSdOptionsMiscTabPageCreatorFunc() = 0; virtual CreateTabPage GetSdOptionsSnapTabPageCreatorFunc() = 0; + virtual VclAbstractDialog* CreateSdPhotoAlbumDialog( ::Window* pWindow); + protected: ~SdAbstractDialogFactory() {} }; diff --git a/sd/inc/sdcommands.h b/sd/inc/sdcommands.h index 32a065f..daecfe8 100644 --- a/sd/inc/sdcommands.h +++ b/sd/inc/sdcommands.h @@ -116,6 +116,7 @@ #define CMD_SID_TP_SHOW_LARGE_PREVIEW ".uno:TaskPaneShowLargePreview" #define CMD_SID_TP_EDIT_MASTER ".uno:TaskPaneEditMaster" #define CMD_SID_INSERTPAGE_LAYOUT_MENU ".uno:TaskPaneInsertPage" +#define CMD_SID_PHOTOALBUM ".uno:PhotoAlbumDialog" #endif diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi index dbe34ed..1c8c5b9 100644 --- a/sd/sdi/outlnvsh.sdi +++ b/sd/sdi/outlnvsh.sdi @@ -527,6 +527,10 @@ ExecMethod = Execute ; StateMethod = GetMenuState ; ] + SID_PHOTOALBUM + [ + ExecMethod = FuTemporary; + ] } shell OutlineViewShell diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi index d59d62d..83b4d04 100644 --- a/sd/sdi/sdraw.sdi +++ b/sd/sdi/sdraw.sdi @@ -7227,3 +7227,27 @@ ToolBoxConfig = FALSE, GroupId = GID_VIEW; ] +//-------------------------------------------------------------------------- +SfxVoidItem PhotoAlbumDialog SID_PHOTOALBUM +() +[ + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = TRUE, + HasCoreId = FALSE, + HasDialog = TRUE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerItem; + Synchron; + + /* config: */ + AccelConfig = FALSE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, + GroupId = GID_OPTIONS; +] diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx new file mode 100644 index 0000000..e5c6209 --- /dev/null +++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx @@ -0,0 +1,37 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of LibreOffice. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + */ +#include "sdattr.hxx" +#include "sdresid.hxx" +#include "cusshow.hxx" + +#include "PhotoAlbumDialog.hxx" +#include "PhotoAlbumDialog.src" +#include "PhotoAlbumDialog.hrc" + +using namespace ::sd; + +SdPhotoAlbumDialog::SdPhotoAlbumDialog(Window* pWindow) +: ModalDialog(pWindow, SdResId( DLG_PHOTOALBUM )) +{ + FreeResource(); +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.hxx b/sd/source/ui/dlg/PhotoAlbumDialog.hxx new file mode 100644 index 0000000..5a2bafe --- /dev/null +++ b/sd/source/ui/dlg/PhotoAlbumDialog.hxx @@ -0,0 +1,43 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of LibreOffice. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + */ + +#ifndef _SD_PHOTOALBUMDIALOG_HXX +#define _SD_PHOTOALBUMDIALOG_HXX + +#include <vcl/lstbox.hxx> +#include <vcl/fixed.hxx> +#include <vcl/button.hxx> +#include <vcl/dialog.hxx> +#include <vcl/field.hxx> + +namespace sd +{ + +class SdPhotoAlbumDialog : public ModalDialog +{ +public: + SdPhotoAlbumDialog(Window* pWindow); +}; + +} + +#endif // _SD_PHOTOALBUMDIALOG_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.src b/sd/source/ui/dlg/PhotoAlbumDialog.src new file mode 100644 index 0000000..e2fce8e --- /dev/null +++ b/sd/source/ui/dlg/PhotoAlbumDialog.src @@ -0,0 +1,35 @@ +/* + * This file is part of LibreOffice. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + */ + +#include "helpids.h" +#include <svx/svxids.hrc> +#include "PhotoAlbumDialog.hrc" + +ModalDialog DLG_PHOTOALBUM +{ + + HelpID = CMD_SID_PHOTOALBUM ; + OutputSize = TRUE ; + SVLook = TRUE ; + Size = MAP_APPFONT ( 256, 205 ) ; + Text [ en-US ] = "Create Photo Album" ; + Moveable = TRUE ; + +}; diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index 5084268..4e02408 100644 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -51,6 +51,7 @@ #include "pubdlg.hxx" #include "masterlayoutdlg.hxx" #include "headerfooterdlg.hxx" +#include "PhotoAlbumDialog.hxx" IMPL_ABSTDLG_BASE(SdVclAbstractDialog_Impl); IMPL_ABSTDLG_BASE(AbstractCopyDlg_Impl); @@ -578,5 +579,9 @@ return new AbstractHeaderFooterDialog_Impl( new ::sd::HeaderFooterDialog( (::sd::ViewShell*)pViewShell, pParent, pDoc, pCurrentPage )); } +VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateSdPhotoAlbumDialog( ::Window* pWindow ) +{ + return new SdVclAbstractDialog_Impl( new ::sd::SdPhotoAlbumDialog( pWindow ) ); +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx index 287f7a2..0926341 100644 --- a/sd/source/ui/dlg/sddlgfact.hxx +++ b/sd/source/ui/dlg/sddlgfact.hxx @@ -244,8 +244,8 @@ virtual void Apply( TabPage* pPage ); virtual void Cancel( TabPage* pPage ); }; - //------------------------------------------------------------------------ + //AbstractDialogFactory_Impl implementations class SdAbstractDialogFactory_Impl : public SdAbstractDialogFactory { @@ -277,6 +277,8 @@ virtual AbstractSdVectorizeDlg* CreateSdVectorizeDlg( ::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ); virtual AbstractSdPublishingDlg* CreateSdPublishingDlg( ::Window* pWindow, DocumentType eDocType); + virtual VclAbstractDialog* CreateSdPhotoAlbumDialog( ::Window* pWindow); + virtual VclAbstractDialog* CreateMasterLayoutDialog( ::Window* pParent, SdDrawDocument* pDoc, SdPage* ); // add for MasterLayoutDialog @@ -291,6 +293,7 @@ virtual CreateTabPage GetSdPrintOptionsTabPageCreatorFunc(); virtual CreateTabPage GetSdOptionsMiscTabPageCreatorFunc(); virtual CreateTabPage GetSdOptionsSnapTabPageCreatorFunc(); + }; #endif diff --git a/sd/source/ui/inc/PhotoAlbumDialog.hrc b/sd/source/ui/inc/PhotoAlbumDialog.hrc new file mode 100644 index 0000000..64da3a8 --- /dev/null +++ b/sd/source/ui/inc/PhotoAlbumDialog.hrc @@ -0,0 +1,11 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ +#include <sfx2/sfx.hrc> + +#define DLG_PHOTOALBUM RID_APP_START+701 diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index 13b0b6a..1d0111d 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -709,6 +709,15 @@ } break; + case SID_PHOTOALBUM: + { + SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); + VclAbstractDialog* pDlg = pFact ? pFact->CreateSdPhotoAlbumDialog(GetActiveWindow()) : 0; + if (pDlg) + pDlg->Execute(); + } + break; + default: { DBG_ASSERT( 0, "Slot ohne Funktion" ); diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index 9fd07b1..55d860f 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -215,6 +215,8 @@ <menu:menuitem menu:id=".uno:InsertObjectFloatingFrame"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ImportFromFile"/> + <menu:menuseparator/> + <menu:menuitem menu:id=".uno.PhotoAlbumDialog"/> </menu:menupopup> </menu:menu> <menu:menu menu:id=".uno:FormatMenu"> diff --git a/sd/uiconfig/simpress/ui/photoalbum/photoalbum.ui b/sd/uiconfig/simpress/ui/photoalbum/photoalbum.ui new file mode 100644 index 0000000..a0fe148 --- /dev/null +++ b/sd/uiconfig/simpress/ui/photoalbum/photoalbum.ui @@ -0,0 +1,422 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <!-- interface-requires gtk+ 3.0 --> + <object class="GtkListStore" id="liststore1"> + <columns> + <!-- column-name Filename --> + <column type="gchararray"/> + </columns> + </object> + <object class="GtkListStore" id="liststore2"> + <columns> + <!-- column-name Property --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">Fit to slide</col> + </row> + <row> + <col id="0" translatable="yes">1 image</col> + </row> + <row> + <col id="0" translatable="yes">2 images</col> + </row> + <row> + <col id="0" translatable="yes">4 images</col> + </row> + </data> + </object> + <object class="GtkDialog" id="photoalbum_dialog"> + <property name="can_focus">False</property> + <property name="border_width">5</property> + <property name="title" translatable="yes">Photo Album Creator</property> + <property name="resizable">False</property> + <property name="window_position">center</property> + <property name="type_hint">dialog</property> + <property name="has_resize_grip">False</property> + <child internal-child="vbox"> + <object class="GtkBox" id="dialog-vbox1"> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">2</property> + <child internal-child="action_area"> + <object class="GtkButtonBox" id="dialog-action_area1"> + <property name="can_focus">False</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="create_btn"> + <property name="label" translatable="yes">Create</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> + </packing> + </child> + <child> + <object class="GtkButton" id="cancel_btn"> + <property name="label" translatable="yes">Cancel</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> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkFrame" id="frame1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="left_padding">12</property> + <child> + <object class="GtkGrid" id="grid1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_homogeneous">True</property> + <child> + <object class="GtkGrid" id="grid2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkImage" id="preview_img"> + <property name="width_request">140</property> + <property name="height_request">144</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-missing-image</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Preview:</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkGrid" id="grid3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">3</property> + <property name="column_spacing">3</property> + <child> + <object class="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Images:</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkTreeView" id="images_tree"> + <property name="height_request">84</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="model">liststore1</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</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" translatable="yes">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="use_action_appearance">False</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" translatable="yes">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="use_action_appearance">False</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" translatable="yes">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="use_action_appearance">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkGrid" id="grid4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">3</property> + <property name="column_spacing">3</property> + <child> + <object class="GtkButton" id="file_btn"> + <property name="label" translatable="yes">File/Folder</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="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="textbox_btn"> + <property name="label" translatable="yes">New Text Box</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="left_attach">0</property> + <property name="top_attach">3</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Insert from:</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Insert text:</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + </object> + </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"><b>Album Content</b></property> + <property name="use_markup">False</property> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="frame2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="left_padding">12</property> + <child> + <object class="GtkGrid" id="grid5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="column_spacing">5</property> + <child> + <object class="GtkLabel" id="label7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Picture layout:</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</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="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes"><b>Album Layout</b></property> + <property name="use_markup">False</property> + </object> + </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">True</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> +</interface> diff --git a/sd/uiconfig/simpress/ui/printeroptions.ui b/sd/uiconfig/simpress/ui/printeroptions.ui index 838b5c0..259655f 100644 --- a/sd/uiconfig/simpress/ui/printeroptions.ui +++ b/sd/uiconfig/simpress/ui/printeroptions.ui @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . +--> <interface> <!-- interface-requires gtk+ 3.0 --> <object class="GtkBox" id="box"> -- To view, visit https://gerrit.libreoffice.org/2582 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I14b337187dc5d373fcd28489098fda813b5fd5f6 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Gergő Mocsi <gmocs...@gmail.com> _______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice