summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cui/source/tabpages/chardlg.cxx22
-rw-r--r--cui/uiconfig/ui/charnamepage.ui32
-rw-r--r--filter/source/xsltdialog/xmlfiltertestdialog.cxx12
-rw-r--r--filter/uiconfig/ui/testxmlfilter.ui22
-rw-r--r--sw/source/ui/dialog/wordcountdialog.cxx11
-rw-r--r--sw/source/ui/misc/docfnote.cxx8
-rw-r--r--sw/uiconfig/swriter/ui/footnotepage.ui11
-rw-r--r--sw/uiconfig/swriter/ui/wordcount.ui13
8 files changed, 60 insertions, 71 deletions
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index ff52f4068633..123079ba5cde 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -260,20 +260,6 @@ struct SvxCharNamePage_Impl
}
};
-namespace
-{
- void equalize_width_requests(Window *pA, Window *pB, Window *pC)
- {
- long nWidthWest = pA->get_preferred_size().Width();
- long nWidthEast = pB->get_preferred_size().Width();
- long nWidthCTL = pC->get_preferred_size().Width();
- long nLargest = std::max(nWidthWest, std::max(nWidthEast, nWidthCTL));
- pA->set_width_request(nLargest);
- pB->set_width_request(nLargest);
- pC->set_width_request(nLargest);
- }
-}
-
// class SvxCharNamePage -------------------------------------------------
SvxCharNamePage::SvxCharNamePage( Window* pParent, const SfxItemSet& rInSet )
@@ -380,10 +366,6 @@ SvxCharNamePage::SvxCharNamePage( Window* pParent, const SfxItemSet& rInSet )
m_pWestFontStyleLB->set_height_request(nHeight);
m_pWestFontSizeLB->set_height_request(nHeight);
}
- else
- {
- equalize_width_requests(m_pWestFontLanguageLB, m_pEastFontLanguageLB, m_pCTLFontLanguageLB);
- }
Initialize();
}
@@ -1192,10 +1174,6 @@ void SvxCharNamePage::Reset( const SfxItemSet& rSet )
Reset_Impl( rSet, Asian );
Reset_Impl( rSet, Ctl );
- equalize_width_requests(m_pWestFontNameLB, m_pEastFontNameLB, m_pCTLFontNameLB);
- equalize_width_requests(m_pWestFontStyleLB, m_pEastFontStyleLB, m_pCTLFontStyleLB);
- equalize_width_requests(m_pWestFontSizeLB, m_pEastFontSizeLB, m_pCTLFontSizeLB);
-
SetPrevFontWidthScale( rSet );
UpdatePreview_Impl();
}
diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui
index 88202b626f5f..01267b7959a5 100644
--- a/cui/uiconfig/ui/charnamepage.ui
+++ b/cui/uiconfig/ui/charnamepage.ui
@@ -784,4 +784,36 @@
</packing>
</child>
</object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <property name="ignore_hidden">True</property>
+ <widgets>
+ <widget name="westlanglb-cjk"/>
+ <widget name="eastlanglb"/>
+ <widget name="ctllanglb"/>
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup2">
+ <property name="ignore_hidden">True</property>
+ <widgets>
+ <widget name="westfontnameft-cjk"/>
+ <widget name="eastfontnameft"/>
+ <widget name="ctlfontnameft"/>
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup3">
+ <property name="ignore_hidden">True</property>
+ <widgets>
+ <widget name="weststylelb-cjk"/>
+ <widget name="eaststylelb"/>
+ <widget name="ctlstylelb"/>
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup4">
+ <property name="ignore_hidden">True</property>
+ <widgets>
+ <widget name="westsizelb-cjk"/>
+ <widget name="eastsizelb"/>
+ <widget name="ctlsizelb"/>
+ </widgets>
+ </object>
</interface>
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index 0c04cad42b1c..45742df584e3 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -156,18 +156,6 @@ XMLFilterTestDialog::XMLFilterTestDialog(Window* pParent,
get(m_pPBRecentFile, "recentfile");
get(m_pFTNameOfRecentFile, "recentfilename");
- long nWidth =
- std::max(m_pPBExportBrowse->get_preferred_size().Width(),
- std::max(m_pPBCurrentDocument->get_preferred_size().Width(),
- std::max(m_pPBImportBrowse->get_preferred_size().Width(),
- m_pPBRecentFile->get_preferred_size().Width())));
-
- //make sure that the second columns of the two disconnected
- //grids are of equal width by ensuring that the widest
- //entry in each equals
- m_pPBExportBrowse->set_width_request(nWidth);
- m_pPBImportBrowse->set_width_request(nWidth);
-
get(m_pPBClose, "close");
m_pPBExportBrowse->SetClickHdl(LINK( this, XMLFilterTestDialog, ClickHdl_Impl ) );
diff --git a/filter/uiconfig/ui/testxmlfilter.ui b/filter/uiconfig/ui/testxmlfilter.ui
index fee4a79d14c7..a82fe119ee82 100644
--- a/filter/uiconfig/ui/testxmlfilter.ui
+++ b/filter/uiconfig/ui/testxmlfilter.ui
@@ -18,13 +18,11 @@
<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="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="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>
@@ -115,11 +111,9 @@
<child>
<object class="GtkButton" id="exportbrowse">
<property name="label" translatable="yes">Browse...</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>
@@ -131,11 +125,9 @@
<child>
<object class="GtkButton" id="currentdocument">
<property name="label" translatable="yes">Current Document</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>
@@ -232,11 +224,9 @@
<child>
<object class="GtkButton" id="importbrowse">
<property name="label" translatable="yes">Browse...</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>
@@ -248,11 +238,9 @@
<child>
<object class="GtkButton" id="recentfile">
<property name="label" translatable="yes">Recent File</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>
@@ -292,11 +280,9 @@
<child>
<object class="GtkCheckButton" id="displaysource">
<property name="label" translatable="yes">Display source</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -391,4 +377,12 @@
<action-widget response="0">help</action-widget>
</action-widgets>
</object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <widgets>
+ <widget name="exportbrowse"/>
+ <widget name="currentdocument"/>
+ <widget name="importbrowse"/>
+ <widget name="recentfile"/>
+ </widgets>
+ </object>
</interface>
diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx
index 5a43642bb20a..5264293ccd6e 100644
--- a/sw/source/ui/dialog/wordcountdialog.cxx
+++ b/sw/source/ui/dialog/wordcountdialog.cxx
@@ -102,17 +102,6 @@ SwWordCountFloatDlg::SwWordCountFloatDlg(SfxBindings* _pBindings,
get(m_pClosePB, "close");
- long nPrefWidth = m_pCurrentWordFT->get_preferred_size().Width();
-
- m_pCurrentWordFT->set_width_request(nPrefWidth);
- m_pCurrentCharacterFT->set_width_request(nPrefWidth);
- m_pCurrentCharacterExcludingSpacesFT->set_width_request(nPrefWidth);
- m_pCurrentCjkcharsFT->set_width_request(nPrefWidth);
- m_pDocWordFT->set_width_request(nPrefWidth);
- m_pDocCharacterFT->set_width_request(nPrefWidth);
- m_pDocCharacterExcludingSpacesFT->set_width_request(nPrefWidth);
- m_pDocCjkcharsFT->set_width_request(nPrefWidth);
-
showCJK(SvtCJKOptions().IsAnyEnabled());
Initialize(pInfo);
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 3a59919df139..9e3bad20c79a 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -117,14 +117,6 @@ SwEndNoteOptionPage::SwEndNoteOptionPage(Window *pParent, sal_Bool bEN,
get(m_pPageTemplBox, "pagestylelb");
get(m_pFtnCharAnchorTemplBox, "charanchorstylelb");
get(m_pFtnCharTextTemplBox, "charstylelb");
-
- long nWidth = std::max(std::max(
- m_pPrefixED->get_preferred_size().Width(),
- m_pSuffixED->get_preferred_size().Width()),
- m_pNumViewBox->get_preferred_size().Width());
- m_pPrefixED->set_width_request(nWidth);
- m_pSuffixED->set_width_request(nWidth);
- m_pNumViewBox->set_width_request(nWidth);
}
void SwEndNoteOptionPage::Reset( const SfxItemSet& )
diff --git a/sw/uiconfig/swriter/ui/footnotepage.ui b/sw/uiconfig/swriter/ui/footnotepage.ui
index 32056a57a219..6ffe813a3006 100644
--- a/sw/uiconfig/swriter/ui/footnotepage.ui
+++ b/sw/uiconfig/swriter/ui/footnotepage.ui
@@ -117,11 +117,9 @@
<child>
<object class="GtkRadioButton" id="pospagecb">
<property name="label" translatable="yes">End of 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="draw_indicator">True</property>
<property name="group">posdoccb</property>
@@ -136,11 +134,9 @@
<child>
<object class="GtkRadioButton" id="posdoccb">
<property name="label" translatable="yes">End of document</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">pospagecb</property>
@@ -579,4 +575,11 @@
</row>
</data>
</object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <widgets>
+ <widget name="prefix"/>
+ <widget name="suffix"/>
+ <widget name="numberinglb"/>
+ </widgets>
+ </object>
</interface>
diff --git a/sw/uiconfig/swriter/ui/wordcount.ui b/sw/uiconfig/swriter/ui/wordcount.ui
index c04be51ae5a9..c0b022487745 100644
--- a/sw/uiconfig/swriter/ui/wordcount.ui
+++ b/sw/uiconfig/swriter/ui/wordcount.ui
@@ -331,4 +331,17 @@
<action-widget response="0">close</action-widget>
</action-widgets>
</object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <property name="ignore_hidden">True</property>
+ <widgets>
+ <widget name="selectwords"/>
+ <widget name="selectchars"/>
+ <widget name="selectcharsnospaces"/>
+ <widget name="docwords"/>
+ <widget name="docchars"/>
+ <widget name="doccharsnospaces"/>
+ <widget name="selectcjkchars"/>
+ <widget name="doccjkchars"/>
+ </widgets>
+ </object>
</interface>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-25 03:50:53 +0000