diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-03-18 19:57:52 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-03-19 11:15:36 +0100 |
| commit | d05ee87bdd779a8d799269af4bb45ae8a4ea3150 (patch) | |
| tree | 136f8c6a7fd96180202003aad6294f6a0cbbc1ce /vcl | |
| parent | b5ca41ab77fb5eba1efed273ce0d551e2e753d34 (diff) | |
weld pdf warning dialog
Change-Id: I80b8324dcd575f6b537c4a0be264f0446c0fc32f
Reviewed-on: https://gerrit.libreoffice.org/51516
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/bitmaps.hlst | 3 | ||||
| -rw-r--r-- | vcl/source/app/salvtables.cxx | 19 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkinst.cxx | 23 |
3 files changed, 37 insertions, 8 deletions
diff --git a/vcl/inc/bitmaps.hlst b/vcl/inc/bitmaps.hlst index 00bb64cb061e..f3cf68890eb2 100644 --- a/vcl/inc/bitmaps.hlst +++ b/vcl/inc/bitmaps.hlst @@ -138,6 +138,9 @@ #define SPINNER_64_12 "vcl/res/spinner-64-12.png" //end, Throbber::getDefaultImageURLs +#define IMG_WARN "res/ballgreen_7.png" +#define IMG_ERR "res/ballred_7.png" + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 1373baff4f03..4945c764f8a0 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -38,6 +38,7 @@ #include <vcl/tabctrl.hxx> #include <vcl/tabpage.hxx> #include <vcl/weld.hxx> +#include <bitmaps.hlst> SalFrame::SalFrame() : m_pWindow(nullptr) @@ -862,10 +863,22 @@ public: m_xTreeView->InsertEntry(rText, pos); } - virtual void insert(int pos, const OUString& rId, const OUString& rStr) override + virtual void insert(int pos, const OUString& rId, const OUString& rStr, const OUString& rImage) override { - m_xTreeView->SetEntryData(m_xTreeView->InsertEntry(rStr, pos == -1 ? COMBOBOX_APPEND : pos), - new OUString(rId)); + sal_Int32 nInsertedAt; + if (rImage.isEmpty()) + nInsertedAt = m_xTreeView->InsertEntry(rStr, pos == -1 ? COMBOBOX_APPEND : pos); + else + { + assert((rImage == "dialog-warning" || rImage == "dialog-error") && "unknown stock image"); + Image aImage; + if (rImage == "dialog-warning") + aImage = Image(BitmapEx(IMG_WARN)); + else if (rImage == "dialog-error") + aImage = Image(BitmapEx(IMG_ERR)); + nInsertedAt = m_xTreeView->InsertEntry(rStr, aImage, pos == -1 ? COMBOBOX_APPEND : pos); + } + m_xTreeView->SetEntryData(nInsertedAt, new OUString(rId)); } using SalInstanceContainer::remove; diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 13b957dff0f2..dbb4320f7024 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -2116,15 +2116,28 @@ public: enable_notify_events(); } - virtual void insert(int pos, const OUString& rId, const OUString& rText) override + virtual void insert(int pos, const OUString& rId, const OUString& rText, const OUString& rImage) override { disable_notify_events(); GtkTreeIter iter; gtk_list_store_insert(m_pListStore, &iter, pos); - gtk_list_store_set(m_pListStore, &iter, - 0, OUStringToOString(rText, RTL_TEXTENCODING_UTF8).getStr(), - 1, OUStringToOString(rId, RTL_TEXTENCODING_UTF8).getStr(), - -1); + if (rImage.isEmpty()) + { + gtk_list_store_set(m_pListStore, &iter, + 0, OUStringToOString(rText, RTL_TEXTENCODING_UTF8).getStr(), + 1, OUStringToOString(rId, RTL_TEXTENCODING_UTF8).getStr(), + -1); + } + else + { + assert((rImage == "dialog-warning" || rImage == "dialog-error") && "unknown stock image"); + + gtk_list_store_set(m_pListStore, &iter, + 0, OUStringToOString(rText, RTL_TEXTENCODING_UTF8).getStr(), + 1, OUStringToOString(rId, RTL_TEXTENCODING_UTF8).getStr(), + 2, OUStringToOString(rImage, RTL_TEXTENCODING_UTF8).getStr(), + -1); + } enable_notify_events(); } |