Skip to content

C
core
Kaydet (Commit) 2f5e479a authored tarafından Palenik Mihály's avatar Palenik Mihály Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

Convert RID_XMLSECDLG_MACROWARN to .ui 

Change-Id: Icc364804bfe2e6ee05f73c7c0152acbcf7f6fefd
Reviewed-on: https://gerrit.libreoffice.org/9798Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 359ba1df
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 201 deletions
uui/AllLangResTarget_uui.mk
Dosyayı görüntüle @ 2f5e479a
...@@ -31,7 +31,6 @@ $(eval $(call gb_SrsTarget_add_files,uui/res,\ ...@@ -31,7 +31,6 @@ $(eval $(call gb_SrsTarget_add_files,uui/res,\
uui/source/openlocked.src \ uui/source/openlocked.src \
uui/source/passworddlg.src \ uui/source/passworddlg.src \
uui/source/passworderrs.src \ uui/source/passworderrs.src \
uui/source/secmacrowarnings.src \
uui/source/trylater.src \ uui/source/trylater.src \
)) ))
......
uui/UIConfig_uui.mk
Dosyayı görüntüle @ 2f5e479a
...@@ -11,6 +11,7 @@ $(eval $(call gb_UIConfig_UIConfig,uui)) ...@@ -11,6 +11,7 @@ $(eval $(call gb_UIConfig_UIConfig,uui))
$(eval $(call gb_UIConfig_add_uifiles,uui,\ $(eval $(call gb_UIConfig_add_uifiles,uui,\
uui/uiconfig/ui/logindialog \ uui/uiconfig/ui/logindialog \
uui/uiconfig/ui/macrowarnmedium \
uui/uiconfig/ui/masterpassworddlg \ uui/uiconfig/ui/masterpassworddlg \
uui/uiconfig/ui/password \ uui/uiconfig/ui/password \
uui/uiconfig/ui/setmasterpassworddlg \ uui/uiconfig/ui/setmasterpassworddlg \
......
uui/source/ids.hrc
Dosyayı görüntüle @ 2f5e479a
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
#define STR_ERROR_SIMPLE_PASSWORD_WRONG (RID_UUI_START + 23) #define STR_ERROR_SIMPLE_PASSWORD_WRONG (RID_UUI_START + 23)
#define STR_ERROR_PASSWORD_TO_OPEN_WRONG (RID_UUI_START + 24) #define STR_ERROR_PASSWORD_TO_OPEN_WRONG (RID_UUI_START + 24)
#define STR_ERROR_PASSWORD_TO_MODIFY_WRONG (RID_UUI_START + 25) #define STR_ERROR_PASSWORD_TO_MODIFY_WRONG (RID_UUI_START + 25)
#define RID_XMLSECDLG_MACROWARN (RID_UUI_START + 30)
#define STR_UNKNOWNUSER (RID_UUI_START + 31) #define STR_UNKNOWNUSER (RID_UUI_START + 31)
#define STR_OPENLOCKED_TITLE (RID_UUI_START + 32) #define STR_OPENLOCKED_TITLE (RID_UUI_START + 32)
#define STR_OPENLOCKED_MSG (RID_UUI_START + 33) #define STR_OPENLOCKED_MSG (RID_UUI_START + 33)
......
uui/source/secmacrowarnings.cxx
Dosyayı görüntüle @ 2f5e479a
This diff is collapsed.
uui/source/secmacrowarnings.hrc deleted 100644 → 0
Dosyayı görüntüle @ 359ba1df
/* -*- 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 _SECMACROWARNINGS_HRC
#define _SECMACROWARNINGS_HRC
#include <svtools/controldims.hrc>
// --------- general metrics ---------
#define DLGS_BOTTOM_HELP_X(dlgw) (dlgw-RSC_SP_DLG_INNERBORDER_RIGHT-RSC_CD_PUSHBUTTON_WIDTH)
#define DLGS_BOTTOM_CANCEL_X(dlgw) (DLGS_BOTTOM_HELP_X(dlgw)-RSC_SP_CTRL_X-RSC_CD_PUSHBUTTON_WIDTH)
#define DLGS_BOTTOM_OK_X(dlgw) (DLGS_BOTTOM_CANCEL_X(dlgw)-RSC_SP_CTRL_GROUP_X-RSC_CD_PUSHBUTTON_WIDTH)
// --------- signed macro warning ---------
#define FI_DOCNAME 1
#define FI_DESCR1A 2
#define FI_SIGNS 3
#define PB_VIEWSIGNS 4
#define FI_DESCR2 5
#define CB_ALWAYSTRUST 6
#define PB_ENABLE 7
#define PB_DISABLE 8
#define FI_DESCR1B 9
#define FL_BOTTOM_SEP 10
#define BTN_HELP 11
#define IMG_SYMBOL 12
#define MW_WIDTH 220
#define MW_HEIGHT 190
#define MW_SYMBOL_WIDTH (20)
#define MW_SYMBOL_HEIGHT (20)
#define MW_COL_0 (RSC_SP_DLG_INNERBORDER_LEFT)
#define MW_COL_1 (MW_COL_0+MW_SYMBOL_WIDTH+RSC_SP_CTRL_DESC_X)
#define MW_COL_4 (MW_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT)
#define MW_COL_3 (MW_COL_4-RSC_CD_PUSHBUTTON_WIDTH)
#define MW_COL_2 (MW_COL_3-RSC_SP_CTRL_DESC_X)
#define MW_ROW_0 (RSC_SP_DLG_INNERBORDER_TOP)
#define MW_ROW_1 (MW_ROW_0+3*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_Y)
#define MW_ROW_2 (MW_ROW_1+RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_Y)
#define MW_ROW_7 (MW_HEIGHT-RSC_SP_DLG_INNERBORDER_BOTTOM)
#define MW_ROW_6 (MW_ROW_7-RSC_CD_PUSHBUTTON_HEIGHT)
#define MW_ROW_5 (MW_ROW_6-RSC_SP_CTRL_DESC_Y-RSC_CD_FIXEDTEXT_HEIGHT)
#define MW_ROW_4 (MW_ROW_5-RSC_SP_CTRL_DESC_Y-RSC_CD_CHECKBOX_HEIGHT)
#define MW_ROW_3 (MW_ROW_4-RSC_SP_CTRL_DESC_Y-4*RSC_CD_FIXEDTEXT_HEIGHT)
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
uui/source/secmacrowarnings.hxx
Dosyayı görüntüle @ 2f5e479a
...@@ -46,18 +46,15 @@ private: ...@@ -46,18 +46,15 @@ private:
OUString maODFVersion; OUString maODFVersion;
const cssu::Sequence< css::security::DocumentSignatureInformation >* mpInfos; const cssu::Sequence< css::security::DocumentSignatureInformation >* mpInfos;
FixedImage maSymbolImg; FixedImage* mpSymbolImg;
FixedInfo maDocNameFI; FixedText* mpDocNameFI;
FixedInfo maDescr1aFI; FixedText* mpDescr1FI;
FixedInfo maDescr1bFI; FixedText* mpSignsFI;
FixedInfo maSignsFI; PushButton* mpViewSignsBtn;
PushButton maViewSignsBtn; FixedText* mpDescr2FI;
FixedInfo maDescr2FI; CheckBox* mpAlwaysTrustCB;
CheckBox maAlwaysTrustCB; PushButton* mpEnableBtn;
FixedLine maBottomSepFL; PushButton* mpDisableBtn;
OKButton maEnableBtn;
CancelButton maDisableBtn;
HelpButton maHelpBtn;
const bool mbSignedMode; // modus of dialog (signed / unsigned macros) const bool mbSignedMode; // modus of dialog (signed / unsigned macros)
const bool mbShowSignatures; const bool mbShowSignatures;
...@@ -69,14 +66,11 @@ private: ...@@ -69,14 +66,11 @@ private:
DECL_LINK( AlwaysTrustCheckHdl, void* ); DECL_LINK( AlwaysTrustCheckHdl, void* );
void InitControls(); void InitControls();
void FitControls();
public: public:
MacroWarning( Window* pParent, bool _bShowSignatures, ResMgr& rResMgr ); MacroWarning( Window* pParent, bool _bShowSignatures, ResMgr& rResMgr );
virtual ~MacroWarning(); virtual ~MacroWarning();
virtual short Execute() SAL_OVERRIDE;
void SetDocumentURL( const OUString& rDocURL ); void SetDocumentURL( const OUString& rDocURL );
void SetStorage( const cssu::Reference < css::embed::XStorage >& rxStore, void SetStorage( const cssu::Reference < css::embed::XStorage >& rxStore,
......
uui/source/secmacrowarnings.src deleted 100644 → 0
Dosyayı görüntüle @ 359ba1df
/* -*- 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 __RSC
#include "secmacrowarnings.hrc"
#include "ids.hrc"
ModalDialog RID_XMLSECDLG_MACROWARN
{
HelpId = HID_XMLSECDLG_MACROWARN;
Size = MAP_APPFONT( MW_WIDTH, MW_HEIGHT );
OutputSize = TRUE;
Closeable = FALSE;
Moveable = TRUE;
SVLook = TRUE;
Text [ en-US ] = "%PRODUCTNAME - Security Warning";
FixedImage IMG_SYMBOL
{
Pos = MAP_APPFONT( MW_COL_0, MW_ROW_0 );
Size = MAP_APPFONT( MW_SYMBOL_WIDTH, MW_SYMBOL_HEIGHT );
};
FixedText FI_DOCNAME
{
Pos = MAP_APPFONT( MW_COL_1, MW_ROW_0+RSC_CD_FIXEDTEXT_HEIGHT );
Size = MAP_APPFONT( MW_COL_4-MW_COL_1, 2*RSC_CD_FIXEDTEXT_HEIGHT );
Wordbreak = TRUE;
};
FixedText FI_DESCR1A
{
Pos = MAP_APPFONT( MW_COL_1, MW_ROW_1 );
Size = MAP_APPFONT( MW_COL_4-MW_COL_1, RSC_CD_FIXEDTEXT_HEIGHT );
Wordbreak = TRUE;
Text [ en-US ] = "The document contains document macros signed by:";
};
FixedText FI_DESCR1B
{
Pos = MAP_APPFONT( MW_COL_1, MW_ROW_1 );
Size = MAP_APPFONT( MW_COL_4-MW_COL_1, RSC_CD_FIXEDTEXT_HEIGHT );
Wordbreak = TRUE;
Text [ en-US ] = "The document contains document macros.";
};
FixedText FI_SIGNS
{
Pos = MAP_APPFONT( MW_COL_1, MW_ROW_2 );
Size = MAP_APPFONT( MW_COL_2-MW_COL_1, MW_ROW_3-MW_ROW_2-RSC_SP_CTRL_DESC_Y );
Wordbreak = TRUE;
};
PushButton PB_VIEWSIGNS
{
HelpID = "uui:PushButton:RID_XMLSECDLG_MACROWARN:PB_VIEWSIGNS";
Pos = MAP_APPFONT( MW_COL_3, MW_ROW_2 );
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
Text [ en-US ] = "View Signatures...";
};
FixedText FI_DESCR2
{
Pos = MAP_APPFONT( MW_COL_1, MW_ROW_3 );
Size = MAP_APPFONT( MW_COL_4-MW_COL_1, 4*RSC_CD_FIXEDTEXT_HEIGHT );
Wordbreak = TRUE;
Text [ en-US ] = "Macros may contain viruses. Disabling macros for a document is always safe. If you disable macros you may lose functionality provided by the document macros.";
};
CheckBox CB_ALWAYSTRUST
{
HelpID = "uui:CheckBox:RID_XMLSECDLG_MACROWARN:CB_ALWAYSTRUST";
Pos = MAP_APPFONT( MW_COL_1, MW_ROW_4 );
Size = MAP_APPFONT( MW_COL_4-MW_COL_1, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "Always trust macros from this source";
};
FixedLine FL_BOTTOM_SEP
{
Pos = MAP_APPFONT( 0, MW_ROW_5 );
Size = MAP_APPFONT( MW_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
};
OKButton PB_ENABLE
{
Pos = MAP_APPFONT( DLGS_BOTTOM_OK_X( MW_WIDTH ), MW_ROW_6 );
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
Text [ en-US ] = "~Enable Macros";
};
CancelButton PB_DISABLE
{
Pos = MAP_APPFONT( DLGS_BOTTOM_CANCEL_X( MW_WIDTH ), MW_ROW_6 );
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
DefButton = TRUE;
Text [ en-US ] = "~Disable Macros";
};
HelpButton BTN_HELP
{
Pos = MAP_APPFONT( DLGS_BOTTOM_HELP_X( MW_WIDTH ), MW_ROW_6 );
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
};
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
uui/uiconfig/ui/macrowarnmedium.ui 0 → 100644
Dosyayı görüntüle @ 2f5e479a
This diff is collapsed.
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