Skip to content

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

move Stored Web Connection Information dialog to cui 

Change-Id: Ifddd7348754054e505b0b9abe1d760e903e00f2a
üst 3b71964e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 164 deletions
cui/AllLangResTarget_cui.mk
Dosyayı görüntüle @ df35f610
......@@ -98,7 +98,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/options/optupdt.src \
cui/source/options/readonlyimage.src \
cui/source/options/treeopt.src \
cui/source/options/webconninfo.src \
cui/source/tabpages/align.src \
cui/source/tabpages/autocdlg.src \
cui/source/tabpages/bbdlg.src \
......
cui/UI_cui.mk
Dosyayı görüntüle @ df35f610
......@@ -50,6 +50,7 @@ $(eval $(call gb_UI_add_uifiles,cui,\
cui/uiconfig/ui/specialcharacters \
cui/uiconfig/ui/spellingdialog \
cui/uiconfig/ui/splitcellsdialog \
cui/uiconfig/ui/storedwebconnectiondialog \
cui/uiconfig/ui/thesaurus \
cui/uiconfig/ui/twolinespage \
cui/uiconfig/ui/zoomdialog \
......
cui/source/inc/cuires.hrc
Dosyayı görüntüle @ df35f610
......@@ -139,7 +139,6 @@
#define RID_RIDER_SLL_PERSONAL (RID_OFA_START + 101)//?
// options
#define RID_SVXDLG_WEBCONNECTION_INFO (RID_SVX_START + 301)
#define RID_SVXDLG_SECURITY_OPTIONS (RID_SVX_START + 300)
#define RID_SVXPAGE_ONLINEUPDATE (RID_SVX_START + 298)
#define OFA_TP_MEMORY (RID_OFA_START + 250)
......
cui/source/inc/helpid.hrc
Dosyayı görüntüle @ df35f610
......@@ -58,7 +58,6 @@
#define HID_OFAPAGE_SMARTTAG_OPTIONS "CUI_HID_OFAPAGE_SMARTTAG_OPTIONS"
#define HID_OFAPAGE_MSFLTR2_CLB "CUI_HID_OFAPAGE_MSFLTR2_CLB"
#define HID_OFADLG_TREELISTBOX "CUI_HID_OFADLG_TREELISTBOX"
#define HID_DLG_WEBCONNECTION_INFO "CUI_HID_DLG_WEBCONNECTION_INFO"
#define HID_OPTIONS_DICT_EDIT_ENTRIES_LIST "CUI_HID_OPTIONS_DICT_EDIT_ENTRIES_LIST"
#define HID_WARN_NAME_DUPLICATE "CUI_HID_WARN_NAME_DUPLICATE"
#define HID_COLORPAGE_DOCCOLOR_LB "CUI_HID_COLORPAGE_DOCCOLOR_LB"
......
cui/source/options/webconninfo.hrc deleted 100644 → 0
Dosyayı görüntüle @ 3b71964e
/*
* 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 _SVX_WEBCONNINFO_HRC
#define _SVX_WEBCONNINFO_HRC
#define FI_NEVERSHOWN 10
#define LB_PASSWORDS 11
#define PB_REMOVE 12
#define PB_REMOVEALL 13
#define PB_CHANGE 14
#define FL_BUTTONS 15
#define PB_CLOSE 17
#define PB_HELP 18
#define STR_WEBSITE 10
#define STR_USERNAME 11
#define DLG_WIDTH 260
#define DLG_HEIGHT 150
#define COL_0 (RSC_SP_DLG_INNERBORDER_LEFT)
#define COL_1 (COL_0+RSC_CD_PUSHBUTTON_WIDTH+RSC_SP_CTRL_GROUP_X)
#define COL_2 (DLG_WIDTH-RSC_SP_DLG_INNERBORDER_LEFT)
#define COL_C (COL_2-RSC_CD_PUSHBUTTON_WIDTH)
#define COL_B (COL_C-RSC_SP_CTRL_X-RSC_CD_PUSHBUTTON_WIDTH)
#define COL_A (COL_B-RSC_SP_CTRL_GROUP_X-RSC_CD_PUSHBUTTON_WIDTH)
#define ROW_0 (RSC_SP_DLG_INNERBORDER_TOP)
#define ROW_1 (ROW_0+RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_FLGR_SPACE_Y)
#define ROW_5 (DLG_HEIGHT-RSC_SP_DLG_INNERBORDER_BOTTOM-RSC_CD_PUSHBUTTON_HEIGHT)
#define ROW_4 (ROW_5-RSC_SP_FLGR_SPACE_Y-RSC_CD_FIXEDLINE_HEIGHT)
#define ROW_3 (ROW_4-RSC_SP_FLGR_SPACE_Y-RSC_CD_PUSHBUTTON_HEIGHT)
#define ROW_2 (ROW_3-RSC_SP_GRP_SPACE_Y)
#endif // #ifndef _SVX_WEBCONNINFO_HRC
cui/source/options/webconninfo.hxx
Dosyayı görüntüle @ df35f610
......@@ -33,11 +33,12 @@ namespace svx
class PasswordTable : public SvxSimpleTable
{
public:
PasswordTable(SvxSimpleTableContainer& rParent, WinBits nBits = WB_BORDER);
PasswordTable(SvxSimpleTableContainer& rParent, WinBits nBits);
void InsertHeaderItem( sal_uInt16 nColumn, const String& rText, HeaderBarItemBits nBits );
void ResetTabs();
void InsertHeaderItem(sal_uInt16 nColumn, const OUString& rText, HeaderBarItemBits nBits);
void setColWidths();
void Resort( bool bForced );
virtual void Resize();
};
//====================================================================
......@@ -46,16 +47,11 @@ namespace svx
class WebConnectionInfoDialog : public ModalDialog
{
private:
FixedInfo m_aNeverShownFI;
SvxSimpleTableContainer m_aPasswordsLBContainer;
PasswordTable m_aPasswordsLB;
PushButton m_aRemoveBtn;
PushButton m_aRemoveAllBtn;
PushButton m_aChangeBtn;
FixedLine m_aButtonsFL;
CancelButton m_aCloseBtn;
HelpButton m_aHelpBtn;
sal_Int32 m_nPos;
PasswordTable* m_pPasswordsLB;
PushButton* m_pRemoveBtn;
PushButton* m_pRemoveAllBtn;
PushButton* m_pChangeBtn;
sal_Int32 m_nPos;
DECL_LINK( HeaderBarClickedHdl, SvxSimpleTable* );
DECL_LINK(RemovePasswordHdl, void *);
......
cui/source/options/webconninfo.src deleted 100644 → 0
Dosyayı görüntüle @ 3b71964e
/*
* 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 <svtools/controldims.hrc>
#include "webconninfo.hrc"
#include <cuires.hrc>
#include "helpid.hrc"
ModalDialog RID_SVXDLG_WEBCONNECTION_INFO
{
HelpID = HID_DLG_WEBCONNECTION_INFO ;
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( DLG_WIDTH , DLG_HEIGHT ) ;
Moveable = TRUE ;
Closeable = TRUE ;
Text [ en-US ] = "Stored Web Connection Information" ;
FixedText FI_NEVERSHOWN
{
Pos = MAP_APPFONT( COL_0, ROW_0 );
Size = MAP_APPFONT( COL_2-COL_0, RSC_CD_FIXEDTEXT_HEIGHT );
Text [ en-US ] = "Web login information (passwords are never shown)";
};
Control LB_PASSWORDS
{
Pos = MAP_APPFONT ( COL_0 , ROW_1 ) ;
Size = MAP_APPFONT ( COL_2-COL_0 , ROW_2-ROW_1 ) ;
Border = TRUE ;
TabStop = TRUE ;
};
PushButton PB_REMOVE
{
HelpID = "cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_REMOVE";
Pos = MAP_APPFONT ( COL_0 , ROW_3 ) ;
Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
Text [ en-US ] = "Remove";
};
PushButton PB_REMOVEALL
{
HelpID = "cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_REMOVEALL";
Pos = MAP_APPFONT ( COL_1 , ROW_3 ) ;
Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
Text [ en-US ] = "Remove All";
};
PushButton PB_CHANGE
{
HelpID = "cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_CHANGE";
Pos = MAP_APPFONT ( COL_C , ROW_3 ) ;
Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
Text [ en-US ] = "Change Password...";
};
FixedLine FL_BUTTONS
{
Pos = MAP_APPFONT( 0, ROW_4 );
Size = MAP_APPFONT( DLG_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
};
CancelButton PB_CLOSE
{
Pos = MAP_APPFONT ( COL_B , ROW_5 ) ;
Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
TabStop = TRUE ;
DefButton = TRUE ;
Text [ en-US ] = "Close";
};
HelpButton PB_HELP
{
Pos = MAP_APPFONT ( COL_C , ROW_5 ) ;
Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
TabStop = TRUE ;
};
String STR_WEBSITE
{
Text [ en-US ] = "Website";
};
String STR_USERNAME
{
Text [ en-US ] = "User name";
};
};
svx/inc/svx/simptabl.hxx
Dosyayı görüntüle @ df35f610
......@@ -41,7 +41,7 @@ protected:
public:
SvxSimpleTableContainer( Window* pParent, const ResId& rResId );
SvxSimpleTableContainer( Window* pParent, WinBits nBits = WB_BORDER | WB_3DLOOK );
SvxSimpleTableContainer( Window* pParent, WinBits nBits = WB_BORDER );
void SetTable(SvxSimpleTable* pTable);
......
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