[Libreoffice-commits] core.git: Branch 'feature/sidebar' - icon-themes/galaxy svx/source
Andre Fischer
af at apache.org
Thu May 9 07:36:20 PDT 2013
dev/null |binary
svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 15 +++++++++------
svx/source/sidebar/possize/PosSizePropertyPanel.hrc | 2 --
svx/source/sidebar/possize/PosSizePropertyPanel.hxx | 4 ----
svx/source/sidebar/possize/PosSizePropertyPanel.src | 17 -----------------
5 files changed, 9 insertions(+), 29 deletions(-)
New commits:
commit eca1929a77bc6234186368094ea16bf8d7ca9cc6
Author: Andre Fischer <af at apache.org>
Date: Tue Apr 23 10:41:58 2013 +0000
Related: #i122144#: Use AOO icons for flipping shapes.
(cherry picked from commit 52450684d9c02f0d6d96bff731c348d85ca4ced1)
Conflicts:
icon-themes/galaxy/svx/res/symphony/FlipHorizontally_16x16.png
icon-themes/galaxy/svx/res/symphony/FlipVertically_16x16.png
Change-Id: I99e3d3b9e7046ee0de60075f49dc47f086e17dcc
diff --git a/icon-themes/galaxy/svx/res/symphony/FlipHorizontally_16x16.png b/icon-themes/galaxy/svx/res/symphony/FlipHorizontally_16x16.png
deleted file mode 100755
index 281ee46..0000000
Binary files a/icon-themes/galaxy/svx/res/symphony/FlipHorizontally_16x16.png and /dev/null differ
diff --git a/icon-themes/galaxy/svx/res/symphony/FlipVertically_16x16.png b/icon-themes/galaxy/svx/res/symphony/FlipVertically_16x16.png
deleted file mode 100755
index 7c9c4c4..0000000
Binary files a/icon-themes/galaxy/svx/res/symphony/FlipVertically_16x16.png and /dev/null differ
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 97abed5..0eb3125 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -27,6 +27,7 @@
#include <sfx2/bindings.hxx>
#include <sfx2/viewsh.hxx>
#include <sfx2/objsh.hxx>
+#include <sfx2/imagemgr.hxx>
#include <svx/dlgutil.hxx>
#include <unotools/viewoptions.hxx>
#include <vcl/virdev.hxx>
@@ -95,8 +96,6 @@ PosSizePropertyPanel::PosSizePropertyPanel(
maAutoWidthControl(SID_ATTR_TRANSFORM_AUTOWIDTH, *pBindings, *this),
maAutoHeightControl(SID_ATTR_TRANSFORM_AUTOHEIGHT, *pBindings, *this),
m_aMetricCtl(SID_ATTR_METRIC, *pBindings, *this),
- maImgFlipHori(SVX_RES(IMG_HORI_FLIP)),
- maImgFlipVert(SVX_RES(IMG_VERT_FLIP)),
mxFrame(rxFrame),
maContext(),
mpBindings(pBindings),
@@ -178,10 +177,14 @@ void PosSizePropertyPanel::Initialize()
//flip:
mpFlipTbx->SetSelectHdl( LINK( this, PosSizePropertyPanel, FlipHdl) );
- mpFlipTbx->SetItemImage(FLIP_HORIZONTAL,maImgFlipHori);
- mpFlipTbx->SetItemImage(FLIP_VERTICAL,maImgFlipVert);
- mpFlipTbx->SetQuickHelpText(FLIP_HORIZONTAL,String(SVX_RES(STR_QH_HORI_FLIP))); //Add
- mpFlipTbx->SetQuickHelpText(FLIP_VERTICAL,String(SVX_RES(STR_QH_VERT_FLIP))); //Add
+ mpFlipTbx->SetItemImage(
+ FLIP_HORIZONTAL,
+ GetImage(mxFrame, A2S(".uno:FlipHorizontal"), sal_False));
+ mpFlipTbx->SetItemImage(
+ FLIP_VERTICAL,
+ GetImage(mxFrame, A2S(".uno:FlipVertical"), sal_False));
+ mpFlipTbx->SetQuickHelpText(FLIP_HORIZONTAL, SVX_RESSTR(STR_QH_HORI_FLIP)); //Add
+ mpFlipTbx->SetQuickHelpText(FLIP_VERTICAL, SVX_RESSTR(STR_QH_VERT_FLIP)); //Add
mpMtrPosX->SetAccessibleRelationLabeledBy(mpFtPosX.get());
mpMtrPosY->SetAccessibleRelationLabeledBy(mpFtPosY.get());
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hrc b/svx/source/sidebar/possize/PosSizePropertyPanel.hrc
index 8a4caba..249d182 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.hrc
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hrc
@@ -33,8 +33,6 @@
#define DIAL_CONTROL 17
#define FLIP_HORIZONTAL 18
#define FLIP_VERTICAL 19
-#define IMG_HORI_FLIP 20
-#define IMG_VERT_FLIP 21
#define FT_FLIP 22
#define STR_QH_HORI_FLIP 23
#define STR_QH_VERT_FLIP 24
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
index 7beb082..fb5ce8e 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
@@ -121,10 +121,6 @@ private:
::sfx2::sidebar::ControllerItem maAutoHeightControl;
::sfx2::sidebar::ControllerItem m_aMetricCtl;
- // images from ressource
- Image maImgFlipHori;
- Image maImgFlipVert;
-
cssu::Reference< css::frame::XFrame > mxFrame;
::sfx2::sidebar::EnumContext maContext;
SfxBindings* mpBindings;
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.src b/svx/source/sidebar/possize/PosSizePropertyPanel.src
index fd5996f..df686a5 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.src
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.src
@@ -176,20 +176,12 @@ Control RID_SIDEBAR_POSSIZE_PANEL
Identifier = FLIP_VERTICAL ;
Text [ en-US ] = "Flip Vertically" ;
HelpID = HID_PROPERTY_PANEL_POSIZE_FLIP_VERTICAL;
- ItemBitmap = Bitmap
- {
- File = "symphony/FlipVertically_16x16.png";
- };
};
ToolBoxItem
{
Identifier = FLIP_HORIZONTAL ;
Text [ en-US ] = "Flip Horizontally" ;
HelpID = HID_PROPERTY_PANEL_POSIZE_FLIP_HORIZONTAL;
- ItemBitmap = Bitmap
- {
- File = "symphony/FlipHorizontally_16x16.png";
- };
};
};
};
@@ -203,15 +195,6 @@ Control RID_SIDEBAR_POSSIZE_PANEL
Text [ en-US ] = "Flip the selected object vertically.";
};
- Image IMG_HORI_FLIP
- {
- ImageBitmap = Bitmap{File = "symphony/FlipHorizontally_16x16.png";};
- };
- Image IMG_VERT_FLIP
- {
- ImageBitmap = Bitmap{File = "symphony/FlipVertically_16x16.png";};
- };
-
Control DIAL_CONTROL
{
Pos = MAP_APPFONT ( ROTATE_CONTROL_X , ROTATE_CONTROL_Y );
More information about the Libreoffice-commits
mailing list