Skip to content

C
core
Kaydet (Commit) e0210c3e authored tarafından Luboš Luňák's avatar Luboš Luňák
Dosyalara gözat
Seçenekler

UI option for embedding fonts in a Writer document (fdo#42195) 

File->Properties.

Change-Id: I92757153c8815d17ea9f721a98b22b9088014f31
üst 3f4aee00
Hide whitespace changes
Inline Side-by-side
Showing with 141 additions and 0 deletions
sw/Library_swui.mk
Dosyayı görüntüle @ e0210c3e
......@@ -78,6 +78,7 @@ $(eval $(call gb_Library_add_exception_objects,swui,\
sw/source/ui/dialog/abstract \
sw/source/ui/dialog/addrdlg \
sw/source/ui/dialog/ascfldlg \
sw/source/ui/dialog/documentfontsdialog \
sw/source/ui/dialog/docstdlg \
sw/source/ui/dialog/macassgn \
sw/source/ui/dialog/swdialmgr \
......
sw/UI_swriter.mk
Dosyayı görüntüle @ e0210c3e
......@@ -21,6 +21,7 @@ $(eval $(call gb_UI_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/columnpage \
sw/uiconfig/swriter/ui/columnwidth \
sw/uiconfig/swriter/ui/converttexttable \
sw/uiconfig/swriter/ui/documentfontspage \
sw/uiconfig/swriter/ui/endnotepage \
sw/uiconfig/swriter/ui/editcategories \
sw/uiconfig/swriter/ui/exchangedatabases \
......
sw/inc/globals.hrc
Dosyayı görüntüle @ e0210c3e
......@@ -30,6 +30,7 @@
#define STR_LOAD_GLOBAL_DOC (RC_GLOBALS_BEGIN + 2)
#define STR_DOC_STAT (RC_GLOBALS_BEGIN + 10)
#define STR_DOC_FONTS (RC_GLOBALS_BEGIN + 107)
#define STR_PAGE (RC_GLOBALS_BEGIN + 14)
#define STR_PRINTOPTUI (RC_GLOBALS_BEGIN + 15)
......@@ -138,6 +139,7 @@
#define TP_COLUMN (RC_GLOBALS_BEGIN + 13)
#define TP_DOC_STAT (RC_GLOBALS_BEGIN + 15)
#define TP_DOC_FONTS (RC_GLOBALS_BEGIN + 108)
#define TP_HEADER_PAGE (RC_GLOBALS_BEGIN + 16)
#define TP_FOOTER_PAGE (RC_GLOBALS_BEGIN + 17)
......
sw/source/ui/app/app.src
Dosyayı görüntüle @ e0210c3e
......@@ -305,6 +305,11 @@ String STR_DOC_STAT
Text [ en-US ] = "Statistics" ;
};
String STR_DOC_FONTS
{
Text [ en-US ] = "Fonts" ;
};
// ----------------------------
// Statusbar-titles
// ----------------------------
......
sw/source/ui/app/docsh2.cxx
Dosyayı görüntüle @ e0210c3e
......@@ -141,6 +141,7 @@ SfxDocumentInfoDialog* SwDocShell::CreateDocumentInfoDialog(
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
pDlg->AddTabPage(TP_DOC_FONTS, SW_RESSTR(STR_DOC_FONTS),pFact->GetTabPageCreatorFunc( TP_DOC_FONTS ),0);
pDlg->AddTabPage(TP_DOC_STAT, SW_RESSTR(STR_DOC_STAT),pFact->GetTabPageCreatorFunc( TP_DOC_STAT ),0);
}
}
......
sw/source/ui/dialog/documentfontsdialog.cxx 0 → 100644
Dosyayı görüntüle @ e0210c3e
/* -*- 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 "documentfontsdialog.hxx"
#include <doc.hxx>
#include <docsh.hxx>
SfxTabPage* SwDocumentFontsPage::Create( Window* parent, const SfxItemSet& set )
{
return new SwDocumentFontsPage( parent, set );
}
SwDocumentFontsPage::SwDocumentFontsPage( Window* parent, const SfxItemSet& set )
: SfxTabPage( parent, "DocumentFontsPage", "modules/swriter/ui/documentfontspage.ui", set )
{
get( embedFontsCheckbox, "embedFonts" );
}
void SwDocumentFontsPage::Reset( const SfxItemSet& )
{
// I take it the SfxItemSet should be "officially" used, but the dialog
// is modal (and SwDocStatPage does it too), so it should be safe, and
// also simpler, to short-circuit directly to the setting.
SwDocShell* docShell = static_cast< SwDocShell* >( SfxObjectShell::Current());
SwDoc* doc = docShell->GetDoc();
embedFontsCheckbox->Check( doc->get( IDocumentSettingAccess::EMBED_FONTS ));
}
sal_Bool SwDocumentFontsPage::FillItemSet( SfxItemSet& )
{
SwDocShell* docShell = static_cast< SwDocShell* >( SfxObjectShell::Current());
SwDoc* doc = docShell->GetDoc();
doc->set( IDocumentSettingAccess::EMBED_FONTS, embedFontsCheckbox->IsChecked());
return false;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sw/source/ui/dialog/swdlgfact.cxx
Dosyayı görüntüle @ e0210c3e
......@@ -47,6 +47,7 @@
#include "dbinsdlg.hxx" //add for SwInsertDBColAutoPilot
#include "docfnote.hxx" //add for SwFootNoteOptionDlg
#include "docstdlg.hxx" //add for SwDocStatPage
#include "documentfontsdialog.hxx"
#include "DropDownFieldDialog.hxx" //add for DropDownFieldDialog
#include "envlop.hxx" //add for SwEnvDlg
#include "label.hxx" //add for SwLabDlg
......@@ -1456,6 +1457,9 @@ CreateTabPage SwAbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nI
case TP_DOC_STAT :
pRet = SwDocStatPage::Create;
break;
case TP_DOC_FONTS :
pRet = SwDocumentFontsPage::Create;
break;
case RID_SW_TP_MAILCONFIG:
pRet = SwMailConfigPage::Create;
break;
......
sw/source/ui/inc/documentfontsdialog.hxx 0 → 100644
Dosyayı görüntüle @ e0210c3e
/* -*- 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 .
*/
#ifndef SW_DOCUMENTFONTSDIALOG_HXX
#define SW_DOCUMENTFONTSDIALOG_HXX
#include <sfx2/tabdlg.hxx>
#include <vcl/fixed.hxx>
#include <svtools/stdctrl.hxx>
/**
Tab page for document font settings in the document properties dialog.
*/
class SwDocumentFontsPage: public SfxTabPage
{
public:
SwDocumentFontsPage( Window* parent, const SfxItemSet& set );
static SfxTabPage* Create( Window* parent, const SfxItemSet& set );
protected:
virtual sal_Bool FillItemSet( SfxItemSet& set );
virtual void Reset( const SfxItemSet& set );
private:
CheckBox* embedFontsCheckbox;
};
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sw/uiconfig/swriter/ui/documentfontspage.ui 0 → 100644
Dosyayı görüntüle @ e0210c3e
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkGrid" id="DocumentFontsPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">12</property>
<property name="column_spacing">18</property>
<child>
<object class="GtkCheckButton" id="embedFonts">
<property name="label" translatable="yes">_Embed fonts in the document</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="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</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>
</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