[Libreoffice-commits] core.git: cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UI_cui.mk svx/inc sw/uiconfig
Caolán McNamara
caolanm at redhat.com
Mon Feb 18 05:24:20 PST 2013
cui/AllLangResTarget_cui.mk | 1
cui/UI_cui.mk | 1
cui/source/inc/cuires.hrc | 1
cui/source/inc/helpid.hrc | 1
cui/source/options/webconninfo.cxx | 153 +++++++---------
cui/source/options/webconninfo.hrc | 52 -----
cui/source/options/webconninfo.hxx | 22 --
cui/source/options/webconninfo.src | 95 ----------
cui/uiconfig/ui/storedwebconnectiondialog.ui | 201 +++++++++++++++++++++
svx/inc/svx/simptabl.hxx | 2
sw/uiconfig/swriter/ui/storedwebconnectioninfo.ui | 208 ----------------------
11 files changed, 279 insertions(+), 458 deletions(-)
New commits:
commit df35f61010953462ffdbc742d23811a7ade0befb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Feb 15 10:54:23 2013 +0000
move Stored Web Connection Information dialog to cui
Change-Id: Ifddd7348754054e505b0b9abe1d760e903e00f2a
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index a5bb239..1178e4e 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -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 \
diff --git a/cui/UI_cui.mk b/cui/UI_cui.mk
index 6b259d2..d3302da 100644
--- a/cui/UI_cui.mk
+++ b/cui/UI_cui.mk
@@ -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 \
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 8d71493..9cffa24 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -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)
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index d854179..14a3606 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -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"
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index 212e9901..9046792 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -18,7 +18,6 @@
*/
#include "webconninfo.hxx"
-#include "webconninfo.hrc"
#include <dialmgr.hxx>
#include <cuires.hrc>
#include <sal/macros.h>
@@ -44,16 +43,11 @@ PasswordTable::PasswordTable(SvxSimpleTableContainer& rParent, WinBits nBits)
{
}
-void PasswordTable::InsertHeaderItem( sal_uInt16 nColumn, const String& rText, HeaderBarItemBits nBits )
+void PasswordTable::InsertHeaderItem(sal_uInt16 nColumn, const OUString& rText, HeaderBarItemBits nBits)
{
GetTheHeaderBar().InsertItem( nColumn, rText, 0, nBits );
}
-void PasswordTable::ResetTabs()
-{
- SetTabs();
-}
-
void PasswordTable::Resort( bool bForced )
{
sal_uInt16 nColumn = GetSelectedCol();
@@ -81,91 +75,78 @@ void PasswordTable::Resort( bool bForced )
}
}
+void PasswordTable::Resize()
+{
+ SvxSimpleTable::Resize();
+ setColWidths();
+}
+
+void PasswordTable::setColWidths()
+{
+ HeaderBar &rBar = GetTheHeaderBar();
+ if (rBar.GetItemCount() < 2)
+ return;
+ long nUserNameWidth = 12 +
+ std::max(rBar.GetTextWidth(rBar.GetItemText(2)),
+ GetTextWidth(OUString("XXXXXXXXXXXX")));
+ long nWebSiteWidth = std::max(
+ 12 + rBar.GetTextWidth(rBar.GetItemText(1)),
+ GetSizePixel().Width() - nUserNameWidth);
+ long aStaticTabs[]= { 2, 0, 0 };
+ aStaticTabs[2] = nWebSiteWidth;
+ SvxSimpleTable::SetTabs(aStaticTabs, MAP_PIXEL);
+}
+
// class WebConnectionInfoDialog -----------------------------------------
// -----------------------------------------------------------------------
-WebConnectionInfoDialog::WebConnectionInfoDialog( Window* pParent ) :
- ModalDialog( pParent, CUI_RES( RID_SVXDLG_WEBCONNECTION_INFO ) )
- ,m_aNeverShownFI ( this, CUI_RES( FI_NEVERSHOWN ) )
- ,m_aPasswordsLBContainer(this, CUI_RES( LB_PASSWORDS))
- ,m_aPasswordsLB(m_aPasswordsLBContainer)
- ,m_aRemoveBtn ( this, CUI_RES( PB_REMOVE ) )
- ,m_aRemoveAllBtn ( this, CUI_RES( PB_REMOVEALL ) )
- ,m_aChangeBtn ( this, CUI_RES( PB_CHANGE ) )
- ,m_aButtonsFL ( this, CUI_RES( FL_BUTTONS ) )
- ,m_aCloseBtn ( this, CUI_RES( PB_CLOSE ) )
- ,m_aHelpBtn ( this, CUI_RES( PB_HELP ) )
- ,m_nPos ( -1 )
+WebConnectionInfoDialog::WebConnectionInfoDialog(Window* pParent)
+ : ModalDialog(pParent, "StoredWebConnectionDialog", "cui/ui/storedwebconnectiondialog.ui")
+ , m_nPos( -1 )
{
- static long aStaticTabs[]= { 3, 0, 150, 250 };
- m_aPasswordsLB.SetTabs( aStaticTabs );
- m_aPasswordsLB.InsertHeaderItem( 1, CUI_RESSTR( STR_WEBSITE ),
+ get(m_pRemoveBtn, "remove");
+ get(m_pRemoveAllBtn, "removeall");
+ get(m_pChangeBtn, "change");
+
+ SvxSimpleTableContainer *pPasswordsLBContainer = get<SvxSimpleTableContainer>("logins");
+ m_pPasswordsLB = new PasswordTable(*pPasswordsLBContainer, 0);
+
+ long aStaticTabs[]= { 2, 0, 0 };
+ m_pPasswordsLB->SetTabs( aStaticTabs );
+ m_pPasswordsLB->InsertHeaderItem( 1, get<FixedText>("website")->GetText(),
HIB_LEFT | HIB_VCENTER | HIB_FIXEDPOS | HIB_CLICKABLE | HIB_UPARROW );
- m_aPasswordsLB.InsertHeaderItem( 2, CUI_RESSTR( STR_USERNAME ),
+ m_pPasswordsLB->InsertHeaderItem( 2, get<FixedText>("username")->GetText(),
HIB_LEFT | HIB_VCENTER | HIB_FIXEDPOS );
- m_aPasswordsLB.ResetTabs();
-
- FreeResource();
-
- m_aPasswordsLB.SetHeaderBarClickHdl( LINK( this, WebConnectionInfoDialog, HeaderBarClickedHdl ) );
- m_aRemoveBtn.SetClickHdl( LINK( this, WebConnectionInfoDialog, RemovePasswordHdl ) );
- m_aRemoveAllBtn.SetClickHdl( LINK( this, WebConnectionInfoDialog, RemoveAllPasswordsHdl ) );
- m_aChangeBtn.SetClickHdl( LINK( this, WebConnectionInfoDialog, ChangePasswordHdl ) );
-
- // one button too small for its text?
- sal_Int32 i = 0;
- long nBtnTextWidth = 0;
- Window* pButtons[] = { &m_aRemoveBtn, &m_aRemoveAllBtn, &m_aChangeBtn };
- Window** pButton = pButtons;
- const sal_Int32 nBCount = SAL_N_ELEMENTS( pButtons );
- for ( ; i < nBCount; ++i, ++pButton )
- {
- long nTemp = (*pButton)->GetCtrlTextWidth( (*pButton)->GetText() );
- if ( nTemp > nBtnTextWidth )
- nBtnTextWidth = nTemp;
- }
- nBtnTextWidth = nBtnTextWidth * 115 / 100; // a little offset
- long nButtonWidth = m_aRemoveBtn.GetSizePixel().Width();
- if ( nBtnTextWidth > nButtonWidth )
- {
- // so make the buttons broader and its control in front of it smaller
- long nDelta = nBtnTextWidth - nButtonWidth;
- pButton = pButtons;
- for ( i = 0; i < nBCount; ++i, ++pButton )
- {
- Point aNewPos = (*pButton)->GetPosPixel();
- if ( &m_aRemoveAllBtn == (*pButton) )
- aNewPos.X() += nDelta;
- else if ( &m_aChangeBtn == (*pButton) )
- aNewPos.X() -= nDelta;
- Size aNewSize = (*pButton)->GetSizePixel();
- aNewSize.Width() += nDelta;
- (*pButton)->SetPosSizePixel( aNewPos, aNewSize );
- }
- }
+ pPasswordsLBContainer->set_height_request(m_pPasswordsLB->GetTextHeight()*8);
+
+ m_pPasswordsLB->SetHeaderBarClickHdl( LINK( this, WebConnectionInfoDialog, HeaderBarClickedHdl ) );
+ m_pRemoveBtn->SetClickHdl( LINK( this, WebConnectionInfoDialog, RemovePasswordHdl ) );
+ m_pRemoveAllBtn->SetClickHdl( LINK( this, WebConnectionInfoDialog, RemoveAllPasswordsHdl ) );
+ m_pChangeBtn->SetClickHdl( LINK( this, WebConnectionInfoDialog, ChangePasswordHdl ) );
+
FillPasswordList();
- m_aRemoveBtn.SetClickHdl( LINK( this, WebConnectionInfoDialog, RemovePasswordHdl ) );
- m_aRemoveAllBtn.SetClickHdl( LINK( this, WebConnectionInfoDialog, RemoveAllPasswordsHdl ) );
- m_aChangeBtn.SetClickHdl( LINK( this, WebConnectionInfoDialog, ChangePasswordHdl ) );
- m_aPasswordsLB.SetSelectHdl( LINK( this, WebConnectionInfoDialog, EntrySelectedHdl ) );
+ m_pRemoveBtn->SetClickHdl( LINK( this, WebConnectionInfoDialog, RemovePasswordHdl ) );
+ m_pRemoveAllBtn->SetClickHdl( LINK( this, WebConnectionInfoDialog, RemoveAllPasswordsHdl ) );
+ m_pChangeBtn->SetClickHdl( LINK( this, WebConnectionInfoDialog, ChangePasswordHdl ) );
+ m_pPasswordsLB->SetSelectHdl( LINK( this, WebConnectionInfoDialog, EntrySelectedHdl ) );
- m_aRemoveBtn.Enable( sal_False );
- m_aChangeBtn.Enable( sal_False );
+ m_pRemoveBtn->Enable( sal_False );
+ m_pChangeBtn->Enable( sal_False );
HeaderBarClickedHdl( NULL );
}
-// -----------------------------------------------------------------------
WebConnectionInfoDialog::~WebConnectionInfoDialog()
{
+ delete m_pPasswordsLB;
}
// -----------------------------------------------------------------------
IMPL_LINK( WebConnectionInfoDialog, HeaderBarClickedHdl, SvxSimpleTable*, pTable )
{
- m_aPasswordsLB.Resort( NULL == pTable );
+ m_pPasswordsLB->Resort( NULL == pTable );
return 0;
}
@@ -192,7 +173,7 @@ void WebConnectionInfoDialog::FillPasswordList()
::rtl::OUString aUIEntry( aURLEntries[nURLInd].Url );
aUIEntry += ::rtl::OUString::valueOf( (sal_Unicode)'\t' );
aUIEntry += aURLEntries[nURLInd].UserList[nUserInd].UserName;
- SvTreeListEntry* pEntry = m_aPasswordsLB.InsertEntry( aUIEntry );
+ SvTreeListEntry* pEntry = m_pPasswordsLB->InsertEntry( aUIEntry );
pEntry->SetUserData( (void*)(sal_IntPtr)(nCount++) );
}
}
@@ -208,7 +189,7 @@ void WebConnectionInfoDialog::FillPasswordList()
::rtl::OUString aUIEntry( aUrls[ nURLIdx ] );
aUIEntry += ::rtl::OUString::valueOf( (sal_Unicode)'\t' );
aUIEntry += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*" ) );
- SvTreeListEntry* pEntry = m_aPasswordsLB.InsertEntry( aUIEntry );
+ SvTreeListEntry* pEntry = m_pPasswordsLB->InsertEntry( aUIEntry );
pEntry->SetUserData( (void*)(sal_IntPtr)(nCount++) );
}
}
@@ -222,11 +203,11 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, RemovePasswordHdl)
{
try
{
- SvTreeListEntry* pEntry = m_aPasswordsLB.GetCurEntry();
+ SvTreeListEntry* pEntry = m_pPasswordsLB->GetCurEntry();
if ( pEntry )
{
- ::rtl::OUString aURL = m_aPasswordsLB.GetEntryText( pEntry, 0 );
- ::rtl::OUString aUserName = m_aPasswordsLB.GetEntryText( pEntry, 1 );
+ ::rtl::OUString aURL = m_pPasswordsLB->GetEntryText( pEntry, 0 );
+ ::rtl::OUString aUserName = m_pPasswordsLB->GetEntryText( pEntry, 1 );
uno::Reference< task::XPasswordContainer2 > xPasswdContainer(
task::PasswordContainer::create(comphelper::getProcessComponentContext()));
@@ -240,7 +221,7 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, RemovePasswordHdl)
{
xPasswdContainer->removeUrl( aURL );
}
- m_aPasswordsLB.RemoveEntry( pEntry );
+ m_pPasswordsLB->RemoveEntry( pEntry );
}
}
catch( uno::Exception& )
@@ -265,7 +246,7 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, RemoveAllPasswordsHdl)
for ( sal_Int32 nURLIdx = 0; nURLIdx < aUrls.getLength(); nURLIdx++ )
xPasswdContainer->removeUrl( aUrls[ nURLIdx ] );
- m_aPasswordsLB.Clear();
+ m_pPasswordsLB->Clear();
}
catch( uno::Exception& )
{}
@@ -278,11 +259,11 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, ChangePasswordHdl)
{
try
{
- SvTreeListEntry* pEntry = m_aPasswordsLB.GetCurEntry();
+ SvTreeListEntry* pEntry = m_pPasswordsLB->GetCurEntry();
if ( pEntry )
{
- ::rtl::OUString aURL = m_aPasswordsLB.GetEntryText( pEntry, 0 );
- ::rtl::OUString aUserName = m_aPasswordsLB.GetEntryText( pEntry, 1 );
+ ::rtl::OUString aURL = m_pPasswordsLB->GetEntryText( pEntry, 0 );
+ ::rtl::OUString aUserName = m_pPasswordsLB->GetEntryText( pEntry, 1 );
::comphelper::SimplePasswordRequest* pPasswordRequest
= new ::comphelper::SimplePasswordRequest( task::PasswordRequestMode_PASSWORD_CREATE );
@@ -315,20 +296,20 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, ChangePasswordHdl)
// -----------------------------------------------------------------------
IMPL_LINK_NOARG(WebConnectionInfoDialog, EntrySelectedHdl)
{
- SvTreeListEntry* pEntry = m_aPasswordsLB.GetCurEntry();
+ SvTreeListEntry* pEntry = m_pPasswordsLB->GetCurEntry();
if ( !pEntry )
{
- m_aRemoveBtn.Enable( sal_False );
- m_aChangeBtn.Enable( sal_False );
+ m_pRemoveBtn->Enable( sal_False );
+ m_pChangeBtn->Enable( sal_False );
}
else
{
- m_aRemoveBtn.Enable( sal_True );
+ m_pRemoveBtn->Enable( sal_True );
// url container entries (-> use system credentials) have
// no password
sal_Int32 nPos = (sal_Int32)(sal_IntPtr)pEntry->GetUserData();
- m_aChangeBtn.Enable( nPos < m_nPos );
+ m_pChangeBtn->Enable( nPos < m_nPos );
}
return 0;
diff --git a/cui/source/options/webconninfo.hrc b/cui/source/options/webconninfo.hrc
deleted file mode 100644
index 663d004..0000000
--- a/cui/source/options/webconninfo.hrc
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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
-
diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx
index c07bdb2..03a15e1 100644
--- a/cui/source/options/webconninfo.hxx
+++ b/cui/source/options/webconninfo.hxx
@@ -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 *);
diff --git a/cui/source/options/webconninfo.src b/cui/source/options/webconninfo.src
deleted file mode 100644
index 962f683..0000000
--- a/cui/source/options/webconninfo.src
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * 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";
- };
-};
-
diff --git a/cui/uiconfig/ui/storedwebconnectiondialog.ui b/cui/uiconfig/ui/storedwebconnectiondialog.ui
new file mode 100644
index 0000000..f4a1a35
--- /dev/null
+++ b/cui/uiconfig/ui/storedwebconnectiondialog.ui
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="StoredWebConnectionDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Stored Web Connection Information</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="close">
+ <property name="label">gtk-close</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">0</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">1</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="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="border_width">6</property>
+ <property name="row_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Web login information (passwords are never shown)</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>
+ <child>
+ <object class="GtkGrid" id="grid3">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="hexpand">True</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="website">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Website</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>
+ <child>
+ <object class="GtkLabel" id="username">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">User name</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="svxcorelo:SvxSimpleTableContainer" id="logins">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButtonBox" id="buttonbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="remove">
+ <property name="label">gtk-remove</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">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="removeall">
+ <property name="label" translatable="yes">Remove _All</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">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="change">
+ <property name="label" translatable="yes">_Change Password...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ <property name="secondary">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">close</action-widget>
+ <action-widget response="0">help</action-widget>
+ </action-widgets>
+ </object>
+</interface>
diff --git a/svx/inc/svx/simptabl.hxx b/svx/inc/svx/simptabl.hxx
index 9bc8817..fc1abc7 100644
--- a/svx/inc/svx/simptabl.hxx
+++ b/svx/inc/svx/simptabl.hxx
@@ -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);
diff --git a/sw/uiconfig/swriter/ui/storedwebconnectioninfo.ui b/sw/uiconfig/swriter/ui/storedwebconnectioninfo.ui
deleted file mode 100644
index 3211625..0000000
--- a/sw/uiconfig/swriter/ui/storedwebconnectioninfo.ui
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
- <!-- interface-requires gtk+ 3.0 -->
- <object class="GtkDialog" id="Stored Web Connection information">
- <property name="can_focus">False</property>
- <property name="border_width">5</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">6</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="close">
- <property name="label">gtk-close</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>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <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>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</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="GtkBox" id="box1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Web login information (password are never shown)</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid" id="grid2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkLabel" id="label2">
- <property name="width_request">200</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Website</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>
- <child>
- <object class="GtkLabel" id="label3">
- <property name="width_request">100</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">User name</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="shadow_type">in</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid" id="grid1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="column_spacing">6</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <object class="GtkButton" id="button1">
- <property name="label">gtk-remove</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>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button2">
- <property name="label" translatable="yes">Remove ~All</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="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button3">
- <property name="label" translatable="yes">~Change Password...</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="left_attach">3</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- </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="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- <action-widgets>
- <action-widget response="0">close</action-widget>
- <action-widget response="0">help</action-widget>
- </action-widgets>
- </object>
-</interface>
More information about the Libreoffice-commits
mailing list