diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-02-19 19:51:18 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-02-21 13:20:55 +0100 |
| commit | b1f4bc27c0a6ec868bcce969f87aaf8ffc8b9d1f (patch) | |
| tree | cda252baa6862079e6b912226c3bb18cb1d9ba79 /vcl | |
| parent | 3d31e57fba29d3bf852abafad16f840adcfb33d9 (diff) | |
weld HangulHanjaConversionDialog
Change-Id: Ia41f1a03581a0a48d59706ac5b3c569fc39c7f4d
Reviewed-on: https://gerrit.libreoffice.org/68099
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/salvtables.cxx | 28 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkinst.cxx | 8 |
2 files changed, 34 insertions, 2 deletions
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 54faef46fec7..76650b141e0a 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -386,6 +386,11 @@ public: return m_xWidget->GetPointFont(*m_xWidget); } + virtual Wallpaper get_wallpaper() const override + { + return Wallpaper(Application::GetSettings().GetStyleSettings().GetDialogColor()); + } + virtual OString get_buildable_name() const override { return m_xWidget->get_id().toUtf8(); @@ -1392,8 +1397,7 @@ public: m_xButton->SetImageAlign(ImageAlign::Left); if (pDevice) { - BitmapEx aBitmap(pDevice->GetBitmap(Point(0, 0), pDevice->GetOutputSize())); - m_xButton->SetModeImage(Image(aBitmap)); + m_xButton->SetModeImage(createImage(*pDevice)); } else m_xButton->SetModeImage(Image()); @@ -1589,6 +1593,9 @@ public: } }; +#include <vcl/pngwrite.hxx> +#include <tools/stream.hxx> + IMPL_LINK_NOARG(SalInstanceLinkButton, ClickHdl, FixedHyperlink&, void) { signal_clicked(); @@ -1621,6 +1628,23 @@ public: return m_xRadioButton->IsChecked(); } + virtual void set_image(VirtualDevice* pDevice) override + { + m_xRadioButton->SetImageAlign(ImageAlign::Center); + if (pDevice) + { + BitmapEx aBitmap(pDevice->GetBitmapEx(Point(0, 0), pDevice->GetOutputSize())); + + vcl::PNGWriter aWriter(aBitmap); + SvFileStream sOutput("file:///tmp/demo.png", StreamMode::WRITE); + aWriter.Write(sOutput); + + m_xRadioButton->SetModeImage(createImage(*pDevice)); + } + else + m_xRadioButton->SetModeImage(Image()); + } + virtual void set_from_icon_name(const OUString& rIconName) override { m_xRadioButton->SetModeRadioImage(::Image(StockImage::Yes, rIconName)); diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 1aa6a6ca36f0..e6ab4936dcfa 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -1428,6 +1428,11 @@ public: Application::GetSettings().GetUILanguageTag().getLocale()); } + virtual Wallpaper get_wallpaper() const override + { + return Wallpaper(COL_TRANSPARENT); + } + virtual void set_grid_left_attach(int nAttach) override { GtkContainer* pParent = GTK_CONTAINER(gtk_widget_get_parent(m_pWidget)); @@ -3767,6 +3772,9 @@ public: } }; +#include <vcl/pngwrite.hxx> +#include <tools/stream.hxx> + class GtkInstanceButton : public GtkInstanceContainer, public virtual weld::Button { private: |