sfx2/source/dialog/backingwindow.cxx | 6 ------ sfx2/uiconfig/ui/startcenter.ui | 13 +------------ vcl/workben/vcldemo.cxx | 2 +- 3 files changed, 2 insertions(+), 19 deletions(-)
New commits: commit 9e0646eaffe7954d60ebf36c86895acff63096d7 Author: Caolán McNamara <[email protected]> AuthorDate: Tue Oct 20 10:03:05 2020 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Oct 20 20:20:48 2020 +0200 remove motif from startcenter the icon doesn't exist in the normal case since commit 60413c9800c27f53c1108015b50754b065bc98c6 Date: Wed Apr 18 12:22:07 2018 +0200 Replace Galaxy icon theme by Colibre through a theoretical route via installing a gallery icon extension still exists. Use a different existing icon for the vcldemo Change-Id: I81ab87742eaf2720877782a4425ef83719ee6ed9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104556 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index 48bb6c1cf416..a1a48e253e70 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -258,12 +258,6 @@ void BackingWindow::initControls() aFont.SetFontSize(Size(0, aFont.GetFontSize().Height() * fMultiplier)); mpCreateLabel->SetControlFont(aFont); - // motif image under the buttons - Wallpaper aWallpaper(get<FixedImage>("motif")->GetImage().GetBitmapEx()); - aWallpaper.SetStyle(WallpaperStyle::BottomRight); - - mpButtonsBox->SetBackground(aWallpaper); - Resize(); // compute the menubar height diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui index 9bfdac820e73..05f802c06a75 100644 --- a/sfx2/uiconfig/ui/startcenter.ui +++ b/sfx2/uiconfig/ui/startcenter.ui @@ -373,17 +373,6 @@ <property name="position">12</property> </packing> </child> - <child> - <object class="GtkImage" id="motif"> - <property name="can_focus">False</property> - <property name="pixbuf">sfx2/res/startcenter-logo.png</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">13</property> - </packing> - </child> <child> <object class="GtkLabel" id="althelplabel"> <property name="can_focus">False</property> @@ -394,7 +383,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">14</property> + <property name="position">13</property> </packing> </child> </object> diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 40fd93f0696b..a089301db7cf 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -1930,7 +1930,7 @@ public: { SetText("VCL widget demo"); - Wallpaper aWallpaper(BitmapEx("sfx2/res/startcenter-logo.png")); + Wallpaper aWallpaper(BitmapEx("sfx2/res/128x128_writer_doc-p.png")); aWallpaper.SetStyle(WallpaperStyle::BottomRight); aWallpaper.SetColor(COL_RED); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
