diff options
author | Jan Holesovsky <kendy@suse.cz> | 2013-07-15 13:48:42 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2013-07-15 16:02:51 +0200 |
commit | 5f3d88a1f151e12061421751831b5588495199bb (patch) | |
tree | d45c8d6e5e705a6f6a8131b5c2ba9175d6e96434 /svx | |
parent | 94c8113897d9fc7f56a43dba4cc1331d758e46a7 (diff) |
sidebar: Further cleanup of AreaPropertyPanel.
Change-Id: I8cbb4bf4dfed2689d21247f1abb7d024d4995cbb
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/sidebar/area/AreaPropertyPanel.cxx | 2 | ||||
-rw-r--r-- | svx/source/sidebar/area/AreaPropertyPanel.hrc | 10 | ||||
-rw-r--r-- | svx/source/sidebar/area/AreaPropertyPanel.src | 10 | ||||
-rw-r--r-- | svx/uiconfig/ui/sidebararea.ui | 3 |
4 files changed, 5 insertions, 20 deletions
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx index 359beefc43a6..02904283a3b6 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx @@ -100,8 +100,6 @@ AreaPropertyPanel::AreaPropertyPanel( maImgSquare(SVX_RES(IMG_SQUARE)), maImgLinear(SVX_RES(IMG_LINEAR)), maImgColor(SVX_RES(IMG_COLOR)), - msHelpFillType(SVX_RES(STR_HELP_TYPE)), - msHelpFillAttr(SVX_RES(STR_HELP_ATTR)), maTrGrPopup(this, ::boost::bind(&AreaPropertyPanel::CreateTransparencyGradientControl, this, _1)), maColorPopup(this, ::boost::bind(&AreaPropertyPanel::CreateColorPopupControl, this, _1)), mpFloatTransparenceItem(), diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hrc b/svx/source/sidebar/area/AreaPropertyPanel.hrc index 5c9def0a2787..7112ab4ccb4b 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.hrc +++ b/svx/source/sidebar/area/AreaPropertyPanel.hrc @@ -15,17 +15,15 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// RID_SIDEBAR_AREA_PANEL-------------------------------------------------------------- #include "svx/dialogs.hrc" #define TBI_LEFT 1 #define TBI_RIGHT 1 -#define TBI_BTX_GRADIENT 51 -#define LB_TRGR_TYPES 6 +#define VS_COLOR 1 + #define MTR_TRANSPARENT 7 -#define BTN_GRADIENT 8 #define FT_TRGR_CENTER_X 9 #define MTR_TRGR_CENTER_X 10 @@ -57,10 +55,6 @@ #define IMG_ROT_LEFT (RID_SVX_SIDEBAR_BEGIN + 37) #define IMG_ROT_RIGHT (RID_SVX_SIDEBAR_BEGIN + 38) -#define STR_HELP_TYPE (RID_SVX_SIDEBAR_BEGIN + 39) -#define STR_HELP_ATTR (RID_SVX_SIDEBAR_BEGIN + 40) -#define VS_COLOR (RID_SVX_SIDEBAR_BEGIN + 41) - #define STR_HELP_COLOR 41 #define FIXED_TEXT_HEIGHT 9 diff --git a/svx/source/sidebar/area/AreaPropertyPanel.src b/svx/source/sidebar/area/AreaPropertyPanel.src index 353e1250d11b..244b3047982b 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.src +++ b/svx/source/sidebar/area/AreaPropertyPanel.src @@ -60,16 +60,6 @@ Image IMG_ROT_RIGHT ImageBitmap = Bitmap{File = "symphony/rotate_right.png";}; }; -Control RID_SIDEBAR_AREA_PANEL -{ - OutputSize = TRUE; - DialogControl = TRUE; - Border = FALSE; - Size = MAP_APPFONT( PROPERTYPAGE_WIDTH, SECTIONPAGE_MARGIN_VERTICAL_TOP + SECTIONPAGE_MARGIN_VERTICAL_BOT + 2*( FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL + CBOX_HEIGHT) + CONTROL_SPACING_VERTICAL ); - HelpID = HID_PROPERTYPANEL_AREA_SECTION ; - Text [ en-US ] = "Area"; -}; - Control RID_POPUPPANEL_AREAPAGE_TRGR { OutputSize = TRUE; diff --git a/svx/uiconfig/ui/sidebararea.ui b/svx/uiconfig/ui/sidebararea.ui index 2b2e24788bd8..8e591c61193e 100644 --- a/svx/uiconfig/ui/sidebararea.ui +++ b/svx/uiconfig/ui/sidebararea.ui @@ -93,6 +93,9 @@ <object class="svxlo-SvxFillAttrBox" id="fillattr"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="has_tooltip">True</property> + <property name="tooltip_markup" translatable="yes">Select the effect to apply.</property> + <property name="tooltip_text" translatable="yes">Select the effect to apply.</property> </object> <packing> <property name="expand">False</property> |