diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-06-11 14:00:32 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-11 14:01:35 +0100 |
| commit | 21c21e8fd0e94dbb9efcd1220d012fd80867eae2 (patch) | |
| tree | 52f0c5c997eea9d0d35eca32e45905e85b0d74f6 | |
| parent | cbfc61a6ca075eb3fbd9a41dea7f9489c5d56770 (diff) | |
Resolves: fdo#65595 wrap long checkbox string
Change-Id: Ied827721a1ceca69ed33b494f8b55cb4bb1b748b
(cherry picked from commit 40a5fd4aa0eab1940fcbde4ff26342a5af0222ee)
| -rw-r--r-- | cui/source/options/optinet2.cxx | 7 | ||||
| -rw-r--r-- | cui/uiconfig/ui/optsecuritypage.ui | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index b48986c1ef0e..a2d0096e0f77 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -585,6 +585,13 @@ SvxSecurityTabPage::SvxSecurityTabPage(Window* pParent, const SfxItemSet& rSet) { get(m_pSecurityOptionsPB, "options"); get(m_pSavePasswordsCB, "savepassword"); + + //fdo#65595, we height-for-width support here, but for now we can + //bodge it + Size aSize(m_pSavePasswordsCB->CalcMinimumSize(56*approximate_char_width())); + m_pSavePasswordsCB->set_width_request(aSize.Width()); + m_pSavePasswordsCB->set_height_request(aSize.Height()); + get(m_pShowConnectionsPB, "connections"); get(m_pMasterPasswordCB, "usemasterpassword"); get(m_pMasterPasswordFT, "masterpasswordtext"); diff --git a/cui/uiconfig/ui/optsecuritypage.ui b/cui/uiconfig/ui/optsecuritypage.ui index bc53814ad24d..1ff375532854 100644 --- a/cui/uiconfig/ui/optsecuritypage.ui +++ b/cui/uiconfig/ui/optsecuritypage.ui @@ -109,7 +109,7 @@ <property name="hexpand">True</property> <property name="row_spacing">12</property> <child> - <object class="GtkCheckButton" id="savepassword"> + <object class="GtkCheckButton" id="savepassword:wrap"> <property name="label" translatable="yes">Persistently _save passwords for web connections</property> <property name="visible">True</property> <property name="can_focus">True</property> |