diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-09-07 20:25:59 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-09-08 12:07:48 +0100 |
commit | a9ad0c3d4a4cfa70ba89d8fb366a782f58f44f07 (patch) | |
tree | 69074041c6bb7a64a4e1a36917aa0686c0b5be2d /vcl | |
parent | c755f71b8b5b009573a673f3f757609ca0ef5ffd (diff) |
convert already exists dialog to .ui
Change-Id: I6cb2a11b6ee2f94f611aa852c79dd1a6534381da
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/source/window/layout.cxx | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index 898cd11c63d2..30a6c84a96b3 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -1859,6 +1859,24 @@ void MessageDialog::setButtonHandlers(VclButtonBox *pButtonBox) } } +void MessageDialog::SetMessagesWidths(Window *pParent, + VclMultiLineEdit *pPrimaryMessage, VclMultiLineEdit *pSecondaryMessage) +{ + if (pSecondaryMessage) + { + assert(pPrimaryMessage); + Font aFont = pParent->GetSettings().GetStyleSettings().GetLabelFont(); + aFont.SetSize(Size(0, aFont.GetSize().Height() * 1.2)); + aFont.SetWeight(WEIGHT_BOLD); + pPrimaryMessage->SetControlFont(aFont); + pPrimaryMessage->SetMaxTextWidth(pPrimaryMessage->approximate_char_width() * 60); + pSecondaryMessage->SetMaxTextWidth(pSecondaryMessage->approximate_char_width() * 80); + } + else + pPrimaryMessage->SetMaxTextWidth(pPrimaryMessage->approximate_char_width() * 80); +} + + short MessageDialog::Execute() { setDeferredProperties(); @@ -1899,19 +1917,12 @@ short MessageDialog::Execute() m_pPrimaryMessage = new VclMultiLineEdit(m_pGrid, nWinStyle); m_pPrimaryMessage->SetPaintTransparent(true); m_pPrimaryMessage->EnableCursor(false); - Font aFont = GetSettings().GetStyleSettings().GetLabelFont(); - - if (bHasSecondaryText) - aFont.SetSize(Size(0, aFont.GetSize().Height() * 1.2)); - aFont.SetWeight(WEIGHT_BOLD); - m_pPrimaryMessage->SetControlFont(aFont); m_pPrimaryMessage->set_grid_left_attach(1); m_pPrimaryMessage->set_grid_top_attach(0); m_pPrimaryMessage->set_hexpand(true); m_pPrimaryMessage->SetText(m_sPrimaryString); m_pPrimaryMessage->Show(!m_sPrimaryString.isEmpty()); - m_pPrimaryMessage->SetMaxTextWidth(m_pPrimaryMessage->approximate_char_width() * 60); m_pSecondaryMessage = new VclMultiLineEdit(m_pGrid, nWinStyle); m_pSecondaryMessage->SetPaintTransparent(true); @@ -1921,7 +1932,8 @@ short MessageDialog::Execute() m_pSecondaryMessage->set_hexpand(true); m_pSecondaryMessage->SetText(m_sSecondaryString); m_pSecondaryMessage->Show(bHasSecondaryText); - m_pSecondaryMessage->SetMaxTextWidth(m_pSecondaryMessage->approximate_char_width() * 80); + + MessageDialog::SetMessagesWidths(this, m_pPrimaryMessage, bHasSecondaryText ? m_pSecondaryMessage : NULL); VclButtonBox *pButtonBox = get_action_area(); assert(pButtonBox); |