diff options
-rw-r--r-- | sd/AllLangResTarget_sd.mk | 1 | ||||
-rw-r--r-- | sd/UIConfig_simpress.mk | 1 | ||||
-rw-r--r-- | sd/inc/helpids.h | 3 | ||||
-rw-r--r-- | sd/source/ui/dlg/custsdlg.cxx | 1 | ||||
-rw-r--r-- | sd/source/ui/dlg/custsdlg.src | 113 | ||||
-rw-r--r-- | sd/source/ui/inc/custsdlg.hrc | 37 | ||||
-rw-r--r-- | sd/uiconfig/simpress/ui/customslideshows.ui | 2 | ||||
-rw-r--r-- | sd/uiconfig/simpress/ui/definecustomslideshow.ui | 36 |
8 files changed, 20 insertions, 174 deletions
diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk index 1867194de6f4..5f25e41d6af4 100644 --- a/sd/AllLangResTarget_sd.mk +++ b/sd/AllLangResTarget_sd.mk @@ -46,7 +46,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\ sd/source/ui/app/toolbox.src \ sd/source/ui/dlg/animobjs.src \ sd/source/ui/dlg/brkdlg.src \ - sd/source/ui/dlg/custsdlg.src \ sd/source/ui/dlg/dlgass.src \ sd/source/ui/dlg/dlg_char.src \ sd/source/ui/dlg/dlgfield.src \ diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk index a90886a61355..f5d088fdc422 100644 --- a/sd/UIConfig_simpress.mk +++ b/sd/UIConfig_simpress.mk @@ -70,6 +70,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/simpress,\ )) $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\ + sd/uiconfig/simpress/ui/definecustomslideshow \ sd/uiconfig/simpress/ui/presentationdialog \ sd/uiconfig/simpress/ui/printeroptions \ sd/uiconfig/simpress/ui/photoalbum \ diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h index 54e80b5dd91a..35f447d43414 100644 --- a/sd/inc/helpids.h +++ b/sd/inc/helpids.h @@ -75,9 +75,6 @@ #define HID_SD_WIN_PRESENTATION "SD_HID_SD_WIN_PRESENTATION" -#define HID_DLG_DEFINE_CUSTOMSHOW "SD_HID_DLG_DEFINE_CUSTOMSHOW" -#define HID_DLG_DEFINE_CUSTOMSHOW_CTL "SD_HID_DLG_DEFINE_CUSTOMSHOW_CTL" - #define HID_CTL_ACTION_DLG_1 "SD_HID_CTL_ACTION_DLG_1" #define HID_CTL_ACTION_DLG_2 "SD_HID_CTL_ACTION_DLG_2" diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index fabac089c7e7..75e91aa79182 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -18,7 +18,6 @@ */ #include "custsdlg.hxx" -#include "custsdlg.hrc" #include "strings.hrc" #include "sdresid.hxx" diff --git a/sd/source/ui/dlg/custsdlg.src b/sd/source/ui/dlg/custsdlg.src deleted file mode 100644 index 4fa50f2daa80..000000000000 --- a/sd/source/ui/dlg/custsdlg.src +++ /dev/null @@ -1,113 +0,0 @@ -/* -*- 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/. - * - * 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 "custsdlg.hrc" -#include "app.hrc" -#include "helpids.h" - -ModalDialog DLG_DEFINE_CUSTOMSHOW -{ - HelpID = HID_DLG_DEFINE_CUSTOMSHOW ; - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 248 , 117 ) ; - Moveable = TRUE ; - Closeable = TRUE ; - OKButton BTN_OK - { - Pos = MAP_APPFONT ( 187 , 6 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; - }; - CancelButton BTN_CANCEL - { - Pos = MAP_APPFONT ( 187 , 23 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - HelpButton BTN_HELP - { - Pos = MAP_APPFONT ( 187 , 43 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - FixedText FT_NAME - { - Pos = MAP_APPFONT ( 6 , 8 ) ; - Size = MAP_APPFONT ( 30 , 10 ) ; - Text [ en-US ] = "Name" ; - }; - Edit EDT_NAME - { - HelpID = "sd:Edit:DLG_DEFINE_CUSTOMSHOW:EDT_NAME"; - Border = TRUE ; - Pos = MAP_APPFONT ( 38 , 6 ) ; - Size = MAP_APPFONT ( 141 , 12 ) ; - TabStop = TRUE ; - }; - MultiListBox LB_PAGES - { - HelpID = "sd:MultiListBox:DLG_DEFINE_CUSTOMSHOW:LB_PAGES"; - Border = TRUE ; - Pos = MAP_APPFONT ( 6 , 35 ) ; - Size = MAP_APPFONT ( 75 , 75 ) ; - TabStop = TRUE ; - SimpleMode = TRUE ; - }; - PushButton BTN_ADD - { - HelpID = "sd:PushButton:DLG_DEFINE_CUSTOMSHOW:BTN_ADD"; - Pos = MAP_APPFONT ( 84 , 67 ) ; - Size = MAP_APPFONT ( 14 , 14 ) ; - Text = "~>>" ; - TabStop = TRUE ; - }; - Control LB_CUSTOM_PAGES - { - HelpID = HID_DLG_DEFINE_CUSTOMSHOW_CTL ; - Border = TRUE ; - Pos = MAP_APPFONT ( 103 , 35 ) ; - Size = MAP_APPFONT ( 75 , 75 ) ; - TabStop = TRUE ; - }; - PushButton BTN_REMOVE - { - HelpID = "sd:PushButton:DLG_DEFINE_CUSTOMSHOW:BTN_REMOVE"; - Pos = MAP_APPFONT ( 84 , 95 ) ; - Size = MAP_APPFONT ( 14 , 14 ) ; - Text = "~<<" ; - TabStop = TRUE ; - }; - FixedText FT_PAGES - { - Pos = MAP_APPFONT ( 6 , 24 ) ; - Size = MAP_APPFONT ( 83 , 10 ) ; - Text [ en-US ] = "Existing slides" ; - }; - FixedText FT_CUSTOM_PAGES - { - Pos = MAP_APPFONT ( 103 , 24 ) ; - Size = MAP_APPFONT ( 80 , 10 ) ; - Text [ en-US ] = "Selected slides" ; - }; - Text [ en-US ] = "Define Custom Slide Show" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/custsdlg.hrc b/sd/source/ui/inc/custsdlg.hrc deleted file mode 100644 index 8e9a2ceaa9eb..000000000000 --- a/sd/source/ui/inc/custsdlg.hrc +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- 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/. - * - * 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 <sfx2/sfx.hrc> - -#define DLG_DEFINE_CUSTOMSHOW 890 -#define BTN_OK 1 -#define BTN_NEW 1 -#define BTN_EDIT 2 -#define BTN_REMOVE 3 -#define BTN_COPY 4 -#define BTN_HELP 1 -#define LB_PAGES 1 -#define LB_CUSTOM_PAGES 2 -#define FT_NAME 1 -#define EDT_NAME 1 -#define FT_PAGES 2 -#define FT_CUSTOM_PAGES 3 -#define BTN_CANCEL 2 -#define BTN_ADD 1 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/uiconfig/simpress/ui/customslideshows.ui b/sd/uiconfig/simpress/ui/customslideshows.ui index fbd1a843fe2b..0ddbd30ef765 100644 --- a/sd/uiconfig/simpress/ui/customslideshows.ui +++ b/sd/uiconfig/simpress/ui/customslideshows.ui @@ -137,7 +137,7 @@ <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkTreeView" id="customshowlist"> + <object class="GtkTreeView" id="customshowlist:border"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> diff --git a/sd/uiconfig/simpress/ui/definecustomslideshow.ui b/sd/uiconfig/simpress/ui/definecustomslideshow.ui index 4549029c6d80..44518fba46ae 100644 --- a/sd/uiconfig/simpress/ui/definecustomslideshow.ui +++ b/sd/uiconfig/simpress/ui/definecustomslideshow.ui @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> <!-- interface-requires gtk+ 3.0 --> + <!-- interface-requires LibreOffice 1.0 --> <object class="GtkDialog" id="DefineCustomSlideShow"> <property name="can_focus">False</property> - <property name="border_width">5</property> - <property name="type_hint">dialog</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Define Custom Slide Show</property> + <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> <property name="can_focus">False</property> @@ -18,13 +19,11 @@ <child> <object class="GtkButton" id="ok"> <property name="label">gtk-ok</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="has_default">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -36,11 +35,9 @@ <child> <object class="GtkButton" id="cancel"> <property name="label">gtk-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> <property name="use_stock">True</property> </object> <packing> @@ -52,11 +49,9 @@ <child> <object class="GtkButton" id="help"> <property name="label">gtk-help</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> @@ -77,21 +72,23 @@ <object class="GtkBox" id="box1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> <object class="GtkBox" id="box3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> + <property name="hexpand">True</property> + <property name="spacing">12</property> <child> <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">_Name:</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">customname</property> </object> <packing> <property name="expand">False</property> @@ -103,6 +100,7 @@ <object class="GtkEntry" id="customname"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="hexpand">True</property> <property name="invisible_char">●</property> </object> <packing> @@ -122,6 +120,8 @@ <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> <property name="row_spacing">6</property> <property name="column_spacing">6</property> <child> @@ -131,6 +131,7 @@ <property name="halign">start</property> <property name="label" translatable="yes">_Existing slides</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">pages:border</property> </object> <packing> <property name="left_attach">0</property> @@ -146,6 +147,7 @@ <property name="halign">start</property> <property name="label" translatable="yes">_Selected slides</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">custompages:border</property> </object> <packing> <property name="left_attach">2</property> @@ -155,10 +157,9 @@ </packing> </child> <child> - <object class="GtkTreeView" id="pages"> + <object class="GtkTreeView" id="pages:border"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="model">liststore1</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <child internal-child="selection"> @@ -175,11 +176,14 @@ </packing> </child> <child> - <object class="svtlo-SvTreeListBox" id="custompages"> + <object class="svtlo-SvTreeListBox" id="custompages:border"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="Tree List-selection1"/> + </child> </object> <packing> <property name="left_attach">2</property> @@ -198,11 +202,9 @@ <child> <object class="GtkButton" id="add"> <property name="label" translatable="yes">>></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> @@ -213,11 +215,9 @@ <child> <object class="GtkButton" id="remove"> <property name="label" translatable="yes"><<</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> |