[Libreoffice-commits] core.git: 7 commits - svx/source svx/uiconfig svx/UIConfig_svx.mk
Jan Holesovsky
kendy at suse.cz
Thu Jul 11 05:59:35 PDT 2013
svx/UIConfig_svx.mk | 1
svx/source/dialog/sdstring.src | 10
svx/source/sidebar/line/LinePropertyPanel.cxx | 122 +++-----
svx/source/sidebar/line/LinePropertyPanel.hrc | 36 --
svx/source/sidebar/line/LinePropertyPanel.hxx | 35 +-
svx/source/sidebar/line/LinePropertyPanel.src | 284 ++------------------
svx/uiconfig/ui/sidebarline.ui | 354 ++++++++++++++++++++++++++
7 files changed, 479 insertions(+), 363 deletions(-)
New commits:
commit 25b4ecbbcf9af9aeea5ca093b138f108de35a353
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Jul 11 14:15:59 2013 +0200
sidebar: Improve the LinePropertyPanel look.
Change-Id: I11cadee9a0e3708df09cda2bbe0959c2be7fdda9
diff --git a/svx/uiconfig/ui/sidebarline.ui b/svx/uiconfig/ui/sidebarline.ui
index cf8646e..63a8905 100644
--- a/svx/uiconfig/ui/sidebarline.ui
+++ b/svx/uiconfig/ui/sidebarline.ui
@@ -4,50 +4,156 @@
<object class="GtkGrid" id="LinePropertyPanel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_homogeneous">True</property>
- <property name="column_homogeneous">True</property>
<child>
- <object class="GtkBox" id="box1">
+ <object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="border_width">6</property>
- <property name="orientation">vertical</property>
- <property name="spacing">12</property>
<child>
- <object class="GtkGrid" id="grid1">
+ <object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
- <property name="column_homogeneous">True</property>
+ <property name="hexpand">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="widthlabel">
+ <object class="GtkGrid" id="grid4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Width:</property>
- <property name="use_underline">True</property>
- </object>
- <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>
- <object class="GtkLabel" id="colorlabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Color:</property>
- <property name="use_underline">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <property name="column_homogeneous">True</property>
+ <child>
+ <object class="GtkLabel" id="widthlabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Width:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <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>
+ <object class="GtkToolbar" id="width">
+ <property name="width_request">120</property>
+ <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 width of the line.</property>
+ <property name="tooltip_text" translatable="yes">Select the width of the line.</property>
+ <child>
+ <object class="GtkMenuToolButton" id="setwidth">
+ <property name="width_request">105</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:SelectWidth</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="homogeneous">True</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">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="colorlabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Color:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <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="GtkToolbar" id="color">
+ <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 color of the line.</property>
+ <property name="tooltip_text" translatable="yes">Select the color of the line.</property>
+ <child>
+ <object class="GtkMenuToolButton" id="setcolor">
+ <property name="width_request">105</property>
+ <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 color of the line.</property>
+ <property name="tooltip_text" translatable="yes">Select the color of the line.</property>
+ <property name="margin_left">20</property>
+ <property name="action_name">.uno:SelectColor</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <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>
+ <object class="GtkLabel" id="translabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Transparency:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <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>
+ <object class="GtkSpinButton" id="linetransparency:0%">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Specify the transparency of the line.</property>
+ <property name="tooltip_text" translatable="yes">Specify the transparency of the line.</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="climb_rate">5</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">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">1</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -59,25 +165,25 @@
<property name="use_underline">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="translabel">
+ <object class="GtkComboBoxText" id="linestyle">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Transparency:</property>
- <property name="use_underline">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Select the style of the line.</property>
+ <property name="tooltip_text" translatable="yes">Select the style of the line.</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -89,219 +195,151 @@
<property name="use_underline">True</property>
</object>
<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>
- <object class="GtkLabel" id="cornerlabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Corner style:</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">6</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="caplabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Ca_p style:</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">6</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolbar" id="width">
- <property name="width_request">120</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Select the width of the line.</property>
- <child>
- <object class="GtkMenuToolButton" id="setwidth">
- <property name="width_request">105</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:SelectWidth</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="beginarrowstyle">
<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 style of the beginning arrowhead.</property>
<property name="tooltip_text" translatable="yes">Select the style of the beginning arrowhead.</property>
<property name="hexpand">True</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="endarrowstyle">
<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 style of the ending arrowhead.</property>
<property name="tooltip_text" translatable="yes">Select the style of the ending arrowhead.</property>
<property name="hexpand">True</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">5</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">5</property>
</packing>
</child>
<child>
- <object class="GtkComboBoxText" id="edgestyle">
+ <object class="GtkGrid" id="grid5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Select the style of the edge connections.</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
- <style>
- <class name="Rounded"/>
- <class name="- none -"/>
- <class name="Mitered"/>
- <class name="Beveled"/>
- </style>
- <items>
- <item translatable="yes">Rounded</item>
- <item translatable="yes">- none -</item>
- <item translatable="yes">Mitered</item>
- <item translatable="yes">Beveled</item>
- </items>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">7</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="linecapstyle">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Select the style of the line caps.</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
- <style>
- <class name="Flat"/>
- <class name="Round"/>
- <class name="Square"/>
- </style>
- <items>
- <item translatable="yes">Flat</item>
- <item translatable="yes">Round</item>
- <item translatable="yes">Square</item>
- </items>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">7</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="linestyle">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Select the style of the line.</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
- </object>
- <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>
- <object class="GtkToolbar" id="color">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Select the color of the line.</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <property name="column_homogeneous">True</property>
<child>
- <object class="GtkMenuToolButton" id="setcolor">
- <property name="width_request">105</property>
+ <object class="GtkLabel" id="cornerlabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Select the color of the line.</property>
- <property name="margin_left">20</property>
- <property name="action_name">.uno:SelectColor</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Corner style:</property>
<property name="use_underline">True</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="homogeneous">True</property>
+ <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>
+ <object class="GtkComboBoxText" id="edgestyle">
+ <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 style of the edge connections.</property>
+ <property name="tooltip_text" translatable="yes">Select the style of the edge connections.</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ <style>
+ <class name="Rounded"/>
+ <class name="- none -"/>
+ <class name="Mitered"/>
+ <class name="Beveled"/>
+ </style>
+ <items>
+ <item translatable="yes">Rounded</item>
+ <item translatable="yes">- none -</item>
+ <item translatable="yes">Mitered</item>
+ <item translatable="yes">Beveled</item>
+ </items>
+ </object>
+ <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="caplabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Ca_p style:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="linecapstyle">
+ <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 style of the line caps.</property>
+ <property name="tooltip_text" translatable="yes">Select the style of the line caps.</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ <style>
+ <class name="Flat"/>
+ <class name="Round"/>
+ <class name="Square"/>
+ </style>
+ <items>
+ <item translatable="yes">Flat</item>
+ <item translatable="yes">Round</item>
+ <item translatable="yes">Square</item>
+ </items>
+ </object>
+ <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>
</object>
<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>
- <object class="GtkSpinButton" id="linetransparency:0%">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes">Specify the transparency of the line.</property>
- <property name="invisible_char">•</property>
- <property name="climb_rate">5</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">6</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
commit 2978948d05c299cccebba997ce599f3a7f72057e
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Jul 11 14:15:05 2013 +0200
No need to have unreasonably long descriptions of line types.
Change-Id: If6d9830d776c0aa95c848a04b43a8d43ba34bfde
diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src
index 13b40bf..c280882 100644
--- a/svx/source/dialog/sdstring.src
+++ b/svx/source/dialog/sdstring.src
@@ -1649,7 +1649,7 @@ String RID_SVXSTR_DASH1
};
String RID_SVXSTR_DASH2
{
- Text [ en-US ] = "Ultrafine 2 Dots 3 Dashes";
+ Text [ en-US ] = "2 Dots 3 Dashes";
};
String RID_SVXSTR_DASH3
{
@@ -1661,15 +1661,15 @@ String RID_SVXSTR_DASH4
};
String RID_SVXSTR_DASH5
{
- Text [ en-US ] = "Fine Dashed (var)";
+ Text [ en-US ] = "Fine Dashed";
};
String RID_SVXSTR_DASH6
{
- Text [ en-US ] = "3 Dashes 3 Dots (var)";
+ Text [ en-US ] = "3 Dashes 3 Dots";
};
String RID_SVXSTR_DASH7
{
- Text [ en-US ] = "Ultrafine Dotted (var)";
+ Text [ en-US ] = "Ultrafine Dotted";
};
String RID_SVXSTR_DASH8
{
@@ -1681,7 +1681,7 @@ String RID_SVXSTR_DASH9
};
String RID_SVXSTR_DASH10
{
- Text [ en-US ] = "Dashed (var)";
+ Text [ en-US ] = "Dashed";
};
String RID_SVXSTR_DASH11
{
commit f471a9fcfc85e4e695a2dae0a1b4cddefca8d6dd
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Jul 11 10:29:11 2013 +0200
sidebar: Images have to be global in LinePropertyPanel.
Change-Id: I8cdb6321dbfa6860855e24bad03974de668c56eb
diff --git a/svx/source/sidebar/line/LinePropertyPanel.hrc b/svx/source/sidebar/line/LinePropertyPanel.hrc
index 245c682..02547f7 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.hrc
+++ b/svx/source/sidebar/line/LinePropertyPanel.hrc
@@ -30,17 +30,17 @@
#define FT_CAPSTYLE 20
#define LB_CAPSTYLE 21
-#define IMG_COLOR 23
-#define IMG_NONE_ICON 36
-
-#define IMG_WIDTH1_ICON 41
-#define IMG_WIDTH2_ICON 42
-#define IMG_WIDTH3_ICON 43
-#define IMG_WIDTH4_ICON 44
-#define IMG_WIDTH5_ICON 45
-#define IMG_WIDTH6_ICON 46
-#define IMG_WIDTH7_ICON 47
-#define IMG_WIDTH8_ICON 48
+#define IMG_COLOR (RID_SVX_SIDEBAR_BEGIN + 20)
+#define IMG_NONE_ICON (RID_SVX_SIDEBAR_BEGIN + 21)
+
+#define IMG_WIDTH1_ICON (RID_SVX_SIDEBAR_BEGIN + 22)
+#define IMG_WIDTH2_ICON (RID_SVX_SIDEBAR_BEGIN + 23)
+#define IMG_WIDTH3_ICON (RID_SVX_SIDEBAR_BEGIN + 24)
+#define IMG_WIDTH4_ICON (RID_SVX_SIDEBAR_BEGIN + 25)
+#define IMG_WIDTH5_ICON (RID_SVX_SIDEBAR_BEGIN + 26)
+#define IMG_WIDTH6_ICON (RID_SVX_SIDEBAR_BEGIN + 27)
+#define IMG_WIDTH7_ICON (RID_SVX_SIDEBAR_BEGIN + 28)
+#define IMG_WIDTH8_ICON (RID_SVX_SIDEBAR_BEGIN + 29)
//color popup page
#define VS_COLOR 1
diff --git a/svx/source/sidebar/line/LinePropertyPanel.src b/svx/source/sidebar/line/LinePropertyPanel.src
index c1cda86..c067c40 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.src
+++ b/svx/source/sidebar/line/LinePropertyPanel.src
@@ -24,81 +24,48 @@
#define TOOLBOX_HEIGHT 14
#define LISTBOX_HEIGHT 99
-Control RID_SIDEBAR_LINE_PANEL
+Image IMG_COLOR
{
- OutputSize = TRUE;
- DialogControl = TRUE;
- Border = FALSE;
- Text = "Line";
-
- Size = MAP_APPFONT(
- PROPERTYPAGE_WIDTH,
- SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT*4 + TEXT_CONTROL_SPACING_VERTICAL*4 + TOOLBOX_HEIGHT*3 + CONTROL_SPACING_VERTICAL*3 + CBOX_HEIGHT + SECTIONPAGE_MARGIN_VERTICAL_BOT );
- HelpID = HID_PROPERTYPANEL_LINE_SECTION ;
-
-/*
- MetricField MF_TRANSPARENT
- {
- Border = TRUE ;
- HelpID = HID_PPROPERTYPANEL_LINE_MTR_TRANCEPARENCE;
- Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL + TOOLBOX_WIDTH + 3 , SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT*2 + TEXT_CONTROL_SPACING_VERTICAL*2 + TOOLBOX_HEIGHT + CONTROL_SPACING_VERTICAL) ;
- Size = MAP_APPFONT ( TOOLBOX_WIDTH + 1 , 12 ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Maximum = 100 ;
- StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
- Last = 100 ;
- SpinSize = 5 ;
- QuickHelpText [ en-US ] = "Specify the transparency of the line.";
- };
-*/
- Image IMG_COLOR
- {
- ImageBitmap = Bitmap{File = "symphony/Line_color.png";};
- };
- Image IMG_NONE_ICON
- {
- ImageBitmap = Bitmap{File = "symphony/blank.png";};
- };
-
- //WIDTH ICON
- Image IMG_WIDTH1_ICON
- {
- ImageBitmap = Bitmap{File = "symphony/width1.png";};
- };
- Image IMG_WIDTH2_ICON
- {
- ImageBitmap = Bitmap{File = "symphony/width2.png";};
- };
- Image IMG_WIDTH3_ICON
- {
- ImageBitmap = Bitmap{File = "symphony/width3.png";};
- };
- Image IMG_WIDTH4_ICON
- {
- ImageBitmap = Bitmap{File = "symphony/width4.png";};
- };
- Image IMG_WIDTH5_ICON
- {
- ImageBitmap = Bitmap{File = "symphony/width5.png";};
- };
- Image IMG_WIDTH6_ICON
- {
- ImageBitmap = Bitmap{File = "symphony/width6.png";};
- };
- Image IMG_WIDTH7_ICON
- {
- ImageBitmap = Bitmap{File = "symphony/width7.png";};
- };
- Image IMG_WIDTH8_ICON
- {
- ImageBitmap = Bitmap{File = "symphony/width8.png";};
- };
+ ImageBitmap = Bitmap{File = "symphony/Line_color.png";};
+};
+Image IMG_NONE_ICON
+{
+ ImageBitmap = Bitmap{File = "symphony/blank.png";};
+};
+Image IMG_WIDTH1_ICON
+{
+ ImageBitmap = Bitmap{File = "symphony/width1.png";};
+};
+Image IMG_WIDTH2_ICON
+{
+ ImageBitmap = Bitmap{File = "symphony/width2.png";};
};
+Image IMG_WIDTH3_ICON
+{
+ ImageBitmap = Bitmap{File = "symphony/width3.png";};
+};
+Image IMG_WIDTH4_ICON
+{
+ ImageBitmap = Bitmap{File = "symphony/width4.png";};
+};
+Image IMG_WIDTH5_ICON
+{
+ ImageBitmap = Bitmap{File = "symphony/width5.png";};
+};
+Image IMG_WIDTH6_ICON
+{
+ ImageBitmap = Bitmap{File = "symphony/width6.png";};
+};
+Image IMG_WIDTH7_ICON
+{
+ ImageBitmap = Bitmap{File = "symphony/width7.png";};
+};
+Image IMG_WIDTH8_ICON
+{
+ ImageBitmap = Bitmap{File = "symphony/width8.png";};
+};
+
Control RID_POPUPPANEL_LINEPAGE_COLOR
{
OutputSize = TRUE;
commit 09b3a00b8eb0709f0606d024c242b345ef2f364d
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Jul 10 19:08:11 2013 +0200
Unused, kill these src/hrc entries.
Change-Id: I96bd136313d77f3d3d9aee53c0b916d515004ba9
diff --git a/svx/source/sidebar/line/LinePropertyPanel.hrc b/svx/source/sidebar/line/LinePropertyPanel.hrc
index d3940c6..245c682 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.hrc
+++ b/svx/source/sidebar/line/LinePropertyPanel.hrc
@@ -31,7 +31,6 @@
#define LB_CAPSTYLE 21
#define IMG_COLOR 23
-#define IMG_COLOR_NO 24
#define IMG_NONE_ICON 36
#define IMG_WIDTH1_ICON 41
diff --git a/svx/source/sidebar/line/LinePropertyPanel.src b/svx/source/sidebar/line/LinePropertyPanel.src
index 07441d8..c1cda86 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.src
+++ b/svx/source/sidebar/line/LinePropertyPanel.src
@@ -59,11 +59,6 @@ Control RID_SIDEBAR_LINE_PANEL
{
ImageBitmap = Bitmap{File = "symphony/Line_color.png";};
};
- Image IMG_COLOR_NO
- {
- ImageBitmap = Bitmap{File = "symphony/no color.png";};
- };
-
Image IMG_NONE_ICON
{
ImageBitmap = Bitmap{File = "symphony/blank.png";};
commit dae88bf60adf1b7c9dccd79bdc1f444b91732a08
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Jul 10 19:01:33 2013 +0200
sidebar: LinePropertyPanel missing entries in listboxes.
Change-Id: I366cda7e63d3c64b063bcadc879c15a228981576
diff --git a/svx/uiconfig/ui/sidebarline.ui b/svx/uiconfig/ui/sidebarline.ui
index e8efdde..cf8646e 100644
--- a/svx/uiconfig/ui/sidebarline.ui
+++ b/svx/uiconfig/ui/sidebarline.ui
@@ -197,6 +197,12 @@
<class name="Mitered"/>
<class name="Beveled"/>
</style>
+ <items>
+ <item translatable="yes">Rounded</item>
+ <item translatable="yes">- none -</item>
+ <item translatable="yes">Mitered</item>
+ <item translatable="yes">Beveled</item>
+ </items>
</object>
<packing>
<property name="left_attach">0</property>
@@ -217,6 +223,11 @@
<class name="Round"/>
<class name="Square"/>
</style>
+ <items>
+ <item translatable="yes">Flat</item>
+ <item translatable="yes">Round</item>
+ <item translatable="yes">Square</item>
+ </items>
</object>
<packing>
<property name="left_attach">1</property>
commit 79a8e218461441cc7b9f5095a097543e7556bd83
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Jul 10 18:48:28 2013 +0200
sidebar: LinePropertyPanel .ui usage + small cleanup.
Change-Id: I2ef9554c35015a050e02ccd1b6fc799fe9f1a919
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index f887c6b..dbacf25 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -156,7 +156,7 @@ LinePropertyPanel::LinePropertyPanel(
Window* pParent,
const cssu::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings)
-: PanelLayout(pParent, "LinePropertyPanel", "svx/ui/sidebarline", rxFrame),
+: PanelLayout(pParent, "LinePropertyPanel", "svx/ui/sidebarline.ui", rxFrame),
maStyleControl(SID_ATTR_LINE_STYLE, *pBindings, *this),
maDashControl (SID_ATTR_LINE_DASH, *pBindings, *this),
maWidthControl(SID_ATTR_LINE_WIDTH, *pBindings, *this),
diff --git a/svx/uiconfig/ui/sidebarline.ui b/svx/uiconfig/ui/sidebarline.ui
index db62473..e8efdde 100644
--- a/svx/uiconfig/ui/sidebarline.ui
+++ b/svx/uiconfig/ui/sidebarline.ui
@@ -17,6 +17,9 @@
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <property name="column_homogeneous">True</property>
<child>
<object class="GtkLabel" id="widthlabel">
<property name="visible">True</property>
@@ -36,7 +39,7 @@
<object class="GtkLabel" id="colorlabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0.25</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">_Color:</property>
<property name="use_underline">True</property>
</object>
@@ -66,6 +69,7 @@
<object class="GtkLabel" id="translabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">_Transparency:</property>
<property name="use_underline">True</property>
</object>
@@ -110,7 +114,7 @@
<object class="GtkLabel" id="caplabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0.30000001192092896</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">Ca_p style:</property>
<property name="use_underline">True</property>
</object>
@@ -129,11 +133,10 @@
<property name="tooltip_text" translatable="yes">Select the width of the line.</property>
<child>
<object class="GtkMenuToolButton" id="setwidth">
- <property name="width_request">120</property>
+ <property name="width_request">105</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:SelectWidth</property>
- <property name="label" translatable="yes">toolbutton1</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -167,11 +170,9 @@
</child>
<child>
<object class="GtkComboBoxText" id="endarrowstyle">
- <property name="width_request">120</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Select the style of the ending arrowhead.</property>
- <property name="margin_left">20</property>
<property name="hexpand">True</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
@@ -209,7 +210,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Select the style of the line caps.</property>
- <property name="margin_left">20</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<style>
@@ -247,12 +247,12 @@
<property name="tooltip_text" translatable="yes">Select the color of the line.</property>
<child>
<object class="GtkMenuToolButton" id="setcolor">
+ <property name="width_request">105</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Select the color of the line.</property>
<property name="margin_left">20</property>
<property name="action_name">.uno:SelectColor</property>
- <property name="label" translatable="yes">toolbutton1</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -269,11 +269,10 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="linetransparency">
+ <object class="GtkSpinButton" id="linetransparency:0%">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">Specify the transparency of the line.</property>
- <property name="margin_left">20</property>
<property name="invisible_char">•</property>
<property name="climb_rate">5</property>
</object>
commit ade434f494d0e272db9818f672c38e311ac748d8
Author: Prashant Pandey <prashant3.yishu at gmail.com>
Date: Fri Jun 21 16:29:57 2013 +0530
sidebar: LinePropertyPanel conversion to .ui
Change-Id: I7f9ee68fac268621f2412377fa059c7f8225718c
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index 386ba66..f1fa287 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/redlinecontrol \
svx/uiconfig/ui/redlinefilterpage \
svx/uiconfig/ui/redlineviewpage \
+ svx/uiconfig/ui/sidebarline \
svx/uiconfig/ui/sidebarparagraph \
svx/uiconfig/ui/sidebartextpanel \
))
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index 1330f46..f887c6b 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -57,6 +57,9 @@ using namespace css;
using namespace cssu;
using ::sfx2::sidebar::Theme;
+const char UNO_SELECTWIDTH[] = ".uno:SelectWidth";
+const char UNO_SELECTCOLOR[] = ".uno:SelectColor";
+
#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
namespace {
@@ -153,26 +156,7 @@ LinePropertyPanel::LinePropertyPanel(
Window* pParent,
const cssu::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings)
-: Control(
- pParent,
- SVX_RES(RID_SIDEBAR_LINE_PANEL)),
- mpFTWidth(new FixedText(this, SVX_RES(FT_WIDTH))),
- mpTBWidthBackground(sfx2::sidebar::ControlFactory::CreateToolBoxBackground(this)),
- mpTBWidth(sfx2::sidebar::ControlFactory::CreateToolBox(mpTBWidthBackground.get(), SVX_RES(TB_WIDTH))),
- mpFTColor(new FixedText(this, SVX_RES(FT_COLOR))),
- mpTBColorBackground(sfx2::sidebar::ControlFactory::CreateToolBoxBackground(this)),
- mpTBColor(sfx2::sidebar::ControlFactory::CreateToolBox(mpTBColorBackground.get(), SVX_RES(TB_COLOR))),
- mpFTStyle(new FixedText(this, SVX_RES(FT_STYLE))),
- mpLBStyle(new ListBox(this, SVX_RES(LB_STYLE))),
- mpFTTrancparency(new FixedText(this, SVX_RES(FT_TRANSPARENT))),
- mpMFTransparent(new MetricField(this, SVX_RES(MF_TRANSPARENT))),
- mpFTArrow(new FixedText(this, SVX_RES(FT_ARROW))),
- mpLBStart(new ListBox(this, SVX_RES(LB_START))),
- mpLBEnd(new ListBox(this, SVX_RES(LB_END))),
- mpFTEdgeStyle(new FixedText(this, SVX_RES(FT_EDGESTYLE))),
- mpLBEdgeStyle(new ListBox(this, SVX_RES(LB_EDGESTYLE))),
- mpFTCapStyle(new FixedText(this, SVX_RES(FT_CAPSTYLE))),
- mpLBCapStyle(new ListBox(this, SVX_RES(LB_CAPSTYLE))),
+: PanelLayout(pParent, "LinePropertyPanel", "svx/ui/sidebarline", rxFrame),
maStyleControl(SID_ATTR_LINE_STYLE, *pBindings, *this),
maDashControl (SID_ATTR_LINE_DASH, *pBindings, *this),
maWidthControl(SID_ATTR_LINE_WIDTH, *pBindings, *this),
@@ -185,7 +169,6 @@ LinePropertyPanel::LinePropertyPanel(
maEdgeStyle(SID_ATTR_LINE_JOINT, *pBindings, *this),
maCapStyle(SID_ATTR_LINE_CAP, *pBindings, *this),
maColor(COL_BLACK),
- mpColorUpdater(new ::svx::ToolboxButtonColorUpdater(SID_ATTR_LINE_COLOR, TBI_COLOR, mpTBColor.get())),
mpStyleItem(),
mpDashItem(),
mnTrans(0),
@@ -203,34 +186,37 @@ LinePropertyPanel::LinePropertyPanel(
mbColorAvailable(true),
mbWidthValuable(true)
{
+ get(mpFTWidth, "widthlabel");
+ get(mpTBWidth, "width");
+ get(mpFTColor, "colorlabel");
+ get(mpTBColor, "color");
+ get(mpFTStyle, "stylelabel");
+ get(mpLBStyle, "linestyle");
+ get(mpFTTrancparency, "translabel");
+ get(mpMFTransparent, "linetransparency");
+ get(mpFTArrow, "arrowlabel");
+ get(mpLBStart, "beginarrowstyle");
+ get(mpLBEnd, "endarrowstyle");
+ get(mpFTEdgeStyle, "cornerlabel");
+ get(mpLBEdgeStyle, "edgestyle");
+ get(mpFTCapStyle, "caplabel");
+ get(mpLBCapStyle, "linecapstyle");
+
+ const sal_uInt16 nIdColor = mpTBColor->GetItemId(UNO_SELECTCOLOR);
+ mpColorUpdater.reset(new ::svx::ToolboxButtonColorUpdater(SID_ATTR_LINE_COLOR, nIdColor, mpTBColor)),
Initialize();
- FreeResource();
}
LinePropertyPanel::~LinePropertyPanel()
{
- // Destroy the toolboxes, then their background windows.
- mpTBWidth.reset();
- mpTBColor.reset();
-
- mpTBWidthBackground.reset();
- mpTBColorBackground.reset();
}
void LinePropertyPanel::Initialize()
{
- mpFTWidth->SetBackground(Wallpaper());
- mpFTColor->SetBackground(Wallpaper());
- mpFTStyle->SetBackground(Wallpaper());
- mpFTTrancparency->SetBackground(Wallpaper());
- mpFTArrow->SetBackground(Wallpaper());
- mpFTEdgeStyle->SetBackground(Wallpaper());
- mpFTCapStyle->SetBackground(Wallpaper());
-
mpIMGWidthIcon.reset(new Image[8]);
mpIMGWidthIcon[0] = Image(SVX_RES(IMG_WIDTH1_ICON));
mpIMGWidthIcon[1] = Image(SVX_RES(IMG_WIDTH2_ICON));
@@ -242,14 +228,10 @@ void LinePropertyPanel::Initialize()
mpIMGWidthIcon[7] = Image(SVX_RES(IMG_WIDTH8_ICON));
meMapUnit = maWidthControl.GetCoreMetric();
+ const sal_uInt16 nIdColor = mpTBColor->GetItemId(UNO_SELECTCOLOR);
- mpTBColor->SetItemImage(TBI_COLOR, maIMGColor);
- Size aTbxSize( mpTBColor->CalcWindowSizePixel() );
- mpTBColor->SetOutputSizePixel( aTbxSize );
- mpTBColor->SetItemBits( TBI_COLOR, mpTBColor->GetItemBits( TBI_COLOR ) | TIB_DROPDOWNONLY );
- mpTBColor->SetQuickHelpText(TBI_COLOR,String(SVX_RES(STR_QH_TB_COLOR))); //Add
- mpTBColor->SetBackground(Wallpaper());
- mpTBColor->SetPaintTransparent(true);
+ mpTBColor->SetItemImage(nIdColor, maIMGColor);
+ mpTBColor->SetItemBits( nIdColor, mpTBColor->GetItemBits( nIdColor ) | TIB_DROPDOWNONLY );
Link aLink = LINK(this, LinePropertyPanel, ToolboxColorSelectHdl);
mpTBColor->SetDropdownClickHdl ( aLink );
mpTBColor->SetSelectHdl ( aLink );
@@ -261,13 +243,9 @@ void LinePropertyPanel::Initialize()
mpLBStyle->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Style")));
mpLBStyle->AdaptDropDownLineCountToMaximum();
- mpTBWidth->SetItemImage(TBI_WIDTH, mpIMGWidthIcon[0]);
- aTbxSize = mpTBWidth->CalcWindowSizePixel() ;
- mpTBWidth->SetOutputSizePixel( aTbxSize );
- mpTBWidth->SetItemBits( TBI_WIDTH, mpTBWidth->GetItemBits( TBI_WIDTH ) | TIB_DROPDOWNONLY );
- mpTBWidth->SetQuickHelpText(TBI_WIDTH,String(SVX_RES(STR_QH_TB_WIDTH))); //Add
- mpTBWidth->SetBackground(Wallpaper());
- mpTBWidth->SetPaintTransparent(true);
+ const sal_uInt16 nIdWidth = mpTBWidth->GetItemId(UNO_SELECTWIDTH);
+ mpTBWidth->SetItemImage(nIdWidth, mpIMGWidthIcon[0]);
+ mpTBWidth->SetItemBits( nIdWidth, mpTBWidth->GetItemBits( nIdWidth ) | TIB_DROPDOWNONLY );
aLink = LINK(this, LinePropertyPanel, ToolboxWidthSelectHdl);
mpTBWidth->SetDropdownClickHdl ( aLink );
mpTBWidth->SetSelectHdl ( aLink );
@@ -288,12 +266,12 @@ void LinePropertyPanel::Initialize()
mpMFTransparent->SetModifyHdl(aLink);
mpMFTransparent->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Transparency"))); //wj acc
- mpTBWidth->SetAccessibleRelationLabeledBy(mpFTWidth.get());
- mpTBColor->SetAccessibleRelationLabeledBy(mpFTColor.get());
- mpLBStyle->SetAccessibleRelationLabeledBy(mpFTStyle.get());
- mpMFTransparent->SetAccessibleRelationLabeledBy(mpFTTrancparency.get());
- mpLBStart->SetAccessibleRelationLabeledBy(mpFTArrow.get());
- mpLBEnd->SetAccessibleRelationLabeledBy(mpLBEnd.get());
+ mpTBWidth->SetAccessibleRelationLabeledBy(mpFTWidth);
+ mpTBColor->SetAccessibleRelationLabeledBy(mpFTColor);
+ mpLBStyle->SetAccessibleRelationLabeledBy(mpFTStyle);
+ mpMFTransparent->SetAccessibleRelationLabeledBy(mpFTTrancparency);
+ mpLBStart->SetAccessibleRelationLabeledBy(mpFTArrow);
+ mpLBEnd->SetAccessibleRelationLabeledBy(mpLBEnd);
aLink = LINK( this, LinePropertyPanel, ChangeEdgeStyleHdl );
mpLBEdgeStyle->SetSelectHdl( aLink );
@@ -709,8 +687,9 @@ IMPL_LINK( LinePropertyPanel, ImplPopupModeEndHdl, FloatingWindow*, EMPTYARG )
IMPL_LINK(LinePropertyPanel, ToolboxColorSelectHdl,ToolBox*, pToolBox)
{
- sal_uInt16 nId = pToolBox->GetCurItemId();
- if(nId == TBI_COLOR)
+ const OUString aCommand(pToolBox->GetItemCommand(pToolBox->GetCurItemId()));
+
+ if(aCommand == UNO_SELECTCOLOR)
{
maColorPopup.Show(*pToolBox);
maColorPopup.SetCurrentColor(maColor, mbColorAvailable);
@@ -878,7 +857,7 @@ IMPL_LINK(LinePropertyPanel, ChangeCapStyleHdl, void*, EMPTYARG)
IMPL_LINK(LinePropertyPanel, ToolboxWidthSelectHdl,ToolBox*, pToolBox)
{
- if (pToolBox->GetCurItemId() == TBI_WIDTH)
+ if (pToolBox->GetItemCommand(pToolBox->GetCurItemId()) == UNO_SELECTWIDTH)
{
maLineWidthPopup.SetWidthSelect(mnWidthCoreValue, mbWidthValuable, meMapUnit);
maLineWidthPopup.Show(*pToolBox);
@@ -943,10 +922,11 @@ void LinePropertyPanel::EndLineWidthPopupMode (void)
void LinePropertyPanel::SetWidthIcon(int n)
{
+ const sal_uInt16 nIdWidth = mpTBWidth->GetItemId(UNO_SELECTWIDTH);
if(n==0)
- mpTBWidth->SetItemImage( TBI_WIDTH, maIMGNone);
+ mpTBWidth->SetItemImage( nIdWidth, maIMGNone);
else
- mpTBWidth->SetItemImage( TBI_WIDTH, mpIMGWidthIcon[n-1]);
+ mpTBWidth->SetItemImage( nIdWidth, mpIMGWidthIcon[n-1]);
}
@@ -955,28 +935,30 @@ void LinePropertyPanel::SetWidthIcon()
{
if(!mbWidthValuable)
{
- mpTBWidth->SetItemImage( TBI_WIDTH, maIMGNone);
+ const sal_uInt16 nIdWidth = mpTBWidth->GetItemId(UNO_SELECTWIDTH);
+ mpTBWidth->SetItemImage(nIdWidth, maIMGNone);
return;
}
long nVal = LogicToLogic(mnWidthCoreValue * 10,(MapUnit)meMapUnit , MAP_POINT);
+ const sal_uInt16 nIdWidth = mpTBWidth->GetItemId(UNO_SELECTWIDTH);
if(nVal <= 6)
- mpTBWidth->SetItemImage( TBI_WIDTH, mpIMGWidthIcon[0]);
+ mpTBWidth->SetItemImage( nIdWidth, mpIMGWidthIcon[0]);
else if(nVal > 6 && nVal <= 9)
- mpTBWidth->SetItemImage( TBI_WIDTH, mpIMGWidthIcon[1]);
+ mpTBWidth->SetItemImage( nIdWidth, mpIMGWidthIcon[1]);
else if(nVal > 9 && nVal <= 12)
- mpTBWidth->SetItemImage( TBI_WIDTH, mpIMGWidthIcon[2]);
+ mpTBWidth->SetItemImage( nIdWidth, mpIMGWidthIcon[2]);
else if(nVal > 12 && nVal <= 19)
- mpTBWidth->SetItemImage( TBI_WIDTH, mpIMGWidthIcon[3]);
+ mpTBWidth->SetItemImage( nIdWidth, mpIMGWidthIcon[3]);
else if(nVal > 19 && nVal <= 26)
- mpTBWidth->SetItemImage( TBI_WIDTH, mpIMGWidthIcon[4]);
+ mpTBWidth->SetItemImage( nIdWidth, mpIMGWidthIcon[4]);
else if(nVal > 26 && nVal <= 37)
- mpTBWidth->SetItemImage( TBI_WIDTH, mpIMGWidthIcon[5]);
+ mpTBWidth->SetItemImage( nIdWidth, mpIMGWidthIcon[5]);
else if(nVal > 37 && nVal <=52)
- mpTBWidth->SetItemImage( TBI_WIDTH, mpIMGWidthIcon[6]);
+ mpTBWidth->SetItemImage( nIdWidth, mpIMGWidthIcon[6]);
else if(nVal > 52)
- mpTBWidth->SetItemImage( TBI_WIDTH, mpIMGWidthIcon[7]);
+ mpTBWidth->SetItemImage( nIdWidth, mpIMGWidthIcon[7]);
}
diff --git a/svx/source/sidebar/line/LinePropertyPanel.hrc b/svx/source/sidebar/line/LinePropertyPanel.hrc
index 13c446e..d3940c6 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.hrc
+++ b/svx/source/sidebar/line/LinePropertyPanel.hrc
@@ -21,19 +21,6 @@
#define CUSTOM_W 74
#define CUSTOM_H POPUPPANEL_MARGIN_LARGE * 2 + TEXT_HEIGHT + 12 + TEXT_CONTROL_SPACING_VERTICAL
-#define FT_COLOR 1
-#define TB_COLOR 2
-#define FT_WIDTH 3
-#define TB_WIDTH 4
-#define FT_STYLE 5
-#define LB_STYLE 6
-#define FT_ARROW 7
-#define FT_TRANSPARENT 8
-#define MF_TRANSPARENT 9
-#define LB_START 10
-#define LB_END 11
-#define TBI_COLOR 12
-#define TBI_WIDTH 13
#define TBI_STYLE 14
#define STR_QH_TB_WIDTH 15
#define STR_QH_TB_COLOR 16
diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx b/svx/source/sidebar/line/LinePropertyPanel.hxx
index b2f97bd..493bcfb 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.hxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.hxx
@@ -27,6 +27,7 @@
#include <boost/scoped_ptr.hpp>
#include <boost/scoped_array.hpp>
#include <svx/sidebar/ColorPopup.hxx>
+#include <svx/sidebar/PanelLayout.hxx>
#include <svx/xtable.hxx>
#include "LineWidthPopup.hxx"
@@ -57,7 +58,7 @@ class LineWidthControl;
class LinePropertyPanel
-: public Control,
+: public PanelLayout,
public ::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface
{
private:
@@ -89,23 +90,21 @@ public:
private:
//ui controls
- ::boost::scoped_ptr< FixedText > mpFTWidth;
- ::boost::scoped_ptr< Window > mpTBWidthBackground;
- ::boost::scoped_ptr< ToolBox > mpTBWidth;
- ::boost::scoped_ptr< FixedText > mpFTColor;
- ::boost::scoped_ptr< Window > mpTBColorBackground;
- ::boost::scoped_ptr< ToolBox > mpTBColor;
- ::boost::scoped_ptr< FixedText > mpFTStyle;
- ::boost::scoped_ptr< ListBox > mpLBStyle;
- ::boost::scoped_ptr< FixedText > mpFTTrancparency;
- ::boost::scoped_ptr< MetricField > mpMFTransparent;
- ::boost::scoped_ptr< FixedText > mpFTArrow;
- ::boost::scoped_ptr< ListBox > mpLBStart;
- ::boost::scoped_ptr< ListBox > mpLBEnd;
- ::boost::scoped_ptr< FixedText > mpFTEdgeStyle;
- ::boost::scoped_ptr< ListBox > mpLBEdgeStyle;
- ::boost::scoped_ptr< FixedText > mpFTCapStyle;
- ::boost::scoped_ptr< ListBox > mpLBCapStyle;
+ FixedText* mpFTWidth;
+ ToolBox* mpTBWidth;
+ FixedText* mpFTColor;
+ ToolBox* mpTBColor;
+ FixedText* mpFTStyle;
+ ListBox* mpLBStyle;
+ FixedText* mpFTTrancparency;
+ MetricField* mpMFTransparent;
+ FixedText* mpFTArrow;
+ ListBox* mpLBStart;
+ ListBox* mpLBEnd;
+ FixedText* mpFTEdgeStyle;
+ ListBox* mpLBEdgeStyle;
+ FixedText* mpFTCapStyle;
+ ListBox* mpLBCapStyle;
//ControllerItem
::sfx2::sidebar::ControllerItem maStyleControl;
diff --git a/svx/source/sidebar/line/LinePropertyPanel.src b/svx/source/sidebar/line/LinePropertyPanel.src
index e904958..07441d8 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.src
+++ b/svx/source/sidebar/line/LinePropertyPanel.src
@@ -36,90 +36,7 @@ Control RID_SIDEBAR_LINE_PANEL
SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT*4 + TEXT_CONTROL_SPACING_VERTICAL*4 + TOOLBOX_HEIGHT*3 + CONTROL_SPACING_VERTICAL*3 + CBOX_HEIGHT + SECTIONPAGE_MARGIN_VERTICAL_BOT );
HelpID = HID_PROPERTYPANEL_LINE_SECTION ;
- FixedText FT_WIDTH
- {
- Pos = MAP_APPFONT( SECTIONPAGE_MARGIN_HORIZONTAL , SECTIONPAGE_MARGIN_VERTICAL_TOP ) ;
- Size = MAP_APPFONT (TOOLBOX_WIDTH , TEXT_HEIGHT ) ;
- Text [ en-US ] = "~Width:" ;
- };
- ToolBox TB_WIDTH
- {
- SVLook = TRUE ;
- Pos = MAP_APPFONT (SECTIONPAGE_MARGIN_HORIZONTAL, SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL) ;
- Size = MAP_APPFONT (TOOLBOX_WIDTH ,TOOLBOX_HEIGHT ) ;
- TabStop = TRUE ;
- HelpID = HID_PPROPERTYPANEL_LINE_TBX_WIDTH ;
- Text = "Width";
- ItemList =
- {
- ToolBoxItem
- {
- Identifier = TBI_WIDTH ;
- DropDown = TRUE ;
- Text [ en-US ] = "Width" ;
- HelpID = HID_PPROPERTYPANEL_LINE_TBI_WIDTH;
- };
- };
- };
- String STR_QH_TB_WIDTH
- {
- Text [ en-US ] = "Select the width of the line.";
- };
-
- FixedText FT_COLOR
- {
- Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL + TOOLBOX_WIDTH + 3, SECTIONPAGE_MARGIN_VERTICAL_TOP ) ;
- Size = MAP_APPFONT (TOOLBOX_WIDTH , TEXT_HEIGHT ) ;
- Text [ en-US ] = "~Color:" ;
- };
- ToolBox TB_COLOR
- {
- SVLook = TRUE ;
- Pos = MAP_APPFONT (SECTIONPAGE_MARGIN_HORIZONTAL + TOOLBOX_WIDTH + 4, SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL) ;
- Size = MAP_APPFONT (TOOLBOX_WIDTH ,TOOLBOX_HEIGHT ) ;
- TabStop = TRUE ;
- HelpID = HID_PPROPERTYPANEL_LINE_TBX_COLOR;
- Text = "Color";
- ItemList =
- {
- ToolBoxItem
- {
- Identifier = TBI_COLOR ;
- DropDown = TRUE ;
- Text [ en-US ] = "Color" ;
- HelpID = HID_PPROPERTYPANEL_LINE_TBI_COLOR;
- };
- };
- };
- String STR_QH_TB_COLOR
- {
- Text [ en-US ] = "Select the color of the line.";
- };
-
- FixedText FT_STYLE
- {
- Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL , SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL + TOOLBOX_HEIGHT + CONTROL_SPACING_VERTICAL) ;
- Size = MAP_APPFONT (TOOLBOX_WIDTH , TEXT_HEIGHT ) ;
- Text [ en-US ] = "~Style:" ;
- };
- ListBox LB_STYLE
- {
- Border = TRUE ;
- HelpID = HID_PPROPERTYPANEL_LINE_TBX_STYLE;
- Pos = MAP_APPFONT (SECTIONPAGE_MARGIN_HORIZONTAL, SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT*2 + TEXT_CONTROL_SPACING_VERTICAL*2 + TOOLBOX_HEIGHT + CONTROL_SPACING_VERTICAL) ;
- Size = MAP_APPFONT (TOOLBOX_WIDTH ,LISTBOX_HEIGHT ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- DDExtraWidth = TRUE ;
- QuickHelpText [ en-US ] = "Select the style of the line.";
- };
-
- FixedText FT_TRANSPARENT
- {
- Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL + TOOLBOX_WIDTH + 3 , SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL + TOOLBOX_HEIGHT + CONTROL_SPACING_VERTICAL) ;
- Size = MAP_APPFONT (TOOLBOX_WIDTH , TEXT_HEIGHT ) ;
- Text [ en-US ] = "~Transparency:" ;
- };
+/*
MetricField MF_TRANSPARENT
{
Border = TRUE ;
@@ -137,92 +54,7 @@ Control RID_SIDEBAR_LINE_PANEL
SpinSize = 5 ;
QuickHelpText [ en-US ] = "Specify the transparency of the line.";
};
-
- FixedText FT_ARROW
- {
- Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL, SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT*2 + TEXT_CONTROL_SPACING_VERTICAL*2 + TOOLBOX_HEIGHT*2 + CONTROL_SPACING_VERTICAL*2) ;
- Size = MAP_APPFONT (TOOLBOX_WIDTH * 2 + 3 , TEXT_HEIGHT ) ;
- Text [ en-US ] = "~Arrow:" ;
- };
- ListBox LB_START
- {
- Border = TRUE ;
- HelpID = HID_PPROPERTYPANEL_LINE_LB_START;
- Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL , SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT*3 + TEXT_CONTROL_SPACING_VERTICAL*3 + TOOLBOX_HEIGHT*2 + CONTROL_SPACING_VERTICAL*2 ) ;
- Size = MAP_APPFONT ( TOOLBOX_WIDTH , LISTBOX_HEIGHT ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- DDExtraWidth = TRUE ;
- QuickHelpText [ en-US ] = "Select the style of the beginning arrowhead.";
- };
- ListBox LB_END
- {
- Border = TRUE ;
- HelpID = HID_PPROPERTYPANEL_LINE_LB_END;
- Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL + TOOLBOX_WIDTH + 3 , SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT*3 + TEXT_CONTROL_SPACING_VERTICAL*3 + TOOLBOX_HEIGHT*2 + CONTROL_SPACING_VERTICAL*2 ) ;
- Size = MAP_APPFONT ( TOOLBOX_WIDTH + 1, LISTBOX_HEIGHT ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- DDExtraWidth = TRUE ;
- QuickHelpText [ en-US ] = "Select the style of the ending arrowhead.";
- };
-
- FixedText FT_EDGESTYLE
- {
- Pos = MAP_APPFONT (
- SECTIONPAGE_MARGIN_HORIZONTAL,
- SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT*3 + TEXT_CONTROL_SPACING_VERTICAL*3 + TOOLBOX_HEIGHT*3 + CONTROL_SPACING_VERTICAL*3) ;
- Size = MAP_APPFONT (TOOLBOX_WIDTH * 2 + 3 , TEXT_HEIGHT ) ;
- Text [ en-US ] = "~Corner style" ;
- };
- ListBox LB_EDGESTYLE
- {
- HelpID = HID_PPROPERTYPANEL_LINE_LB_EDGESTYLE;
- Border = TRUE ;
- Pos = MAP_APPFONT (
- SECTIONPAGE_MARGIN_HORIZONTAL ,
- SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT*4 + TEXT_CONTROL_SPACING_VERTICAL*4 + TOOLBOX_HEIGHT*3 + CONTROL_SPACING_VERTICAL*3 ) ;
- Size = MAP_APPFONT ( TOOLBOX_WIDTH , LISTBOX_HEIGHT ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- DDExtraWidth = TRUE ;
- QuickHelpText [ en-US ] = "Select the style of the edge connections.";
- StringList [ en-US ] =
- {
- < "Rounded" ; Default ; > ;
- < "- none -" ; > ;
- < "Mitered" ; > ;
- < "Beveled" ; > ;
- };
- };
- FixedText FT_CAPSTYLE
- {
- Pos = MAP_APPFONT (
- SECTIONPAGE_MARGIN_HORIZONTAL + TOOLBOX_WIDTH + 3,
- SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT*3 + TEXT_CONTROL_SPACING_VERTICAL*3 + TOOLBOX_HEIGHT*3 + CONTROL_SPACING_VERTICAL*3) ;
- Size = MAP_APPFONT (TOOLBOX_WIDTH * 2 + 3 , TEXT_HEIGHT ) ;
- Text [ en-US ] = "Ca~p style" ;
- };
- ListBox LB_CAPSTYLE
- {
- HelpID = HID_PPROPERTYPANEL_LINE_LB_CAPSTYLE;
- Border = TRUE ;
- Pos = MAP_APPFONT (
- SECTIONPAGE_MARGIN_HORIZONTAL + TOOLBOX_WIDTH + 3,
- SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT*4 + TEXT_CONTROL_SPACING_VERTICAL*4 + TOOLBOX_HEIGHT*3 + CONTROL_SPACING_VERTICAL*3 ) ;
- Size = MAP_APPFONT ( TOOLBOX_WIDTH , LISTBOX_HEIGHT ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- DDExtraWidth = TRUE ;
- QuickHelpText [ en-US ] = "Select the style of the line caps.";
- StringList [ en-US ] =
- {
- < "Flat" ; Default ; > ; // Same string as in Excel
- < "Round" ; > ;
- < "Square" ; > ;
- };
- };
-
+*/
Image IMG_COLOR
{
ImageBitmap = Bitmap{File = "symphony/Line_color.png";};
diff --git a/svx/uiconfig/ui/sidebarline.ui b/svx/uiconfig/ui/sidebarline.ui
new file mode 100644
index 0000000..db62473
--- /dev/null
+++ b/svx/uiconfig/ui/sidebarline.ui
@@ -0,0 +1,306 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkGrid" id="LinePropertyPanel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_homogeneous">True</property>
+ <property name="column_homogeneous">True</property>
+ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="widthlabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Width:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <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>
+ <object class="GtkLabel" id="colorlabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0.25</property>
+ <property name="label" translatable="yes">_Color:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="stylelabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Style:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <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>
+ <object class="GtkLabel" id="translabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Transparency:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="arrowlabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Arrow:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <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>
+ <object class="GtkLabel" id="cornerlabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Corner style:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="caplabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0.30000001192092896</property>
+ <property name="label" translatable="yes">Ca_p style:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">6</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolbar" id="width">
+ <property name="width_request">120</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Select the width of the line.</property>
+ <child>
+ <object class="GtkMenuToolButton" id="setwidth">
+ <property name="width_request">120</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:SelectWidth</property>
+ <property name="label" translatable="yes">toolbutton1</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <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="GtkComboBoxText" id="beginarrowstyle">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Select the style of the beginning arrowhead.</property>
+ <property name="hexpand">True</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="endarrowstyle">
+ <property name="width_request">120</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Select the style of the ending arrowhead.</property>
+ <property name="margin_left">20</property>
+ <property name="hexpand">True</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="edgestyle">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Select the style of the edge connections.</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ <style>
+ <class name="Rounded"/>
+ <class name="- none -"/>
+ <class name="Mitered"/>
+ <class name="Beveled"/>
+ </style>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">7</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="linecapstyle">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Select the style of the line caps.</property>
+ <property name="margin_left">20</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ <style>
+ <class name="Flat"/>
+ <class name="Round"/>
+ <class name="Square"/>
+ </style>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">7</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="linestyle">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Select the style of the line.</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ </object>
+ <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>
+ <object class="GtkToolbar" id="color">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Select the color of the line.</property>
+ <child>
+ <object class="GtkMenuToolButton" id="setcolor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Select the color of the line.</property>
+ <property name="margin_left">20</property>
+ <property name="action_name">.uno:SelectColor</property>
+ <property name="label" translatable="yes">toolbutton1</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <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>
+ <object class="GtkSpinButton" id="linetransparency">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_text" translatable="yes">Specify the transparency of the line.</property>
+ <property name="margin_left">20</property>
+ <property name="invisible_char">•</property>
+ <property name="climb_rate">5</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <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>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list