[Libreoffice-commits] .: 2 commits - cui/source cui/uiconfig sw/inc sw/source sw/uiconfig uui/AllLangResTarget_uui.mk uui/Module_uui.mk uui/source uui/uiconfig uui/UI_uui.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Jan 26 17:55:10 PST 2013
cui/source/dialogs/insdlg.cxx | 1
cui/source/dialogs/zoom.cxx | 3
cui/source/inc/numfmt.hxx | 2
cui/source/tabpages/backgrnd.cxx | 3
cui/source/tabpages/numfmt.cxx | 17 ---
cui/uiconfig/ui/backgroundpage.ui | 6 +
cui/uiconfig/ui/numberingformatpage.ui | 2
cui/uiconfig/ui/zoomdialog.ui | 40 +++-----
sw/inc/access.hrc | 2
sw/inc/globals.hrc | 2
sw/inc/helpid.h | 1
sw/source/ui/app/app.src | 10 --
sw/source/ui/chrdlg/break.cxx | 1
sw/source/ui/inc/app.hrc | 1
sw/source/ui/misc/glossary.cxx | 3
sw/source/ui/misc/glossary.src | 4
sw/source/ui/misc/insfnote.cxx | 4
sw/source/ui/table/convert.cxx | 3
sw/source/ui/table/tabledlg.cxx | 1
sw/uiconfig/swriter/ui/autotext.ui | 11 ++
sw/uiconfig/swriter/ui/converttexttable.ui | 39 ++------
sw/uiconfig/swriter/ui/entermasterpassword.ui | 121 -------------------------
sw/uiconfig/swriter/ui/insertbreak.ui | 20 +---
sw/uiconfig/swriter/ui/insertfootnote.ui | 31 ++----
sw/uiconfig/swriter/ui/tabletextflowpage.ui | 6 +
uui/AllLangResTarget_uui.mk | 1
uui/Module_uui.mk | 1
uui/UI_uui.mk | 16 +++
uui/source/ids.hrc | 3
uui/source/masterpassworddlg.cxx | 23 +---
uui/source/masterpassworddlg.hrc | 33 ------
uui/source/masterpassworddlg.hxx | 11 --
uui/source/masterpassworddlg.src | 69 --------------
uui/uiconfig/ui/masterpassworddlg.ui | 123 ++++++++++++++++++++++++++
34 files changed, 226 insertions(+), 388 deletions(-)
New commits:
commit edfe47853aafd03e4cb2bc68772215d49f020740
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jan 27 00:58:35 2013 +0000
move SetAccessibleRelationLabeledBy relations into .ui and out of code
Change-Id: Iaf1a4a5ed813f48f9241f9e3ae7a732c22b7b9e5
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index a0be598..4163afc 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -200,7 +200,6 @@ SvInsertOleDlg::SvInsertOleDlg
m_pRbObjectFromfile->SetClickHdl( aLink );
m_pRbNewObject->Check( sal_True );
RadioHdl( NULL );
- m_pBtnFilepath->SetAccessibleRelationMemberOf(m_pFileFrame->get_label_widget());
}
short SvInsertOleDlg::Execute()
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index de5997f..a3d5387 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -196,12 +196,9 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet )
m_pUserEdit->SetLast( nMax );
m_pUserEdit->SetValue( nValue );
- m_pUserEdit->SetAccessibleRelationLabeledBy(m_pUserBtn);
m_pUserEdit->SetAccessibleName(m_pUserBtn->GetText());
- m_pColumnsEdit->SetAccessibleRelationLabeledBy(m_pColumnsBtn);
m_pColumnsEdit->SetAccessibleName(m_pColumnsBtn->GetText());
m_pColumnsEdit->SetAccessibleRelationMemberOf(m_pColumnsBtn);
- m_pBookModeChk->SetAccessibleRelationLabeledBy(m_pColumnsBtn);
m_pBookModeChk->SetAccessibleRelationMemberOf(m_pColumnsBtn);
const SfxPoolItem& rItem = rSet.Get( rSet.GetPool()->GetWhich( SID_ATTR_ZOOM ) );
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index d31adc9..7cd9c79 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -106,7 +106,7 @@ private:
NumericField* m_pEdLeadZeroes;
CheckBox* m_pBtnThousand;
- FixedText* m_pFtEdFormat;
+ VclContainer* m_pFormatCodeFrame;
Edit* m_pEdFormat;
PushButton* m_pIbAdd;
PushButton* m_pIbInfo;
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index f5c6d4a..4f3f0ff 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -379,9 +379,6 @@ SvxBackgroundTabPage::SvxBackgroundTabPage(Window* pParent, const SfxItemSet& rC
FillColorValueSets_Impl();
m_pBackgroundColorSet->SetSelectHdl( HDL(BackgroundColorHdl_Impl) );
-
- m_pWndPosition->SetAccessibleRelationLabeledBy(m_pBtnPosition);
- m_pBackgroundColorSet->SetAccessibleRelationLabeledBy(m_pBackGroundColorFrame->get_label_widget());
}
//------------------------------------------------------------------------
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 9e2cb5e..0969da7 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -246,7 +246,7 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage(Window* pParent,
get(m_pFtLeadZeroes, "leadzerosft");
get(m_pEdLeadZeroes, "leadzerosed");
get(m_pBtnThousand, "thousands");
- get(m_pFtEdFormat, "formatft");
+ get(m_pFormatCodeFrame, "formatcode");
get(m_pEdFormat, "formated");
get(m_pIbAdd, "add");
get(m_pIbInfo, "edit");
@@ -324,13 +324,6 @@ void SvxNumberFormatTabPage::Init_Impl()
{
m_pLbLanguage->InsertLanguage( xLang[i] );
}
-
- m_pIbAdd->SetAccessibleRelationLabeledBy(m_pFtEdFormat);
- m_pIbInfo->SetAccessibleRelationLabeledBy(m_pFtEdFormat);
- m_pIbRemove->SetAccessibleRelationLabeledBy(m_pFtEdFormat);
- m_pIbAdd->SetAccessibleRelationMemberOf(m_pIbAdd);
- m_pIbInfo->SetAccessibleRelationMemberOf(m_pIbInfo);
- m_pIbRemove->SetAccessibleRelationMemberOf(m_pIbRemove);
}
/*************************************************************************
@@ -657,13 +650,7 @@ void SvxNumberFormatTabPage::EnableBySourceFormat_Impl()
m_pBtnNegRed->Enable( bEnable );
m_pBtnThousand->Enable( bEnable );
m_pFtOptions->Enable( bEnable );
- m_pFtEdFormat->Enable( bEnable );
- m_pEdFormat->Enable( bEnable );
- m_pIbAdd->Enable( bEnable );
- m_pIbRemove->Enable( bEnable );
- m_pIbInfo->Enable( bEnable );
- m_pFtComment->Enable( bEnable );
- m_pEdComment->Enable( bEnable );
+ m_pFormatCodeFrame->Enable( bEnable );
m_pLbFormat->Invalidate(); // #i43322#
}
diff --git a/cui/uiconfig/ui/backgroundpage.ui b/cui/uiconfig/ui/backgroundpage.ui
index 462cb13..bea099b 100644
--- a/cui/uiconfig/ui/backgroundpage.ui
+++ b/cui/uiconfig/ui/backgroundpage.ui
@@ -417,6 +417,9 @@
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
+ <accessibility>
+ <relation type="labelled-by" target="positionrb"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">1</property>
@@ -441,6 +444,9 @@
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">arearb</property>
+ <accessibility>
+ <relation type="label-for" target="windowpos"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">0</property>
diff --git a/cui/uiconfig/ui/numberingformatpage.ui b/cui/uiconfig/ui/numberingformatpage.ui
index d3b7e11..1366dd3 100644
--- a/cui/uiconfig/ui/numberingformatpage.ui
+++ b/cui/uiconfig/ui/numberingformatpage.ui
@@ -204,6 +204,7 @@
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Decimal places</property>
<property name="use_underline">True</property>
+ <property name="mnemonic_widget">decimalsed</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -218,6 +219,7 @@
<property name="can_focus">False</property>
<property name="label" translatable="yes">Leading _zeroes</property>
<property name="use_underline">True</property>
+ <property name="mnemonic_widget">leadzerosed</property>
</object>
<packing>
<property name="left_attach">0</property>
diff --git a/cui/uiconfig/ui/zoomdialog.ui b/cui/uiconfig/ui/zoomdialog.ui
index ad70428..bb97815 100644
--- a/cui/uiconfig/ui/zoomdialog.ui
+++ b/cui/uiconfig/ui/zoomdialog.ui
@@ -24,12 +24,10 @@
<child>
<object class="GtkButton" id="ok">
<property name="label">gtk-ok</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -41,11 +39,9 @@
<child>
<object class="GtkButton" id="cancel">
<property name="label">gtk-cancel</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>
@@ -57,11 +53,9 @@
<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>
@@ -102,11 +96,9 @@
<child>
<object class="GtkRadioButton" id="optimal">
<property name="label" translatable="yes">Optimal</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="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -121,11 +113,9 @@
<child>
<object class="GtkRadioButton" id="fitwandh">
<property name="label" translatable="yes">Fit width and height</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="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -140,11 +130,9 @@
<child>
<object class="GtkRadioButton" id="fitw">
<property name="label" translatable="yes">Fit width</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="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -159,11 +147,9 @@
<child>
<object class="GtkRadioButton" id="100pc">
<property name="label" translatable="yes">100%</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="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -183,15 +169,16 @@
<child>
<object class="GtkRadioButton" id="variable">
<property name="label" translatable="yes">Variable</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="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">optimal</property>
+ <accessibility>
+ <relation type="label-for" target="zoomsb:0%"/>
+ </accessibility>
</object>
<packing>
<property name="expand">False</property>
@@ -204,6 +191,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â—</property>
+ <accessibility>
+ <relation type="labelled-by" target="variable"/>
+ </accessibility>
</object>
<packing>
<property name="expand">False</property>
@@ -258,11 +248,9 @@
<child>
<object class="GtkRadioButton" id="automatic">
<property name="label" translatable="yes">Automatic</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="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -277,11 +265,9 @@
<child>
<object class="GtkRadioButton" id="singlepage">
<property name="label" translatable="yes">Single page</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="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -301,15 +287,17 @@
<child>
<object class="GtkRadioButton" id="columns">
<property name="label" translatable="yes">Columns</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="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">automatic</property>
+ <accessibility>
+ <relation type="label-for" target="columnssb:0"/>
+ <relation type="label-for" target="bookmode"/>
+ </accessibility>
</object>
<packing>
<property name="expand">False</property>
@@ -323,6 +311,9 @@
<property name="can_focus">True</property>
<property name="invisible_char">â—</property>
<property name="adjustment">adjustment1</property>
+ <accessibility>
+ <relation type="labelled-by" target="columns"/>
+ </accessibility>
</object>
<packing>
<property name="expand">False</property>
@@ -345,13 +336,14 @@
<child>
<object class="GtkCheckButton" id="bookmode">
<property name="label" translatable="yes">Book mode</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="xalign">0</property>
<property name="draw_indicator">True</property>
+ <accessibility>
+ <relation type="labelled-by" target="columns"/>
+ </accessibility>
</object>
</child>
</object>
diff --git a/sw/inc/access.hrc b/sw/inc/access.hrc
index 928b031..ffeba47 100644
--- a/sw/inc/access.hrc
+++ b/sw/inc/access.hrc
@@ -46,7 +46,7 @@
#define STR_ACCESS_DOC_WORDPROCESSING_READONLY (RC_ACCESS_BEGIN + 26)
#define STR_ACCESS_COLUMN_WIDTH (RC_ACCESS_BEGIN + 27)
#define STR_ACCESS_PAGESETUP_SPACING (RC_ACCESS_BEGIN + 28)
-#define STR_ACCESS_SW_CATEGORY (RC_ACCESS_BEGIN + 29)
+
#define STR_ACCESS_TL_GLOBAL (RC_ACCESS_BEGIN + 30)
#define STR_ACCESS_TL_CONTENT (RC_ACCESS_BEGIN + 31)
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index e70f6e4..0653aaf 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -63,7 +63,7 @@
#define STR_JAVA_EDIT (RC_GLOBALS_BEGIN + 38)
-#define STR_FOOTNOTE_DIALOG_CHAR (RC_GLOBALS_BEGIN + 39)
+
#define STR_REMOVE_WARNING (RC_GLOBALS_BEGIN + 40)
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index a09ad84..d5896d1 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -305,7 +305,6 @@
#define HID_LINGU_SPELLING_DLG "SW_HID_LINGU_SPELLING_DLG"
#define HID_LINGU_AUTOCORR "SW_HID_LINGU_AUTOCORR"
#define HID_LINGU_REPLACE "SW_HID_LINGU_REPLACE"
-#define HID_MD_GLOS_CATEGORY "SW_HID_MD_GLOS_CATEGORY"
#define HID_REGION_TREE "SW_HID_REGION_TREE"
#define HID_LINGU_WORD_LANGUAGE "SW_HID_LINGU_WORD_LANGUAGE"
#define HID_LINGU_PARA_LANGUAGE "SW_HID_LINGU_PARA_LANGUAGE"
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index a7faf17..4bf6801 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -226,11 +226,6 @@ String STR_JAVA_EDIT
Text [ en-US ] = "Edit Script" ;
};
-String STR_FOOTNOTE_DIALOG_CHAR
-{
- Text [ en-US ] = "Character" ;
-};
-
String STR_REMOVE_WARNING
{
Text [ en-US ] = "The following characters are not valid and have been removed: ";
@@ -612,11 +607,6 @@ String STR_CONVERT_TEXT_TABLE
Text [ en-US ] = "Convert Text to Table" ;
};
-String STR_SYMBOL
-{
- Text [ en-US ] = "Symbol" ;
-};
-
String STR_ADD_AUTOFORMAT_TITLE
{
Text [ en-US ] = "Add AutoFormat" ;
diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx
index e4e2d1b..032bdd6 100644
--- a/sw/source/ui/chrdlg/break.cxx
+++ b/sw/source/ui/chrdlg/break.cxx
@@ -140,7 +140,6 @@ SwBreakDlg::SwBreakDlg( Window *pParent, SwWrtShell &rS )
get(m_pPageNumBox, "pagenumcb");
get(m_pPageNumEdit, "pagenumsb");
- m_pPageNumEdit->SetAccessibleRelationLabeledBy(m_pPageNumBox);
m_pPageNumEdit->SetAccessibleName(m_pPageNumBox->GetText());
Link aLk = LINK(this,SwBreakDlg,ClickHdl);
diff --git a/sw/source/ui/inc/app.hrc b/sw/source/ui/inc/app.hrc
index 9131ac5..84402a7 100644
--- a/sw/source/ui/inc/app.hrc
+++ b/sw/source/ui/inc/app.hrc
@@ -91,7 +91,6 @@
#define STR_OUTLINE_NUMBERING (RC_APP_BEGIN + 104)
#define STR_FDLG_OUTLINE_LEVEL (RC_APP_BEGIN + 105)
#define STR_FDLG_STYLE (RC_APP_BEGIN + 106)
-#define STR_SYMBOL (RC_APP_BEGIN + 107)
// Status bar strings
#define STR_STATUSBAR_WORDCOUNT_NO_SELECTION (RC_APP_BEGIN + 110)
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index c5a38ae..ab833ed 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -241,13 +241,10 @@ SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame* pViewFrame,
if( bIsDocReadOnly )
m_pInsertBtn->Enable(sal_False);
m_pNameED->GrabFocus();
- m_pCategoryBox->SetHelpId(HID_MD_GLOS_CATEGORY);
m_pCategoryBox->SetStyle(m_pCategoryBox->GetStyle()|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL|WB_VSCROLL|WB_CLIPCHILDREN|WB_SORT);
m_pCategoryBox->GetModel()->SetSortMode(SortAscending);
m_pCategoryBox->SetHighlightRange(); // select over full width
m_pCategoryBox->SetNodeDefaultImages( );
- m_pCategoryBox->SetAccessibleName(SW_RES(STR_ACCESS_SW_CATEGORY));
- m_pCategoryBox->SetAccessibleRelationLabeledBy(m_pInsertTipCB);
Init();
}
diff --git a/sw/source/ui/misc/glossary.src b/sw/source/ui/misc/glossary.src
index b60c5a1..1bd92a5 100644
--- a/sw/source/ui/misc/glossary.src
+++ b/sw/source/ui/misc/glossary.src
@@ -44,10 +44,6 @@ String STR_GLOSSARY
{
Text [ en-US ] = "AutoText :" ;
};
-String STR_ACCESS_SW_CATEGORY
-{
- Text [ en-US ] = "Category" ;
-};
ModalDialog DLG_RENAME_GLOS
{
OutputSize = TRUE ;
diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx
index e455bfe..34df645 100644
--- a/sw/source/ui/misc/insfnote.cxx
+++ b/sw/source/ui/misc/insfnote.cxx
@@ -184,10 +184,6 @@ SwInsFootNoteDlg::SwInsFootNoteDlg(Window *pParent, SwWrtShell &rShell, sal_Bool
get(m_pPrevBT, "prev");
get(m_pNextBT, "next");
- m_pNumberCharEdit->SetAccessibleName(String(SW_RES(STR_FOOTNOTE_DIALOG_CHAR)));
- m_pNumberExtChar->SetAccessibleRelationMemberOf(m_pNumberFrame->get_label_widget());
- m_pNumberCharEdit->SetAccessibleRelationLabeledBy(m_pNumberCharBtn);
-
m_pNumberAutoBtn->SetClickHdl(LINK(this,SwInsFootNoteDlg,NumberAutoBtnHdl));
m_pNumberExtChar->SetClickHdl(LINK(this,SwInsFootNoteDlg,NumberExtCharHdl));
m_pNumberCharBtn->SetClickHdl(LINK(this,SwInsFootNoteDlg,NumberCharHdl));
diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx
index 2beeaef..93e3624 100644
--- a/sw/source/ui/table/convert.cxx
+++ b/sw/source/ui/table/convert.cxx
@@ -119,9 +119,6 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable )
get(mpBorderCB, "bordercb");
get(mpAutoFmtBtn, "autofmt");
- mpOtherEd->SetAccessibleName(String(SW_RES(STR_SYMBOL)));
- mpOtherEd->SetAccessibleRelationLabeledBy(mpOtherBtn);
-
if(nSaveButtonState > -1)
{
switch (nSaveButtonState)
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 0653144..656ba32 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -1312,7 +1312,6 @@ SwTextFlowPage::SwTextFlowPage(Window* pParent, const SfxItemSet& rSet)
m_pColBrkRB->SetAccessibleRelationMemberOf(m_pPgBrkCB);
m_pPgBrkBeforeRB->SetAccessibleRelationMemberOf(m_pPgBrkCB);
m_pPgBrkAfterRB->SetAccessibleRelationMemberOf(m_pPgBrkCB);
- m_pPageCollLB->SetAccessibleRelationLabeledBy(m_pPageCollCB);
m_pPageCollLB->SetAccessibleName(m_pPageCollCB->GetText());
m_pPgBrkCB->SetClickHdl(LINK(this, SwTextFlowPage, PageBreakHdl_Impl));
diff --git a/sw/uiconfig/swriter/ui/autotext.ui b/sw/uiconfig/swriter/ui/autotext.ui
index 0925aac..e6fddb1 100644
--- a/sw/uiconfig/swriter/ui/autotext.ui
+++ b/sw/uiconfig/swriter/ui/autotext.ui
@@ -230,6 +230,9 @@
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
+ <accessibility>
+ <relation type="label-for" target="category"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">0</property>
@@ -318,6 +321,14 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
+ <accessibility>
+ <relation type="labelled-by" target="inserttip"/>
+ </accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="othered-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Category</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
diff --git a/sw/uiconfig/swriter/ui/converttexttable.ui b/sw/uiconfig/swriter/ui/converttexttable.ui
index 1b3e6b1..8426f7c 100644
--- a/sw/uiconfig/swriter/ui/converttexttable.ui
+++ b/sw/uiconfig/swriter/ui/converttexttable.ui
@@ -25,12 +25,10 @@
<child>
<object class="GtkButton" id="ok">
<property name="label">gtk-ok</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -42,11 +40,9 @@
<child>
<object class="GtkButton" id="cancel">
<property name="label">gtk-cancel</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>
@@ -58,11 +54,9 @@
<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>
@@ -114,6 +108,14 @@
<property name="width_chars">1</property>
<property name="text" translatable="yes">,</property>
<property name="invisible_char_set">True</property>
+ <accessibility>
+ <relation type="labelled-by" target="other"/>
+ </accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="othered-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Symbol</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">2</property>
@@ -125,15 +127,16 @@
<child>
<object class="GtkRadioButton" id="other">
<property name="label" translatable="yes">Other:</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="valign">end</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">tabs</property>
+ <accessibility>
+ <relation type="label-for" target="othered"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">1</property>
@@ -145,12 +148,10 @@
<child>
<object class="GtkRadioButton" id="semicolons">
<property name="label" translatable="yes">Semicolons</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="valign">end</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">other</property>
@@ -165,12 +166,10 @@
<child>
<object class="GtkRadioButton" id="paragraph">
<property name="label" translatable="yes">Paragraph</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="valign">end</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">semicolons</property>
@@ -185,13 +184,11 @@
<child>
<object class="GtkRadioButton" id="tabs">
<property name="label" translatable="yes">Tabs</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="halign">start</property>
<property name="valign">end</property>
- <property name="use_action_appearance">False</property>
<property name="relief">half</property>
<property name="xalign">0</property>
<property name="active">True</property>
@@ -208,10 +205,8 @@
<child>
<object class="GtkCheckButton" id="keepcolumn">
<property name="label" translatable="yes">Equal width for all columns</property>
- <property name="use_action_appearance">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -264,11 +259,9 @@
<child>
<object class="GtkCheckButton" id="headingcb">
<property name="label" translatable="yes">Heading</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="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -282,12 +275,10 @@
<child>
<object class="GtkCheckButton" id="repeatheading">
<property name="label" translatable="yes">Repeat heading</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="margin_left">25</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -302,11 +293,9 @@
<child>
<object class="GtkCheckButton" id="dontsplitcb">
<property name="label" translatable="yes">Don't split table</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="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -320,11 +309,9 @@
<child>
<object class="GtkCheckButton" id="bordercb">
<property name="label" translatable="yes">Border</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="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -347,6 +334,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">The first </property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">repeatheadersb</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -397,10 +386,8 @@
<child>
<object class="GtkButton" id="autofmt">
<property name="label" translatable="yes">AutoFormat...</property>
- <property name="use_action_appearance">False</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">0</property>
diff --git a/sw/uiconfig/swriter/ui/insertbreak.ui b/sw/uiconfig/swriter/ui/insertbreak.ui
index f697468..3cfdb2c 100644
--- a/sw/uiconfig/swriter/ui/insertbreak.ui
+++ b/sw/uiconfig/swriter/ui/insertbreak.ui
@@ -36,13 +36,11 @@
<child>
<object class="GtkButton" id="ok">
<property name="label">gtk-ok</property>
- <property name="use_action_appearance">False</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_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -54,11 +52,9 @@
<child>
<object class="GtkButton" id="cancel">
<property name="label">gtk-cancel</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>
@@ -70,11 +66,9 @@
<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>
@@ -110,11 +104,9 @@
<child>
<object class="GtkRadioButton" id="linerb">
<property name="label" translatable="yes">Line break</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="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -129,11 +121,9 @@
<child>
<object class="GtkRadioButton" id="columnrb">
<property name="label" translatable="yes">Column break</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="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -148,11 +138,9 @@
<child>
<object class="GtkRadioButton" id="pagerb">
<property name="label" translatable="yes">Page break</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="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -192,13 +180,14 @@
<child>
<object class="GtkCheckButton" id="pagenumcb">
<property name="label" translatable="yes">Change page number</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="xalign">0</property>
<property name="draw_indicator">True</property>
+ <accessibility>
+ <relation type="label-for" target="pagenumsb"/>
+ </accessibility>
</object>
<packing>
<property name="expand">False</property>
@@ -217,6 +206,9 @@
<property name="invisible_char">â—</property>
<property name="invisible_char_set">True</property>
<property name="adjustment">adjustment1</property>
+ <accessibility>
+ <relation type="labelled-by" target="pagenumcb"/>
+ </accessibility>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sw/uiconfig/swriter/ui/insertfootnote.ui b/sw/uiconfig/swriter/ui/insertfootnote.ui
index a4b2020..64a787f 100644
--- a/sw/uiconfig/swriter/ui/insertfootnote.ui
+++ b/sw/uiconfig/swriter/ui/insertfootnote.ui
@@ -18,13 +18,11 @@
<child>
<object class="GtkButton" id="ok">
<property name="label">gtk-ok</property>
- <property name="use_action_appearance">False</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_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -36,11 +34,9 @@
<child>
<object class="GtkButton" id="cancel">
<property name="label">gtk-cancel</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>
@@ -52,11 +48,9 @@
<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>
@@ -72,10 +66,8 @@
<property name="column_homogeneous">True</property>
<child>
<object class="GtkButton" id="prev">
- <property name="use_action_appearance">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="image">image1</property>
<property name="image_position">right</property>
</object>
@@ -88,10 +80,8 @@
</child>
<child>
<object class="GtkButton" id="next">
- <property name="use_action_appearance">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="image">image2</property>
</object>
<packing>
@@ -142,11 +132,9 @@
<child>
<object class="GtkRadioButton" id="automatic">
<property name="label" translatable="yes">Automatic</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="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -162,14 +150,15 @@
<child>
<object class="GtkRadioButton" id="character">
<property name="label" translatable="yes">Character</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="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">automatic</property>
+ <accessibility>
+ <relation type="label-for" target="characterentry"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">0</property>
@@ -187,6 +176,14 @@
<property name="width_chars">2</property>
<property name="progress_fraction">0.0099999997764825821</property>
<property name="progress_pulse_step">0.090000003576278687</property>
+ <accessibility>
+ <relation type="labelled-by" target="character"/>
+ </accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="characterentry-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Character</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -198,12 +195,10 @@
<child>
<object class="GtkButton" id="choosecharacter">
<property name="label" translatable="yes">Choose ...</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="halign">start</property>
- <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -258,11 +253,9 @@
<child>
<object class="GtkRadioButton" id="footnote">
<property name="label" translatable="yes">Footnote</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="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -277,11 +270,9 @@
<child>
<object class="GtkRadioButton" id="endnote">
<property name="label" translatable="yes">Endnote</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="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">footnote</property>
diff --git a/sw/uiconfig/swriter/ui/tabletextflowpage.ui b/sw/uiconfig/swriter/ui/tabletextflowpage.ui
index 4527aa1..b31c36a 100644
--- a/sw/uiconfig/swriter/ui/tabletextflowpage.ui
+++ b/sw/uiconfig/swriter/ui/tabletextflowpage.ui
@@ -204,6 +204,9 @@
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
+ <accessibility>
+ <relation type="label-for" target="pagestylelb"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">0</property>
@@ -248,6 +251,9 @@
<property name="can_focus">False</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
+ <accessibility>
+ <relation type="labelled-by" target="pagestyle"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">1</property>
commit 7595340a63be2e0fc4362c0f57451830e4017d98
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 26 23:47:39 2013 +0000
move entermasterpassword.ui to right place and adapt code
Change-Id: Ia0308990eaf1b87de1c7fd673a2a25a45fcfb366
diff --git a/sw/uiconfig/swriter/ui/entermasterpassword.ui b/sw/uiconfig/swriter/ui/entermasterpassword.ui
deleted file mode 100644
index 18bfc9f..0000000
--- a/sw/uiconfig/swriter/ui/entermasterpassword.ui
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
- <!-- interface-requires gtk+ 3.0 -->
- <object class="GtkDialog" id="dialog1">
- <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>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area1">
- <property name="can_focus">False</property>
- <property name="halign">center</property>
- <property name="valign">center</property>
- <property name="layout_style">end</property>
- <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">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="ok">
- <property name="label">gtk-ok</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>
- <child>
- <object class="GtkButton" id="cancel">
- <property name="label">gtk-cancel</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">2</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="valign">end</property>
- <property name="orientation">vertical</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="yalign">0.54000002145767212</property>
- <property name="label" translatable="yes">~Enter password</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="entry1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</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="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- <action-widgets>
- <action-widget response="0">help</action-widget>
- <action-widget response="0">ok</action-widget>
- <action-widget response="0">cancel</action-widget>
- </action-widgets>
- </object>
-</interface>
diff --git a/uui/AllLangResTarget_uui.mk b/uui/AllLangResTarget_uui.mk
index 010a74a..646e311 100644
--- a/uui/AllLangResTarget_uui.mk
+++ b/uui/AllLangResTarget_uui.mk
@@ -53,7 +53,6 @@ $(eval $(call gb_SrsTarget_add_files,uui/res,\
uui/source/lockfailed.src \
uui/source/logindlg.src \
uui/source/masterpasscrtdlg.src \
- uui/source/masterpassworddlg.src \
uui/source/nameclashdlg.src \
uui/source/newerverwarn.src \
uui/source/openlocked.src \
diff --git a/uui/Module_uui.mk b/uui/Module_uui.mk
index 09e9715..e70e94e 100644
--- a/uui/Module_uui.mk
+++ b/uui/Module_uui.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_Module_Module,uui))
$(eval $(call gb_Module_add_targets,uui,\
AllLangResTarget_uui \
Library_uui \
+ UI_uui \
))
# vim: set noet sw=4 ts=4:
diff --git a/uui/UI_uui.mk b/uui/UI_uui.mk
new file mode 100644
index 0000000..114725a
--- /dev/null
+++ b/uui/UI_uui.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_UI_UI,uui))
+
+$(eval $(call gb_UI_add_uifiles,uui,\
+ uui/uiconfig/ui/masterpassworddlg \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc
index 8803ffe..ea6e58e 100644
--- a/uui/source/ids.hrc
+++ b/uui/source/ids.hrc
@@ -26,8 +26,6 @@
#define RID_SAVE_PASSWORD (RID_UUI_START + 1)
#define DLG_UUI_LOGIN (RID_UUI_START + 2)
#define DLG_FILTER_SELECT (RID_UUI_START + 10)
-// RID_UUI_START + 11 moved to ERRCODE_UUI_WRONGMEDIUM
-#define DLG_UUI_MASTERPASSWORD (RID_UUI_START + 12)
#define DLG_SIMPLE_NAME_CLASH (RID_UUI_START + 13)
#define STR_ERROR_PASSWORDS_NOT_IDENTICAL (RID_UUI_START + 13)
#define STR_ERROR_MASTERPASSWORD_WRONG (RID_UUI_START + 14)
@@ -157,7 +155,6 @@
#define TITLE_UUI_SSLWARN_INVALID (ERRCODE_AREA_UUI_UNKNOWNAUTH + SSLWARN_TYPE_INVALID + 3)
#define HID_DLG_LOGIN "UUI_HID_DLG_LOGIN"
-#define HID_DLG_MASTERPASSWORD_UUI "UUI_HID_DLG_MASTERPASSWORD_UUI"
#define HID_DLG_MASTERPASSWORD_CRT "UUI_HID_DLG_MASTERPASSWORD_CRT"
#define HID_DLG_FILTER_SELECT "UUI_HID_DLG_FILTER_SELECT"
#define HID_DLG_PASSWORD_UUI "UUI_HID_DLG_PASSWORD_UUI"
diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx
index a2f5c28..07f11af 100644
--- a/uui/source/masterpassworddlg.cxx
+++ b/uui/source/masterpassworddlg.cxx
@@ -20,7 +20,6 @@
#include <vcl/msgbox.hxx>
#include <ids.hrc>
-#include <masterpassworddlg.hrc>
#include <masterpassworddlg.hxx>
// MasterPasswordDialog---------------------------------------------------
@@ -40,19 +39,13 @@ MasterPasswordDialog::MasterPasswordDialog
Window* pParent,
::com::sun::star::task::PasswordRequestMode aDialogMode,
ResMgr* pResMgr
-) :
-
- ModalDialog( pParent, ResId( DLG_UUI_MASTERPASSWORD, *pResMgr ) ),
-
- aFTMasterPassword ( this, ResId( FT_MASTERPASSWORD, *pResMgr ) ),
- aEDMasterPassword ( this, ResId( ED_MASTERPASSWORD, *pResMgr ) ),
- aFL ( this, ResId( FL_FIXED_LINE, *pResMgr ) ),
- aOKBtn ( this, ResId( BTN_MASTERPASSWORD_OK, *pResMgr ) ),
- aCancelBtn ( this, ResId( BTN_MASTERPASSWORD_CANCEL, *pResMgr ) ),
- aHelpBtn ( this, ResId( BTN_MASTERPASSWORD_HELP, *pResMgr ) ),
- nDialogMode ( aDialogMode ),
- pResourceMgr ( pResMgr )
+)
+ : ModalDialog(pParent, "MasterPasswordDialog", "uui/ui/masterpassworddlg.ui")
+ , nDialogMode(aDialogMode)
+ , pResourceMgr(pResMgr)
{
+ get(m_pEDMasterPassword, "password");
+ get(m_pOKBtn, "ok");
if( nDialogMode == ::com::sun::star::task::PasswordRequestMode_PASSWORD_REENTER )
{
String aErrorMsg( ResId( STR_ERROR_MASTERPASSWORD_WRONG, *pResourceMgr ));
@@ -60,9 +53,7 @@ MasterPasswordDialog::MasterPasswordDialog
aErrorBox.Execute();
}
- FreeResource();
-
- aOKBtn.SetClickHdl( LINK( this, MasterPasswordDialog, OKHdl_Impl ) );
+ m_pOKBtn->SetClickHdl( LINK( this, MasterPasswordDialog, OKHdl_Impl ) );
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/masterpassworddlg.hrc b/uui/source/masterpassworddlg.hrc
deleted file mode 100644
index e971c9f..0000000
--- a/uui/source/masterpassworddlg.hrc
+++ /dev/null
@@ -1,33 +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 UUI_MASTERPASSWORD_HRC
-#define UUI_MASTERPASSWORD_HRC
-
-//============================================================================
-#define FT_MASTERPASSWORD 20
-#define ED_MASTERPASSWORD 21
-#define FT_MASTERPASSWORD_REPEAT 22
-#define ED_MASTERPASSWORD_REPEAT 23
-#define FL_FIXED_LINE 30
-
-#define BTN_MASTERPASSWORD_OK 50
-#define BTN_MASTERPASSWORD_CANCEL 51
-#define BTN_MASTERPASSWORD_HELP 52
-
-#endif // UUI_MASTERPASSWORD_HRC
diff --git a/uui/source/masterpassworddlg.hxx b/uui/source/masterpassworddlg.hxx
index 3407aa2..33658c1 100644
--- a/uui/source/masterpassworddlg.hxx
+++ b/uui/source/masterpassworddlg.hxx
@@ -30,20 +30,15 @@
//============================================================================
class MasterPasswordDialog : public ModalDialog
{
- FixedText aFTMasterPassword;
- Edit aEDMasterPassword;
- FixedLine aFL;
- OKButton aOKBtn;
- CancelButton aCancelBtn;
- HelpButton aHelpBtn;
-
+ Edit* m_pEDMasterPassword;
+ OKButton* m_pOKBtn;
DECL_LINK(OKHdl_Impl, void *);
public:
MasterPasswordDialog( Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr );
- String GetMasterPassword() const { return aEDMasterPassword.GetText(); }
+ OUString GetMasterPassword() const { return m_pEDMasterPassword->GetText(); }
private:
::com::sun::star::task::PasswordRequestMode nDialogMode;
diff --git a/uui/source/masterpassworddlg.src b/uui/source/masterpassworddlg.src
deleted file mode 100644
index 53690b4..0000000
--- a/uui/source/masterpassworddlg.src
+++ /dev/null
@@ -1,69 +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 .
- */
-
-#define __RSC
-
-#include <ids.hrc>
-#include <masterpassworddlg.hrc>
-
-ModalDialog DLG_UUI_MASTERPASSWORD
-{
- HelpId = HID_DLG_MASTERPASSWORD_UUI;
- Border = TRUE ;
- Moveable = TRUE ;
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 175 , 66 ) ;
- FixedText FT_MASTERPASSWORD
- {
- Pos = MAP_APPFONT ( 3 , 4 ) ;
- Size = MAP_APPFONT ( 169 , 9 ) ;
- Text [ en-US ] = "Enter password";
- };
- Edit ED_MASTERPASSWORD
- {
- HelpID = "uui:Edit:DLG_UUI_MASTERPASSWORD:ED_MASTERPASSWORD";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 3 , 17 ) ;
- Size = MAP_APPFONT ( 169 , 13 ) ;
- PassWord = TRUE ;
- };
- FixedLine FL_FIXED_LINE
- {
- Pos = MAP_APPFONT( 0, 35 );
- Size = MAP_APPFONT( 175, 6 );
- };
-
- OKButton BTN_MASTERPASSWORD_OK
- {
- Pos = MAP_APPFONT ( 65 , 45 ) ;
- Size = MAP_APPFONT ( 51 , 13 ) ;
- DefButton = TRUE ;
- };
- CancelButton BTN_MASTERPASSWORD_CANCEL
- {
- Pos = MAP_APPFONT ( 120 , 45 ) ;
- Size = MAP_APPFONT ( 51 , 13 ) ;
- };
- HelpButton BTN_MASTERPASSWORD_HELP
- {
- Pos = MAP_APPFONT ( 5 , 45 ) ;
- Size = MAP_APPFONT ( 51 , 13 ) ;
- };
- Text [ en-US ] = "Enter Master Password";
-};
diff --git a/uui/uiconfig/ui/masterpassworddlg.ui b/uui/uiconfig/ui/masterpassworddlg.ui
new file mode 100644
index 0000000..ce9daa0
--- /dev/null
+++ b/uui/uiconfig/ui/masterpassworddlg.ui
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="MasterPasswordDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Enter Master Password</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>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="homogeneous">True</property>
+ <property name="layout_style">end</property>
+ <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">0</property>
+ <property name="secondary">True</property>
+ </packing>
+ </child>
+ <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">1</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">2</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="valign">end</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="xalign">0</property>
+ <property name="yalign">0.54000002145767212</property>
+ <property name="label" translatable="yes">_Enter password</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">password</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="password">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
+ <property name="activates_default">True</property>
+ <property name="width_chars">35</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="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">help</action-widget>
+ <action-widget response="0">ok</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ </action-widgets>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list