sw/inc/bitmaps.hlst | 2 +
sw/source/ui/frmdlg/frmpage.cxx | 3 +
sw/uiconfig/swriter/ui/picturepage.ui | 53 +++++-----------------------------
3 files changed, 13 insertions(+), 45 deletions(-)
New commits:
commit 0d87cfbdb5a4d75295d83e5246bad2849f5f66b1
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Oct 13 16:45:39 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Oct 13 18:44:07 2018 +0200
move fallback image out of .ui
Change-Id: Id46f1c2a06e6c32b60e6308a01dc4ee5e75e20ba
Reviewed-on: https://gerrit.libreoffice.org/61743
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/inc/bitmaps.hlst b/sw/inc/bitmaps.hlst
index 1a68eee6c1e2..337b9f697703 100644
--- a/sw/inc/bitmaps.hlst
+++ b/sw/inc/bitmaps.hlst
@@ -100,6 +100,8 @@
#define RID_BMP_WRAP_PARALLEL "sw/res/wr04.png"
#define RID_BMP_WRAP_CONTOUR_PARALLEL "sw/res/wr010.png"
+#define RID_BMP_PREVIEW_FALLBACK "sw/res/image-example.png"
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 65b6260dfc16..f2a816a99c2d 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -22,6 +22,7 @@
#include <cmdid.h>
#include <hintids.hxx>
+#include <bitmaps.hlst>
#include <vcl/mnemonic.hxx>
#include <svl/urihelper.hxx>
#include <svl/stritem.hxx>
@@ -2384,7 +2385,7 @@ SwGrfExtPage::SwGrfExtPage(vcl::Window *pParent, const
SfxItemSet &rSet)
get(m_pConnectED, "entry");
get(m_pBrowseBT, "browse");
get(m_pBmpWin, "preview");
-
m_pBmpWin->SetBitmapEx(get<FixedImage>("fallback")->GetImage().GetBitmapEx());
+ m_pBmpWin->SetBitmapEx(BitmapEx(RID_BMP_PREVIEW_FALLBACK));
// RotGrfFlyFrame: Need Angle and RotateControls now
get(m_pFlAngle, "FL_ANGLE");
diff --git a/sw/uiconfig/swriter/ui/picturepage.ui
b/sw/uiconfig/swriter/ui/picturepage.ui
index 6591f259aa32..300212cd858a 100644
--- a/sw/uiconfig/swriter/ui/picturepage.ui
+++ b/sw/uiconfig/swriter/ui/picturepage.ui
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="sw">
<requires lib="gtk+" version="3.18"/>
- <!-- interface-requires LibreOffice 1.0 -->
+ <requires lib="LibreOffice" version="1.0"/>
<object class="GtkGrid" id="PicturePage">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -37,8 +37,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -50,24 +48,21 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes"
context="picturepage|label1">_File name</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">2</property>
- <property name="height">1</property>
</packing>
</child>
</object>
@@ -88,8 +83,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -126,8 +119,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -143,8 +134,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -153,8 +142,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_underline">True</property>
<property name="margin_left">12</property>
+ <property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -163,8 +152,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -173,8 +160,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_underline">True</property>
<property name="margin_left">12</property>
+ <property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">rightpages</property>
@@ -182,8 +169,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -192,8 +177,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_underline">True</property>
<property name="margin_left">12</property>
+ <property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">allpages</property>
@@ -201,8 +186,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -220,23 +203,10 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkImage" id="fallback">
- <property name="can_focus">False</property>
- <property name="no_show_all">True</property>
- <property
name="pixbuf">sw/res/image-example.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
<property name="height">5</property>
</packing>
</child>
@@ -258,8 +228,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -290,10 +258,10 @@
<object class="GtkLabel" id="FT_ANGLE">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes"
context="picturepage|FT_ANGLE">_Angle:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">NF_ANGLE</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -305,8 +273,7 @@
<object class="GtkSpinButton" id="NF_ANGLE">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="text" translatable="no"
context="picturepage">0,00</property>
- <property name="adjustment">adjustmentANGLE</property>
+ <property name="text"
context="picturepage">0,00</property>
<property name="digits">2</property>
<property name="wrap">True</property>
</object>
@@ -371,8 +338,8 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes"
context="picturepage|label2">Rotation Angle</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -382,8 +349,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
