summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/vcl/weld.hxx2
-rw-r--r--sdext/source/minimizer/optimizerdialog.cxx4
-rw-r--r--vcl/inc/wizdlg.hxx1
-rw-r--r--vcl/source/app/salvtables.cxx5
-rw-r--r--vcl/source/control/roadmapwizard.cxx5
-rw-r--r--vcl/unx/gtk3/gtkinst.cxx5
6 files changed, 19 insertions, 3 deletions
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 4b376d3ac44f..4b4ea74f13b3 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -650,6 +650,8 @@ public:
virtual void set_page_side_help_id(const OString& rHelpId) = 0;
+ virtual void set_page_side_image(const OUString& rImage) = 0;
+
void connect_jump_page(const Link<const OString&, bool>& rLink) { m_aJumpPageHdl = rLink; }
};
diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx
index 15ce1c3d1187..4b7e6f039988 100644
--- a/sdext/source/minimizer/optimizerdialog.cxx
+++ b/sdext/source/minimizer/optimizerdialog.cxx
@@ -242,9 +242,7 @@ void OptimizerDialog::InitRoadmap()
ITEM_ID_SUMMARY}
);
-#if 0
- xPropertySet->setPropertyValue( "ImageURL", Any( OUString("private:graphicrepository/" BMP_PRESENTATION_MINIMIZER) ) );
-#endif
+ m_xAssistant->set_page_side_image(BMP_PRESENTATION_MINIMIZER);
}
void OptimizerDialog::UpdateConfiguration()
diff --git a/vcl/inc/wizdlg.hxx b/vcl/inc/wizdlg.hxx
index da3ff4d1af3a..31bd376168b6 100644
--- a/vcl/inc/wizdlg.hxx
+++ b/vcl/inc/wizdlg.hxx
@@ -134,6 +134,7 @@ namespace vcl
const Size& GetPageSizePixel() const { return maPageSize; }
void SetRoadmapHelpId( const OString& _rId );
+ void SetRoadmapBitmap( const BitmapEx& maBitmap );
void InsertRoadmapItem(int nIndex, const OUString& rLabel, int nId, bool bEnabled);
void DeleteRoadmapItems();
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 7af5cccb4e6b..39ee33de947f 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -2157,6 +2157,11 @@ public:
m_xWizard->SetRoadmapHelpId(rHelpId);
}
+ virtual void set_page_side_image(const OUString& rImage) override
+ {
+ m_xWizard->SetRoadmapBitmap(createImage(rImage).GetBitmapEx());
+ }
+
weld::Button* weld_widget_for_response(int nResponse) override;
virtual ~SalInstanceAssistant() override
diff --git a/vcl/source/control/roadmapwizard.cxx b/vcl/source/control/roadmapwizard.cxx
index b1738d5bef83..fe4c53b92e02 100644
--- a/vcl/source/control/roadmapwizard.cxx
+++ b/vcl/source/control/roadmapwizard.cxx
@@ -228,6 +228,11 @@ namespace vcl
m_xRoadmapImpl->pRoadmap->SetHelpId( _rId );
}
+ void RoadmapWizard::SetRoadmapBitmap(const BitmapEx& rBmp)
+ {
+ m_xRoadmapImpl->pRoadmap->SetRoadmapBitmap(rBmp);
+ }
+
void RoadmapWizardMachine::SetRoadmapHelpId(const OString& rId)
{
m_xAssistant->set_page_side_help_id(rId);
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index dce54e17d693..e523e871290d 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -7735,6 +7735,11 @@ public:
return pButton;
}
+ virtual void set_page_side_image(const OUString& /*rImage*/) override
+ {
+ // Since GTK+ 3.2, sidebar images are not shown anymore
+ }
+
virtual ~GtkInstanceAssistant() override
{
if (m_nButtonPressSignalId)