Skip to content

C
core
Kaydet (Commit) e5c370e5 authored tarafından Olivier Hallot's avatar Olivier Hallot Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

Convert Draw page dialog to Widget UI 

Change-Id: I65cb85e4f8ce3f234e6d9ae780a83db04c23f0f6
Reviewed-on: https://gerrit.libreoffice.org/6053Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 959711f1
Hide whitespace changes
Inline Side-by-side
Showing with 157 additions and 125 deletions
sd/AllLangResTarget_sd.mk
Dosyayı görüntüle @ e5c370e5
...@@ -48,7 +48,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\ ...@@ -48,7 +48,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\
sd/source/ui/dlg/dlg_char.src \ sd/source/ui/dlg/dlg_char.src \
sd/source/ui/dlg/dlgfield.src \ sd/source/ui/dlg/dlgfield.src \
sd/source/ui/dlg/dlgolbul.src \ sd/source/ui/dlg/dlgolbul.src \
sd/source/ui/dlg/dlgpage.src \
sd/source/ui/dlg/inspagob.src \ sd/source/ui/dlg/inspagob.src \
sd/source/ui/dlg/ins_paste.src \ sd/source/ui/dlg/ins_paste.src \
sd/source/ui/dlg/LayerDialog.src \ sd/source/ui/dlg/LayerDialog.src \
......
sd/UIConfig_sdraw.mk
Dosyayı görüntüle @ e5c370e5
...@@ -68,7 +68,8 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/sdraw,\ ...@@ -68,7 +68,8 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/sdraw,\
$(eval $(call gb_UIConfig_add_uifiles,modules/sdraw,\ $(eval $(call gb_UIConfig_add_uifiles,modules/sdraw,\
sd/uiconfig/sdraw/ui/dlgsnap \ sd/uiconfig/sdraw/ui/dlgsnap \
sd/uiconfig/sdraw/ui/copydlg \ sd/uiconfig/sdraw/ui/copydlg \
sd/uiconfig/sdraw/ui/drawparadialog \ sd/uiconfig/sdraw/ui/drawparadialog \
sd/uiconfig/sdraw/ui/drawpagedialog \
sd/uiconfig/sdraw/ui/insertlayer \ sd/uiconfig/sdraw/ui/insertlayer \
sd/uiconfig/sdraw/ui/paranumberingtab \ sd/uiconfig/sdraw/ui/paranumberingtab \
sd/uiconfig/sdraw/ui/printeroptions \ sd/uiconfig/sdraw/ui/printeroptions \
......
sd/source/ui/dlg/dlgpage.cxx
Dosyayı görüntüle @ e5c370e5
...@@ -34,8 +34,11 @@ ...@@ -34,8 +34,11 @@
* Constructor of tab dialog: appends pages to the dialog * Constructor of tab dialog: appends pages to the dialog
*/ */
SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, sal_Bool bAreaPage ) : SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, sal_Bool bAreaPage ) :
SfxTabDialog ( pParent, SdResId( TAB_PAGE ), pAttr ), SfxTabDialog ( pParent
mpDocShell ( pDocSh ) ,"DrawPageDialog"
,"modules/sdraw/ui/drawpagedialog.ui"
, pAttr ),
mpDocShell ( pDocSh )
{ {
SvxColorListItem aColorListItem(*( (const SvxColorListItem*) SvxColorListItem aColorListItem(*( (const SvxColorListItem*)
( mpDocShell->GetItem( SID_COLOR_TABLE ) ) ) ); ( mpDocShell->GetItem( SID_COLOR_TABLE ) ) ) );
...@@ -51,43 +54,38 @@ SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* ...@@ -51,43 +54,38 @@ SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet*
mpHatchingList = aHatchListItem.GetHatchList(); mpHatchingList = aHatchListItem.GetHatchList();
mpBitmapList = aBitmapListItem.GetBitmapList(); mpBitmapList = aBitmapListItem.GetBitmapList();
FreeResource();
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialogdiet fail!"); OSL_ENSURE(pFact, "Dialogdiet fail!");
AddTabPage( RID_SVXPAGE_PAGE, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), 0 ); mnPage = AddTabPage( "RID_SVXPAGE_PAGE", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), 0 );
AddTabPage( RID_SVXPAGE_AREA, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_AREA ), 0 ); mnArea = AddTabPage( "RID_SVXPAGE_AREA", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_AREA ), 0 );
if(!bAreaPage) // I have to add the page before I remove it ! if(!bAreaPage) // I have to add the page before I remove it !
RemoveTabPage( RID_SVXPAGE_AREA ); RemoveTabPage( "RID_SVXPAGE_AREA" );
} }
void SdPageDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage) void SdPageDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage)
{ {
SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
switch(nId) if (nId == mnPage)
{ {
case RID_SVXPAGE_PAGE:
aSet.Put (SfxAllEnumItem((const sal_uInt16)SID_ENUM_PAGE_MODE, SVX_PAGE_MODE_PRESENTATION)); aSet.Put (SfxAllEnumItem((const sal_uInt16)SID_ENUM_PAGE_MODE, SVX_PAGE_MODE_PRESENTATION));
aSet.Put (SfxAllEnumItem((const sal_uInt16)SID_PAPER_START, PAPER_A0)); aSet.Put (SfxAllEnumItem((const sal_uInt16)SID_PAPER_START, PAPER_A0));
aSet.Put (SfxAllEnumItem((const sal_uInt16)SID_PAPER_END, PAPER_E)); aSet.Put (SfxAllEnumItem((const sal_uInt16)SID_PAPER_END, PAPER_E));
rPage.PageCreated(aSet); rPage.PageCreated(aSet);
break; }
case RID_SVXPAGE_AREA: else if (nId == mnArea)
aSet.Put (SvxColorListItem(mpColorList,SID_COLOR_TABLE)); {
aSet.Put (SvxGradientListItem(mpGradientList,SID_GRADIENT_LIST)); aSet.Put (SvxColorListItem(mpColorList,SID_COLOR_TABLE));
aSet.Put (SvxHatchListItem(mpHatchingList,SID_HATCH_LIST)); aSet.Put (SvxGradientListItem(mpGradientList,SID_GRADIENT_LIST));
aSet.Put (SvxBitmapListItem(mpBitmapList,SID_BITMAP_LIST)); aSet.Put (SvxHatchListItem(mpHatchingList,SID_HATCH_LIST));
aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,0)); aSet.Put (SvxBitmapListItem(mpBitmapList,SID_BITMAP_LIST));
aSet.Put (SfxUInt16Item(SID_DLG_TYPE,1)); aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,0));
aSet.Put (SfxUInt16Item(SID_TABPAGE_POS,0)); aSet.Put (SfxUInt16Item(SID_DLG_TYPE,1));
rPage.PageCreated(aSet); aSet.Put (SfxUInt16Item(SID_TABPAGE_POS,0));
break; rPage.PageCreated(aSet);
} }
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sd/source/ui/dlg/dlgpage.src deleted 100644 → 0
Dosyayı görüntüle @ 959711f1
/* -*- 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 <svx/dialogs.hrc>
#include "dlgpage.hrc"
TabDialog TAB_PAGE
{
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 289 , 176 ) ;
Text [ en-US ] = "Page Setup" ;
Moveable = TRUE ;
Closeable = TRUE ;
TabControl 1
{
OutputSize = TRUE ;
Pos = MAP_APPFONT ( 3 , 3 ) ;
Size = MAP_APPFONT ( 260 , 135 ) ;
PageList =
{
PageItem
{
Identifier = RID_SVXPAGE_PAGE ;
Text [ en-US ] = "Page" ;
PageResID = RID_SVXPAGE_PAGE ;
};
PageItem
{
Identifier = RID_SVXPAGE_AREA;
PageResID = RID_SVXPAGE_AREA;
Text [ en-US ] = "Background";
};
};
};
OKButton 1
{
Pos = MAP_APPFONT ( 6 , 151 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
CancelButton 1
{
Pos = MAP_APPFONT ( 60 , 151 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
HelpButton 1
{
Pos = MAP_APPFONT ( 114 , 151 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
PushButton 1
{
Pos = MAP_APPFONT ( 169 , 151 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "Return" ;
TabStop = TRUE ;
};
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sd/source/ui/inc/dlgpage.hrc deleted 100644 → 0
Dosyayı görüntüle @ 959711f1
/* -*- 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 .
*/
#define TAB_PAGE 20625
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sd/source/ui/inc/dlgpage.hxx
Dosyayı görüntüle @ e5c370e5
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#define _SD_DLGPAGE_HXX #define _SD_DLGPAGE_HXX
#include <sfx2/tabdlg.hxx> #include <sfx2/tabdlg.hxx>
#include "dlgpage.hrc"
class SfxObjectShell; class SfxObjectShell;
...@@ -40,6 +39,9 @@ private: ...@@ -40,6 +39,9 @@ private:
XGradientListRef mpGradientList; XGradientListRef mpGradientList;
XHatchListRef mpHatchingList; XHatchListRef mpHatchingList;
XBitmapListRef mpBitmapList; XBitmapListRef mpBitmapList;
sal_uInt16 mnArea;
sal_uInt16 mnPage;
public: public:
SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, sal_Bool bAreaPage = sal_True ); SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, sal_Bool bAreaPage = sal_True );
......
sd/uiconfig/sdraw/ui/drawpagedialog.ui 0 → 100644
Dosyayı görüntüle @ e5c370e5
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="DrawPageDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="type_hint">dialog</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">12</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="ok">
<property name="label">gtk-ok</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_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="cancel">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</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="help">
<property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</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="reset">
<property name="label">gtk-revert-to-saved</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</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="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkNotebook" id="tabcontrol">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<child>
<placeholder/>
</child>
<child type="tab">
<object class="GtkLabel" id="RID_SVXPAGE_PAGE">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Page</property>
</object>
<packing>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child type="tab">
<object class="GtkLabel" id="RID_SVXPAGE_AREA">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Background</property>
</object>
<packing>
<property name="position">1</property>
<property name="tab_fill">False</property>
</packing>
</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">ok</action-widget>
<action-widget response="0">cancel</action-widget>
<action-widget response="0">help</action-widget>
<action-widget response="0">reset</action-widget>
</action-widgets>
</object>
</interface>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment