This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 5e480af Further adjustments to TextPropertyPanel (sidebar)
5e480af is described below
commit 5e480afee6e0791340e6a95448167b816b8614d4
Author: mseidel <[email protected]>
AuthorDate: Sat Sep 14 22:32:08 2019 +0200
Further adjustments to TextPropertyPanel (sidebar)
---
main/svx/source/sidebar/text/TextPropertyPanel.hrc | 44 +++++++++--------
main/svx/source/sidebar/text/TextPropertyPanel.src | 56 +++++++++++-----------
2 files changed, 51 insertions(+), 49 deletions(-)
diff --git a/main/svx/source/sidebar/text/TextPropertyPanel.hrc
b/main/svx/source/sidebar/text/TextPropertyPanel.hrc
index 6286a9b..1f9f3de 100644
--- a/main/svx/source/sidebar/text/TextPropertyPanel.hrc
+++ b/main/svx/source/sidebar/text/TextPropertyPanel.hrc
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,29 +7,31 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
+
+
#include "svx/dialogs.hrc"
#define VS_SPACING_WIDTH 80
-#define CUSTOM_HEIGHT CBOX_HEIGHT + MBOX_HEIGHT +
POPUPPANEL_MARGIN_LARGE * 3 + POPUPPANEL_MARGIN_SMALL * 2 + TEXT_HEIGHT * 2
+#define CUSTOM_HEIGHT CBOX_HEIGHT + MBOX_HEIGHT +
POPUPPANEL_MARGIN_LARGE * 3 + POPUPPANEL_MARGIN_SMALL * 2 + TEXT_HEIGHT * 2
#define CUSTOM_WIDTH VS_SPACING_WIDTH - 8
#define CUSTOM_X POPUPPANEL_MARGIN_LARGE +
OFFSET_X + 1
#define CUSTOM_Y OFFSET_Y +
POPUPPANEL_MARGIN_SMALL * 3 + 15 * 6 + TEXT_HEIGHT
#define VS_UNDERLINE_WIDTH 57
#define VS_UNDERLINE_HEIGHT 12 * 10
-#define CONTROL_HEIGHT_FONT_NAME 250
+#define CONTROL_HEIGHT_FONT_NAME 250
#define CONTROL_HEIGHT_FONT_SIZE 180
#define FONTSIZE_WIDTH (TOOLBOX_ITEM_WIDTH * 2
- 1)
#define FONTNAME_WIDTH (TOOLBOX_ITEM_WIDTH * 4)
@@ -42,15 +44,15 @@
#define FT_TB_SPACE 1
#define BK_IMG 20
-#define X0 SECTIONPAGE_MARGIN_HORIZONTAL
-#define X1 SECTIONPAGE_MARGIN_HORIZONTAL + 1 +
TOOLBOX_ITEM_WIDTH * 2 + 4
-#define X2 (PROPERTYPAGE_WIDTH - (FONTSIZE_WIDTH))
-#define X3 (X2 - (TOOLBOX_ITEM_DD_WIDTH) - 3)
+#define X0
SECTIONPAGE_MARGIN_HORIZONTAL
+#define X1
SECTIONPAGE_MARGIN_HORIZONTAL + 1 + TOOLBOX_ITEM_WIDTH * 2 + 4
+#define X2 (PROPERTYPAGE_WIDTH -
(FONTSIZE_WIDTH))
+#define X3 (X2 -
(TOOLBOX_ITEM_DD_WIDTH) - 3)
+
+#define FIRST_LINE_Y SECTIONPAGE_MARGIN_VERTICAL_TOP
+#define SECOND_LINE_Y FIRST_LINE_Y + CBOX_HEIGHT +
CONTROL_SPACING_VERTICAL
+#define THIRD_LINE_Y SECOND_LINE_Y +
CONTROL_SPACING_VERTICAL + TOOLBOX_ITEM_HEIGHT
-#define FIRST_LINE_Y SECTIONPAGE_MARGIN_VERTICAL_TOP
-#define SECOND_LINE_Y FIRST_LINE_Y + CBOX_HEIGHT +
CONTROL_SPACING_VERTICAL + 1
-#define THIRD_LINE_Y SECOND_LINE_Y + CONTROL_SPACING_VERTICAL +
(TOOLBOX_ITEM_HEIGHT + 2)
-
@@ -83,11 +85,11 @@
#define IMG_SPACING_D 71
-//popup window underline
+// popup window underline
#define VS_UNDERLINE 1
#define PB_OPTIONS 2
#define BMP_UNDERLINE_MORE 3
-#define BMP_UNDERLINE_MORE_H 4
+#define BMP_UNDERLINE_MORE_H 4
#define IMG_SINGLE 10
#define IMG_DOUBLE 11
@@ -133,13 +135,13 @@
#define IMG_DASH_DOT_DOT_SEL 48
#define IMG_WAVE_SEL 49
-#define STR_WITHOUT 50
+#define STR_WITHOUT 50
-//popup window font color
+// popup window font color
#define VS_FONT_COLOR 1
#define STR_AUTOMATICE 2
-//POPUP WINDOW OF SPACING
+// POPUP WINDOW OF SPACING
#define VS_SPACING 1
#define CT_BORDER 7
@@ -181,9 +183,9 @@
#define STR_CUSTOM_E_TIP 73
#define STR_PT 74
-//help ids
+// help ids
#define HID_COMBO_FONT_NAME
"SVX_HID_COMBO_FONT_NAME"
-#define HID_METRIC_FONT_SIZE "SVX_HID_METRIC_FONT_SIZE"
+#define HID_METRIC_FONT_SIZE "SVX_HID_METRIC_FONT_SIZE"
#define HID_TB_INCREASE_DECREASE "SVX_HID_TB_INCREASE_DECREASE"
#define HID_TBI_INCREASE "SVX_HID_TBI_INCREASE"
#define HID_TBI_DECREASE "SVX_HID_TBI_DECREASE"
diff --git a/main/svx/source/sidebar/text/TextPropertyPanel.src
b/main/svx/source/sidebar/text/TextPropertyPanel.src
index 74b7d21..39fcea2 100644
--- a/main/svx/source/sidebar/text/TextPropertyPanel.src
+++ b/main/svx/source/sidebar/text/TextPropertyPanel.src
@@ -38,8 +38,8 @@ Control RID_SIDEBAR_TEXT_PANEL
ComboBox CB_SBFONT_FONT
{
Border = TRUE ;
- Pos = MAP_APPFONT (X0, FIRST_LINE_Y) ;
- Size = MAP_APPFONT (FONTNAME_WIDTH, CONTROL_HEIGHT_FONT_NAME) ;
+ Pos = MAP_APPFONT ( X0, FIRST_LINE_Y ) ;
+ Size = MAP_APPFONT ( FONTNAME_WIDTH, CONTROL_HEIGHT_FONT_NAME )
;
TabStop = TRUE ;
DropDown = TRUE ;
HelpID = HID_COMBO_FONT_NAME ;
@@ -49,8 +49,8 @@ Control RID_SIDEBAR_TEXT_PANEL
MetricBox MB_SBFONT_FONTSIZE
{
Border = TRUE ;
- Pos = MAP_APPFONT (X2, FIRST_LINE_Y) ;
- Size = MAP_APPFONT (FONTSIZE_WIDTH, CONTROL_HEIGHT_FONT_SIZE) ;
+ Pos = MAP_APPFONT ( X2, FIRST_LINE_Y ) ;
+ Size = MAP_APPFONT ( FONTSIZE_WIDTH, CONTROL_HEIGHT_FONT_SIZE )
;
TabStop = TRUE ;
DropDown = TRUE ;
HelpID = HID_METRIC_FONT_SIZE ;
@@ -61,7 +61,7 @@ Control RID_SIDEBAR_TEXT_PANEL
ToolBox TB_INCREASE_DECREASE
{
SVLook = TRUE ;
- Pos = MAP_APPFONT (X2, SECOND_LINE_Y) ;
+ Pos = MAP_APPFONT ( X2, SECOND_LINE_Y ) ;
Size = MAP_APPFONT ( TOOLBOX_ITEM_WIDTH * 2,
TOOLBOX_ITEM_HEIGHT ) ;
TabStop = TRUE ;
HelpID = HID_PPROPERTYPANEL_TEXT_TBX_FONTSIZE_INDE ;
@@ -85,7 +85,7 @@ Control RID_SIDEBAR_TEXT_PANEL
ToolBox TB_FONT
{
SVLook = TRUE ;
- Pos = MAP_APPFONT (X0 + 1, SECOND_LINE_Y) ;
+ Pos = MAP_APPFONT ( X0 + 1, SECOND_LINE_Y ) ;
Size = MAP_APPFONT ( TOOLBOX_ITEM_WIDTH * 4 +
TOOLBOX_ITEM_DD_WIDTH, TOOLBOX_ITEM_HEIGHT ) ;
TabStop = TRUE ;
HelpID = HID_PPROPERTYPANEL_TEXT_TBX_FONT ;
@@ -130,8 +130,8 @@ Control RID_SIDEBAR_TEXT_PANEL
{
HelpID = HID_PPROPERTYPANEL_TEXT_TBX_FONT_COLOR ;
SVLook = TRUE ;
- Pos = MAP_APPFONT (X3, THIRD_LINE_Y) ;
- Size = MAP_APPFONT (TOOLBOX_ITEM_DD_WIDTH, TOOLBOX_ITEM_HEIGHT
) ;
+ Pos = MAP_APPFONT ( X3, THIRD_LINE_Y ) ;
+ Size = MAP_APPFONT ( TOOLBOX_ITEM_DD_WIDTH, TOOLBOX_ITEM_HEIGHT
) ;
TabStop = TRUE ;
ItemList =
{
@@ -148,8 +148,8 @@ Control RID_SIDEBAR_TEXT_PANEL
{
HelpID = HID_PPROPERTYPANEL_TEXT_TBX_FONT_COLOR ;
SVLook = TRUE ;
- Pos = MAP_APPFONT (X3, THIRD_LINE_Y) ;
- Size = MAP_APPFONT (TOOLBOX_ITEM_DD_WIDTH, TOOLBOX_ITEM_HEIGHT
) ;
+ Pos = MAP_APPFONT ( X3, THIRD_LINE_Y ) ;
+ Size = MAP_APPFONT ( TOOLBOX_ITEM_DD_WIDTH, TOOLBOX_ITEM_HEIGHT
) ;
TabStop = TRUE ;
ItemList =
{
@@ -166,8 +166,8 @@ Control RID_SIDEBAR_TEXT_PANEL
ToolBox TB_HIGHLIGHT
{
SVLook = TRUE ;
- Pos = MAP_APPFONT (X2, THIRD_LINE_Y) ;
- Size = MAP_APPFONT (TOOLBOX_ITEM_DD_WIDTH, TOOLBOX_ITEM_HEIGHT
) ;
+ Pos = MAP_APPFONT ( X2, THIRD_LINE_Y ) ;
+ Size = MAP_APPFONT ( TOOLBOX_ITEM_DD_WIDTH, TOOLBOX_ITEM_HEIGHT
) ;
TabStop = TRUE ;
HelpID = HID_PPROPERTYPANEL_TEXT_TBX_HIGHLIGHT_COLOR ;
Text = "Highlight Color" ;
@@ -186,8 +186,8 @@ Control RID_SIDEBAR_TEXT_PANEL
ToolBox TB_SCRIPT_SW
{
SVLook = TRUE ;
- Pos = MAP_APPFONT (X0 + 1, THIRD_LINE_Y) ;
- Size = MAP_APPFONT (TOOLBOX_ITEM_WIDTH * 2, TOOLBOX_ITEM_HEIGHT
) ;
+ Pos = MAP_APPFONT ( X0 + 1, THIRD_LINE_Y ) ;
+ Size = MAP_APPFONT ( TOOLBOX_ITEM_WIDTH * 2,
TOOLBOX_ITEM_HEIGHT ) ;
TabStop = TRUE ;
HelpID = HID_PPROPERTYPANEL_TEXT_TBX_SCRIPT_SW ;
Text = "Font Position" ;
@@ -210,8 +210,8 @@ Control RID_SIDEBAR_TEXT_PANEL
ToolBox TB_SCRIPT
{
SVLook = TRUE ;
- Pos = MAP_APPFONT (X0 + 1, THIRD_LINE_Y) ;
- Size = MAP_APPFONT (TOOLBOX_ITEM_WIDTH * 2, TOOLBOX_ITEM_HEIGHT
) ;
+ Pos = MAP_APPFONT ( X0 + 1, THIRD_LINE_Y ) ;
+ Size = MAP_APPFONT ( TOOLBOX_ITEM_WIDTH * 2,
TOOLBOX_ITEM_HEIGHT ) ;
TabStop = TRUE ;
HelpID = HID_PPROPERTYPANEL_TEXT_TBX_SCRIPT ;
Text = "Font Position" ;
@@ -235,8 +235,8 @@ Control RID_SIDEBAR_TEXT_PANEL
ToolBox TB_SPACING
{
SVLook = TRUE ;
- Pos = MAP_APPFONT (X1, THIRD_LINE_Y) ;
- Size = MAP_APPFONT (TOOLBOX_24_16_ITEM_DD_WIDTH,
TOOLBOX_24_16_ITEM_HEIGHT ) ;
+ Pos = MAP_APPFONT ( X1, THIRD_LINE_Y ) ;
+ Size = MAP_APPFONT ( TOOLBOX_24_16_ITEM_DD_WIDTH,
TOOLBOX_24_16_ITEM_HEIGHT ) ;
TabStop = TRUE ;
HelpID = HID_TB_SPACING ;
Text = "Character Spacing" ;
@@ -259,13 +259,13 @@ Control RID_POPUPPANEL_TEXTPAGE_UNDERLINE
DialogControl = TRUE ;
Border = FALSE ;
- Size = MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL * 2 + POPUP_BORDER_WIDTH +
VS_UNDERLINE_WIDTH, 13+ VS_UNDERLINE_HEIGHT + POPUP_BORDER_HEIGHT +
POPUPPANEL_MARGIN_SMALL * 2 + POPUPPANEL_MARGIN_LARGE) ;
+ Size = MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL * 2 + POPUP_BORDER_WIDTH +
VS_UNDERLINE_WIDTH, 13 + VS_UNDERLINE_HEIGHT + POPUP_BORDER_HEIGHT +
POPUPPANEL_MARGIN_SMALL * 2 + POPUPPANEL_MARGIN_LARGE ) ;
Control VS_UNDERLINE
{
HelpID = HID_PPROPERTYPANEL_TEXT_UNDERLINE_VS ;
Hide = TRUE ;
Pos = MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL + OFFSET_X,
POPUPPANEL_MARGIN_SMALL + OFFSET_Y ) ;
- Size = MAP_APPFONT ( VS_UNDERLINE_WIDTH, VS_UNDERLINE_HEIGHT) ;
+ Size = MAP_APPFONT ( VS_UNDERLINE_WIDTH, VS_UNDERLINE_HEIGHT ) ;
TabStop = TRUE ;
Text = "Underline" ;
};
@@ -467,7 +467,7 @@ Control RID_POPUPPANEL_TEXTPAGE_FONT_COLOR
HelpID = HID_PPROPERTYPANEL_TEXT_COLOR_VS ;
Hide = TRUE ;
Pos = MAP_APPFONT ( OFFSET_X, OFFSET_Y ) ;
- Size = MAP_APPFONT ( POPUP_COLOR_PICKER_WIDTH - OFFSET_X * 2,
POPUP_COLOR_PICKER_HEIGHT - OFFSET_Y * 2) ;
+ Size = MAP_APPFONT ( POPUP_COLOR_PICKER_WIDTH - OFFSET_X * 2,
POPUP_COLOR_PICKER_HEIGHT - OFFSET_Y * 2 ) ;
TabStop = TRUE ;
Text = "Color Picker" ;
};
@@ -483,21 +483,21 @@ Control RID_POPUPPANEL_TEXTPAGE_SPACING
DialogControl = TRUE ;
Border = FALSE ;
- Size = MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL * 2 + POPUP_BORDER_WIDTH +
VS_SPACING_WIDTH, POPUPPANEL_MARGIN_SMALL * 3 + 15 * 6 + CUSTOM_HEIGHT +
TEXT_HEIGHT + POPUPPANEL_MARGIN_LARGE + POPUP_BORDER_WIDTH + 1) ;
+ Size = MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL * 2 + POPUP_BORDER_WIDTH +
VS_SPACING_WIDTH, POPUPPANEL_MARGIN_SMALL * 3 + 15 * 6 + CUSTOM_HEIGHT +
TEXT_HEIGHT + POPUPPANEL_MARGIN_LARGE + POPUP_BORDER_WIDTH + 1 ) ;
Control VS_SPACING
{
HelpId = HID_PPROPERTYPANEL_TEXT_SPACING_VS ;
Hide = TRUE ;
Pos = MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL + OFFSET_X,
POPUPPANEL_MARGIN_SMALL + OFFSET_Y ) ;
- Size = MAP_APPFONT ( VS_SPACING_WIDTH, 15 * 6) ;
+ Size = MAP_APPFONT ( VS_SPACING_WIDTH, 15 * 6 ) ;
TabStop = TRUE ;
Text = "Character Spacing" ;
};
FixedText FT_LASTCUSTOM
{
- Pos = MAP_APPFONT ( POPUPPANEL_MARGIN_LARGE + OFFSET_X,
POPUPPANEL_MARGIN_SMALL + OFFSET_Y + POPUPPANEL_MARGIN_SMALL + 15 * 6) ;
+ Pos = MAP_APPFONT ( POPUPPANEL_MARGIN_LARGE + OFFSET_X,
POPUPPANEL_MARGIN_SMALL + OFFSET_Y + POPUPPANEL_MARGIN_SMALL + 15 * 6 ) ;
Size = MAP_APPFONT ( CUSTOM_WIDTH, TEXT_HEIGHT ) ;
Left = TRUE ;
Text [ en-US ] = "Custom:" ;
@@ -505,7 +505,7 @@ Control RID_POPUPPANEL_TEXTPAGE_SPACING
// custom area
FixedText FT_SPACING
{
- Pos = MAP_APPFONT ( CUSTOM_X + POPUPPANEL_MARGIN_LARGE,
CUSTOM_Y + POPUPPANEL_MARGIN_LARGE) ;
+ Pos = MAP_APPFONT ( CUSTOM_X + POPUPPANEL_MARGIN_LARGE,
CUSTOM_Y + POPUPPANEL_MARGIN_LARGE ) ;
Size = MAP_APPFONT ( CUSTOM_WIDTH - POPUPPANEL_MARGIN_LARGE *
2, TEXT_HEIGHT ) ;
Left = TRUE ;
Text [ en-US ] = "~Character spacing: " ;
@@ -513,7 +513,7 @@ Control RID_POPUPPANEL_TEXTPAGE_SPACING
ListBox LB_KERNING
{
Border = TRUE ;
- Pos = MAP_APPFONT ( CUSTOM_X + POPUPPANEL_MARGIN_LARGE,
CUSTOM_Y + POPUPPANEL_MARGIN_LARGE + TEXT_HEIGHT + POPUPPANEL_MARGIN_SMALL); //
20
+ Pos = MAP_APPFONT ( CUSTOM_X + POPUPPANEL_MARGIN_LARGE,
CUSTOM_Y + POPUPPANEL_MARGIN_LARGE + TEXT_HEIGHT + POPUPPANEL_MARGIN_SMALL );
// 20
Size = MAP_APPFONT ( CUSTOM_WIDTH - POPUPPANEL_MARGIN_LARGE *
2, 80 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
@@ -536,7 +536,7 @@ Control RID_POPUPPANEL_TEXTPAGE_SPACING
{
HelpID = HID_SPACING_MB_KERN ;
Border = TRUE ;
- Pos = MAP_APPFONT ( CUSTOM_X + POPUPPANEL_MARGIN_LARGE,
CUSTOM_Y + POPUPPANEL_MARGIN_LARGE * 2 + TEXT_HEIGHT * 2 +
POPUPPANEL_MARGIN_SMALL * 2 + CBOX_HEIGHT) ; // 60
+ Pos = MAP_APPFONT ( CUSTOM_X + POPUPPANEL_MARGIN_LARGE,
CUSTOM_Y + POPUPPANEL_MARGIN_LARGE * 2 + TEXT_HEIGHT * 2 +
POPUPPANEL_MARGIN_SMALL * 2 + CBOX_HEIGHT ) ; // 60
Size = MAP_APPFONT ( CUSTOM_WIDTH - POPUPPANEL_MARGIN_LARGE *
2, MBOX_HEIGHT ) ;
TabStop = TRUE ;
Repeat = TRUE ;
@@ -582,7 +582,7 @@ Control RID_POPUPPANEL_TEXTPAGE_SPACING
};
Image IMG_LOOSE_S
{
- ImageBitmap = Bitmap {File = "symphony/spacing_loose_s.png";} ;
+ ImageBitmap = Bitmap {File = "symphony/spacing_loose_s.png" ;} ;
};
Image IMG_VERY_LOOSE_S
{
