[Libreoffice-commits] core.git: 9 commits - include/svx svx/source svx/uiconfig svx/UIConfig_svx.mk
Jan Holesovsky
kendy at suse.cz
Fri Jun 28 10:59:49 PDT 2013
include/svx/dialogs.hrc | 5
svx/UIConfig_svx.mk | 1
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 669 ++++++++------------
svx/source/sidebar/paragraph/ParaPropertyPanel.hrc | 111 ---
svx/source/sidebar/paragraph/ParaPropertyPanel.hxx | 54 -
svx/source/sidebar/paragraph/ParaPropertyPanel.src | 525 ++-------------
svx/uiconfig/ui/sidebarparagraph.ui | 700 +++++++++++++++++++++
7 files changed, 1094 insertions(+), 971 deletions(-)
New commits:
commit 71bdcdf5fdc280be028a021ecdeb2f898c5bcc24
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Jun 28 19:53:58 2013 +0200
sidebar: Use images directly in the .ui, no need to go trough .src.
Change-Id: I41cecd6b4a1ce5789638df04d27a08f158356b81
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 8b26ac9..83e2a60 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -1465,12 +1465,7 @@ ParaPropertyPanel::ParaPropertyPanel(Window* pParent,
: PanelLayout(pParent, "ParaPropertyPanel", "svx/ui/sidebarparagraph.ui", rxFrame),
mpColorUpdater (),
- maSpace1 (SVX_RES(IMG_SPACE1)),
- maSpace2 (SVX_RES(IMG_SPACE2)),
maSpace3 (SVX_RES(IMG_SPACE3)),
- maIndent1 (SVX_RES(IMG_INDENT1)),
- maIndent2 (SVX_RES(IMG_INDENT2)),
- maIndent3 (SVX_RES(IMG_INDENT3)),
maIndHang (SVX_RES(IMG_INDENT_HANG)),
maNumBImageList (SVX_RES(IL_NUM_BULLET)),
maNumBImageListRTL (SVX_RES(IL_NUM_BULLET_RTL)),
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc b/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
index 04e077b..ab03971 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
@@ -20,25 +20,20 @@
#define IMG_BACK_COLOR (RID_SVX_SIDEBAR_BEGIN + 0)
#define IMG_BACK_COLOR_H (RID_SVX_SIDEBAR_BEGIN + 1)
-#define IMG_SPACE1 (RID_SVX_SIDEBAR_BEGIN + 2)
-#define IMG_SPACE2 (RID_SVX_SIDEBAR_BEGIN + 3)
-#define IMG_SPACE3 (RID_SVX_SIDEBAR_BEGIN + 4)
-#define IMG_INDENT1 (RID_SVX_SIDEBAR_BEGIN + 5)
-#define IMG_INDENT2 (RID_SVX_SIDEBAR_BEGIN + 6)
-#define IMG_INDENT3 (RID_SVX_SIDEBAR_BEGIN + 7)
-#define IMG_INDENT_HANG (RID_SVX_SIDEBAR_BEGIN + 8)
-#define IMG_SPACING1 (RID_SVX_SIDEBAR_BEGIN + 9)
-#define IMG_SPACING115 (RID_SVX_SIDEBAR_BEGIN + 10)
-#define IMG_SPACING15 (RID_SVX_SIDEBAR_BEGIN + 11)
-#define IMG_SPACING2 (RID_SVX_SIDEBAR_BEGIN + 12)
-#define IMG_SEL_SPACING1 (RID_SVX_SIDEBAR_BEGIN + 13)
-#define IMG_SEL_SPACING115 (RID_SVX_SIDEBAR_BEGIN + 14)
-#define IMG_SEL_SPACING15 (RID_SVX_SIDEBAR_BEGIN + 15)
-#define IMG_SEL_SPACING2 (RID_SVX_SIDEBAR_BEGIN + 16)
-#define IMG_CUSTOM (RID_SVX_SIDEBAR_BEGIN + 17)
-#define IMG_CUSTOM_GRAY (RID_SVX_SIDEBAR_BEGIN + 18)
-#define IL_NUM_BULLET (RID_SVX_SIDEBAR_BEGIN + 19)
-#define IL_NUM_BULLET_RTL (RID_SVX_SIDEBAR_BEGIN + 20)
+#define IMG_SPACE3 (RID_SVX_SIDEBAR_BEGIN + 2)
+#define IMG_INDENT_HANG (RID_SVX_SIDEBAR_BEGIN + 3)
+#define IMG_SPACING1 (RID_SVX_SIDEBAR_BEGIN + 4)
+#define IMG_SPACING115 (RID_SVX_SIDEBAR_BEGIN + 5)
+#define IMG_SPACING15 (RID_SVX_SIDEBAR_BEGIN + 6)
+#define IMG_SPACING2 (RID_SVX_SIDEBAR_BEGIN + 7)
+#define IMG_SEL_SPACING1 (RID_SVX_SIDEBAR_BEGIN + 8)
+#define IMG_SEL_SPACING115 (RID_SVX_SIDEBAR_BEGIN + 9)
+#define IMG_SEL_SPACING15 (RID_SVX_SIDEBAR_BEGIN + 10)
+#define IMG_SEL_SPACING2 (RID_SVX_SIDEBAR_BEGIN + 11)
+#define IMG_CUSTOM (RID_SVX_SIDEBAR_BEGIN + 12)
+#define IMG_CUSTOM_GRAY (RID_SVX_SIDEBAR_BEGIN + 13)
+#define IL_NUM_BULLET (RID_SVX_SIDEBAR_BEGIN + 14)
+#define IL_NUM_BULLET_RTL (RID_SVX_SIDEBAR_BEGIN + 15)
//for numbering and bullet
#define IID_BULLET 1
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
index 8452ce7..0544850 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
@@ -120,13 +120,7 @@ private:
**
***********************************************************/
- Image maSpace1;
- Image maSpace2;
Image maSpace3;
- Image maIndent1;
- Image maIndent2;
- Image maIndent3;
-
Image maIndHang;
ImageList maNumBImageList;
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.src b/svx/source/sidebar/paragraph/ParaPropertyPanel.src
index 9471ab0..7dc425c 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.src
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.src
@@ -55,30 +55,10 @@ Image IMG_BACK_COLOR_H
{
ImageBitmap = Bitmap{File = "symphony/sch_backgroundcolor.bmp";};
};
-Image IMG_SPACE1
-{
- ImageBitmap = Bitmap{File = "symphony/spacing1.png";};
-};
-Image IMG_SPACE2
-{
- ImageBitmap = Bitmap{File = "symphony/spacing2.png";};
-};
Image IMG_SPACE3
{
ImageBitmap = Bitmap{File = "symphony/spacing3.png";};
};
-Image IMG_INDENT1
-{
- ImageBitmap = Bitmap{File = "symphony/Indent2.png";};
-};
-Image IMG_INDENT2
-{
- ImageBitmap = Bitmap{File = "symphony/Indent3.png";};
-};
-Image IMG_INDENT3
-{
- ImageBitmap = Bitmap{File = "symphony/Indent4.png";};
-};
Image IMG_INDENT_HANG
{
ImageBitmap = Bitmap{File = "symphony/Indent_Hanging.png";};
diff --git a/svx/uiconfig/ui/sidebarparagraph.ui b/svx/uiconfig/ui/sidebarparagraph.ui
index 05fd23c..691ee14 100644
--- a/svx/uiconfig/ui/sidebarparagraph.ui
+++ b/svx/uiconfig/ui/sidebarparagraph.ui
@@ -459,8 +459,19 @@
<object class="GtkBox" id="box6">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
- <placeholder/>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="ypad">15</property>
+ <property name="pixbuf">svx/res/symphony/spacing1.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="svxlo-SvxRelativeField" id="aboveparaspacing">
@@ -491,8 +502,18 @@
<object class="GtkBox" id="box7">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
- <placeholder/>
+ <object class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">svx/res/symphony/spacing2.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="svxlo-SvxRelativeField" id="belowparaspacing">
@@ -523,8 +544,18 @@
<object class="GtkBox" id="box8">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
- <placeholder/>
+ <object class="GtkImage" id="image3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">svx/res/symphony/Indent4.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="svxlo-SvxRelativeField" id="beforetextindent">
@@ -552,8 +583,18 @@
<object class="GtkBox" id="box9">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
- <placeholder/>
+ <object class="GtkImage" id="image4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">svx/res/symphony/Indent3.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="svxlo-SvxRelativeField" id="aftertextindent">
@@ -581,8 +622,18 @@
<object class="GtkBox" id="box10">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
- <placeholder/>
+ <object class="GtkImage" id="image5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">svx/res/symphony/Indent2.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="svxlo-SvxRelativeField" id="firstlineindent">
commit 14db6440b6b38a82f3bb6d4a386cd708d1fa0c88
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Jun 28 19:28:35 2013 +0200
sidebar: Cleanup the .ui for ParaPropertyPanel.
Change-Id: I1670ab45de7da6097e92ebdac6bc9928bacc72ba
diff --git a/svx/uiconfig/ui/sidebarparagraph.ui b/svx/uiconfig/ui/sidebarparagraph.ui
index 3193f5b..05fd23c 100644
--- a/svx/uiconfig/ui/sidebarparagraph.ui
+++ b/svx/uiconfig/ui/sidebarparagraph.ui
@@ -1,577 +1,640 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
+ <!-- interface-requires LibreOffice 1.0 -->
<object class="GtkGrid" id="ParaPropertyPanel">
<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="grid4">
<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>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <property name="column_homogeneous">True</property>
<child>
- <object class="GtkBox" id="box3">
+ <object class="GtkToolbar" id="horizontalalignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Paragraph</property>
- <property name="spacing">12</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Horizontal Alignment</property>
+ <property name="tooltip_text" translatable="yes">Horizontal Alignment</property>
+ <property name="halign">start</property>
+ <property name="show_arrow">False</property>
<child>
- <object class="GtkToolbar" id="horizontalalignment">
+ <object class="GtkToolButton" id="leftpara">
+ <property name="width_request">25</property>
+ <property name="height_request">25</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Horizontal Alignment</property>
- <property name="margin_right">31</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkToolButton" id="leftpara">
- <property name="width_request">25</property>
- <property name="height_request">25</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Align Left</property>
- <property name="valign">start</property>
- <property name="action_name">.uno:LeftPara</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="centerpara">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Align Center</property>
- <property name="action_name">.uno:CenterPara</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="rightpara">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Align Right</property>
- <property name="action_name">.uno:RightPara</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="substjustify">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Align Justified</property>
- <property name="action_name">.uno:JustifyPara</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Align Left</property>
+ <property name="tooltip_text" translatable="yes">Align Left</property>
+ <property name="valign">start</property>
+ <property name="action_name">.uno:LeftPara</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
<child>
- <object class="GtkToolbar" id="verticalalignment">
+ <object class="GtkToolButton" id="centerpara">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Vertical Alignment</property>
- <property name="margin_left">50</property>
- <property name="hexpand">True</property>
- <child>
- <object class="GtkToolButton" id="cellverttop">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Align Top</property>
- <property name="action_name">.uno:CellVertTop</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="cellvertcenter">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Align Center Vertically</property>
- <property name="action_name">.uno:CellVertCenter</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="cellvertbottom">
- <property name="width_request">25</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Align Bottom</property>
- <property name="action_name">.uno:CellVertBottom</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Align Center</property>
+ <property name="tooltip_text" translatable="yes">Align Center</property>
+ <property name="action_name">.uno:CenterPara</property>
+ <property name="use_underline">True</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="rightpara">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Align Right</property>
+ <property name="tooltip_text" translatable="yes">Align Right</property>
+ <property name="action_name">.uno:RightPara</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="substjustify">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Align Justified</property>
+ <property name="tooltip_text" translatable="yes">Align Justified</property>
+ <property name="action_name">.uno:JustifyPara</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
</packing>
</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>
<child>
- <object class="GtkBox" id="box4">
+ <object class="GtkToolbar" id="verticalalignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_top">4</property>
- <property name="spacing">9</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Vertical Alignment</property>
+ <property name="tooltip_text" translatable="yes">Vertical Alignment</property>
+ <property name="halign">end</property>
+ <property name="hexpand">True</property>
+ <property name="show_arrow">False</property>
<child>
- <object class="GtkToolbar" id="numberbullet">
+ <object class="GtkToolButton" id="cellverttop">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Bullets and Numbering</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkMenuToolButton" id="bullet">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Bullets</property>
- <property name="is_important">True</property>
- <property name="action_name">.uno:DefaultBullet</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkMenuToolButton" id="number">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Numbering</property>
- <property name="halign">start</property>
- <property name="margin_right">107</property>
- <property name="is_important">True</property>
- <property name="action_name">.uno:DefaultNumbering</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Align Top</property>
+ <property name="tooltip_text" translatable="yes">Align Top</property>
+ <property name="action_name">.uno:CellVertTop</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
<child>
- <object class="GtkToolbar" id="backgroundcolor">
+ <object class="GtkToolButton" id="cellvertcenter">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Align Center Vertically</property>
+ <property name="tooltip_text" translatable="yes">Align Center Vertically</property>
+ <property name="action_name">.uno:CellVertCenter</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="cellvertbottom">
+ <property name="width_request">25</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Align Bottom</property>
+ <property name="tooltip_text" translatable="yes">Align Bottom</property>
+ <property name="action_name">.uno:CellVertBottom</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</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="GtkToolbar" id="numberbullet">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Bullets and Numbering</property>
+ <property name="tooltip_text" translatable="yes">Bullets and Numbering</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkMenuToolButton" id="bullet">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Bullets</property>
+ <property name="tooltip_text" translatable="yes">Bullets</property>
+ <property name="is_important">True</property>
+ <property name="action_name">.uno:DefaultBullet</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkMenuToolButton" id="number">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Numbering</property>
+ <property name="tooltip_text" translatable="yes">Numbering</property>
+ <property name="is_important">True</property>
+ <property name="action_name">.uno:DefaultNumbering</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</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="GtkToolbar" id="backgroundcolor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Paragraph Background Color</property>
+ <property name="tooltip_text" translatable="yes">Paragraph Background Color</property>
+ <property name="halign">end</property>
+ <child>
+ <object class="GtkMenuToolButton" id="parabkcolor">
+ <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">Paragraph Background Color</property>
<property name="tooltip_text" translatable="yes">Paragraph Background Color</property>
- <property name="margin_left">2</property>
- <child>
- <object class="GtkMenuToolButton" id="parabkcolor">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Paragraph Background Color</property>
- <property name="halign">start</property>
- <property name="valign">start</property>
- <property name="margin_left">35</property>
- <property name="action_name">.uno:ParaBackColor</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
+ <property name="action_name">.uno:ParaBackColor</property>
+ <property name="use_underline">True</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="expand">False</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="GtkLabel" id="spacinglabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Spacing:</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="indentlabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Indent:</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="GtkToolbar" id="paraspacing">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Spacing</property>
+ <property name="tooltip_text" translatable="yes">Spacing</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="paraspaceinc">
+ <property name="width_request">25</property>
+ <property name="height_request">25</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Increase Spacing</property>
+ <property name="tooltip_text" translatable="yes">Increase Spacing</property>
+ <property name="action_name">.uno:ParaspaceIncrease</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="paraspacedec">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Decrease Spacing</property>
+ <property name="tooltip_text" translatable="yes">Decrease Spacing</property>
+ <property name="action_name">.uno:ParaspaceDecrease</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
+ <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="GtkGrid" id="grid2">
+ <object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkBox" id="labels">
+ <object class="GtkToolbar" id="indent">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Indent</property>
+ <property name="tooltip_text" translatable="yes">Indent</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="increaseindent">
+ <property name="width_request">15</property>
+ <property name="height_request">25</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Increase Indent</property>
+ <property name="tooltip_text" translatable="yes">Increase Indent</property>
+ <property name="action_name">.uno:IncrementIndent</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
<child>
- <object class="GtkLabel" id="spacinglabel">
+ <object class="GtkToolButton" id="decreaseindent">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Spacing:</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Decrease Indent</property>
+ <property name="tooltip_text" translatable="yes">Decrease Indent</property>
+ <property name="action_name">.uno:DecrementIndent</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="indentlabel">
+ <object class="GtkToolButton" id="hangingindent">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="xalign">0.50999999046325684</property>
- <property name="label" translatable="yes">_Indent:</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Switch to Hanging Indent</property>
+ <property name="tooltip_text" translatable="yes">Switch to Hanging Indent</property>
+ <property name="action_name">.uno:HangingIndent</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="homogeneous">True</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>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box5">
+ <object class="GtkToolbar" id="promotedemote">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Indent</property>
+ <property name="tooltip_text" translatable="yes">Indent</property>
+ <property name="show_arrow">False</property>
<child>
- <object class="GtkToolbar" id="paraspacing">
+ <object class="GtkToolButton" id="promote">
+ <property name="width_request">15</property>
+ <property name="height_request">25</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes">Spacing</property>
- <property name="margin_right">74</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkToolButton" id="paraspaceinc">
- <property name="width_request">25</property>
- <property name="height_request">25</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes">Increase Spacing</property>
- <property name="action_name">.uno:ParaspaceIncrease</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="paraspacedec">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes">Decrease Spacing</property>
- <property name="action_name">.uno:ParaspaceDecrease</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
+ <property name="tooltip_markup" translatable="yes">Increase Indent</property>
+ <property name="tooltip_text" translatable="yes">Increase Indent</property>
+ <property name="action_name">.uno:Promote</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
<child>
- <object class="GtkToolbar" id="indent">
+ <object class="GtkToolButton" id="demote">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Indent</property>
- <property name="margin_left">63</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkToolButton" id="increaseindent">
- <property name="width_request">15</property>
- <property name="height_request">25</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes">Increase Indent</property>
- <property name="action_name">.uno:IncrementIndent</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="decreaseindent">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes">Decrease Indent</property>
- <property name="action_name">.uno:DecrementIndent</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="hangingindent">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes">Switch to Hanging Indent</property>
- <property name="action_name">.uno:HangingIndent</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Decrease Indent</property>
+ <property name="tooltip_text" translatable="yes">Decrease Indent</property>
+ <property name="action_name">.uno:Demote</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
<child>
- <object class="GtkToolbar" id="promotedemote">
+ <object class="GtkToolButton" id="hangingindent2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Indent</property>
- <property name="margin_left">63</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkToolButton" id="promote">
- <property name="width_request">15</property>
- <property name="height_request">25</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes">Increase Indent</property>
- <property name="action_name">.uno:Promote</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="demote">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes">Decrease Indent</property>
- <property name="action_name">.uno:Demote</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="hangingindent2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes">Switch to Hanging Indent</property>
- <property name="action_name">.uno:HangingIndent2</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Switch to Hanging Indent</property>
+ <property name="tooltip_text" translatable="yes">Switch to Hanging Indent</property>
+ <property name="action_name">.uno:HangingIndent2</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</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">1</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
+ <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>
- <object class="GtkGrid" id="grid1">
+ <object class="GtkBox" id="box6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_bottom">5</property>
+ <child>
+ <placeholder/>
+ </child>
<child>
<object class="svxlo-SvxRelativeField" id="aboveparaspacing">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Above Paragraph Spacing</property>
<property name="tooltip_text" translatable="yes">Above Paragraph Spacing</property>
<property name="hexpand">True</property>
<property name="invisible_char">•</property>
+ <property name="invisible_char_set">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>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
+ </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="GtkBox" id="box7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
<child>
<object class="svxlo-SvxRelativeField" id="belowparaspacing">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Below Paragraph Spacing</property>
<property name="tooltip_text" translatable="yes">Below Paragraph Spacing</property>
<property name="hexpand">True</property>
<property name="invisible_char">•</property>
+ <property name="invisible_char_set">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>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
+ </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="GtkBox" id="box8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
<child>
<object class="svxlo-SvxRelativeField" id="beforetextindent">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="margin_left">75</property>
<property name="hexpand">True</property>
<property name="invisible_char">•</property>
+ <property name="invisible_char_set">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>
+ <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">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
<child>
<object class="svxlo-SvxRelativeField" id="aftertextindent">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="margin_left">75</property>
<property name="hexpand">True</property>
<property name="invisible_char">•</property>
+ <property name="invisible_char_set">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>
+ <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">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
<child>
<object class="svxlo-SvxRelativeField" id="firstlineindent">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="margin_left">75</property>
<property name="hexpand">True</property>
<property name="invisible_char">•</property>
+ <property name="invisible_char_set">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>
+ <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">6</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolbar" id="linespacing">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Line Spacing</property>
+ <property name="tooltip_text" translatable="yes">Line Spacing</property>
+ <property name="hexpand">True</property>
<child>
- <object class="GtkToolbar" id="linespacing">
+ <object class="GtkMenuToolButton" id="setlinespacing">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Line Spacing</property>
<property name="tooltip_text" translatable="yes">Line Spacing</property>
- <property name="hexpand">True</property>
- <child>
- <object class="GtkMenuToolButton" id="setlinespacing">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Line Spacing</property>
- <property name="action_name">.uno:LineSpacing</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
+ <property name="action_name">.uno:LineSpacing</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>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">4</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
commit 92ccd37b2de347675d9267df65f9b5fd5eab0812
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Jun 28 18:44:43 2013 +0200
sidebar: More cleanup.
Change-Id: Ibd7c08e6dba70f802aeb8027e1ce5b522ca50edd
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc b/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
index 9cab02b..04e077b 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
@@ -18,29 +18,6 @@
#include "svx/dialogs.hrc"
-#define BT_TBX_INDENT_INC 1
-#define BT_TBX_INDENT_DEC 2
-#define BT_TBX_INDENT_PROMOTE 1
-#define BT_TBX_INDENT_DEMOTE 2
-#define ID_HANGING_INDENT 3
-#define SD_HANGING_INDENT 3
-#define MF_BEFORE_INDENT 2
-#define MF_AFTER_INDENT 4
-#define MF_FL_INDENT 6
-#define TBX_INDENT_INC_DEC 17
-
-#define MF_ABOVE_PARASPACING 32
-#define MF_BELOW_PARASPACING 34
-#define TBX_INDENT_PRO_DEMOTE 35
-
-#define FT_BACK_COLOR 47
-
-#define TBI_HOR_ALIGN_LEFT 65
-#define TBI_HOR_ALIGN_CENTER 66
-#define TBI_HOR_ALIGN_RIGHT 67
-#define TBI_HOR_ALIGN_JUSTIFY 68
-
-//============================== Global Definitions ==============================
#define IMG_BACK_COLOR (RID_SVX_SIDEBAR_BEGIN + 0)
#define IMG_BACK_COLOR_H (RID_SVX_SIDEBAR_BEGIN + 1)
#define IMG_SPACE1 (RID_SVX_SIDEBAR_BEGIN + 2)
commit 87e479a41da86f53efe6b89db65d188956f5d5d0
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Jun 28 18:42:29 2013 +0200
sidebar: Fix commands in ParaPropertyPanel to make the buttons work.
Change-Id: Ifdc07bcdb21493e471c05afa65c29239e4ae3732
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 0c16ba0..8b26ac9 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -64,8 +64,8 @@ const char UNO_INCREMENTINDENT[] = ".uno:IncrementIndent";
const char UNO_DECREMENTINDENT[] = ".uno:DecrementIndent";
const char UNO_HANGINGINDENT[] = ".uno:HangingIndent";
-const char UNO_PROMOTE[] = ".uno:IncrementIndent2";
-const char UNO_DEMOTE[] = ".uno:DecrementIndent2";
+const char UNO_PROMOTE[] = ".uno:Promote";
+const char UNO_DEMOTE[] = ".uno:Demote";
const char UNO_HANGINGINDENT2[] = ".uno:HangingIndent2";
const char UNO_LINESPACING[] = ".uno:LineSpacing";
@@ -82,8 +82,6 @@ namespace svx {namespace sidebar {
#define MAX_DURCH 5670
-#define INDENT_INCREMENT 1
-#define INDENT_DECREMENT 2
#define INDENT_STEP 706
#define UL_STEP 58
@@ -396,15 +394,16 @@ void ParaPropertyPanel::InitToolBoxSpacing()
mpTbxUL_IncDec->SetSelectHdl(aLink);
m_eULSpaceUnit = maULSpaceControl.GetCoreMetric();
}
+
void ParaPropertyPanel::InitToolBoxLineSpacing()
{
Link aLink = LINK( this, ParaPropertyPanel, ClickLineSPDropDownHdl_Impl );
mpLineSPTbx->SetDropdownClickHdl( aLink );
mpLineSPTbx->SetSelectHdl( aLink ); //support keyinput "ENTER"
- const sal_uInt16 nIdLeft = mpAlignToolBox->GetItemId(UNO_LEFTPARA);
- mpLineSPTbx->SetItemBits( nIdLeft, mpLineSPTbx->GetItemBits( nIdLeft ) | TIB_DROPDOWNONLY );
- mpLineSPTbx->SetItemImage(nIdLeft, maSpace3);
+ const sal_uInt16 nIdSpacing = mpLineSPTbx->GetItemId(UNO_LINESPACING);
+ mpLineSPTbx->SetItemBits( nIdSpacing, mpLineSPTbx->GetItemBits( nIdSpacing ) | TIB_DROPDOWNONLY );
+ mpLineSPTbx->SetItemImage(nIdSpacing, maSpace3);
}
void ParaPropertyPanel::initial()
@@ -483,8 +482,7 @@ IMPL_LINK(ParaPropertyPanel, NumBTbxDDHandler, ToolBox*, pToolBox)
IMPL_LINK(ParaPropertyPanel, NumBTbxSelectHandler, ToolBox*, pToolBox)
{
- const sal_uInt16 nId = pToolBox->GetCurItemId();
- const OUString aCommand(pToolBox->GetItemCommand(nId));
+ const OUString aCommand(pToolBox->GetItemCommand(pToolBox->GetCurItemId()));
sal_uInt16 nSID = SID_TABLE_VERT_NONE;
EndTracking();
@@ -509,7 +507,7 @@ IMPL_LINK(ParaPropertyPanel, NumBTbxSelectHandler, ToolBox*, pToolBox)
IMPL_LINK(ParaPropertyPanel, VertTbxSelectHandler, ToolBox*, pToolBox)
{
- const sal_uInt16 nId = pToolBox->GetCurItemId();
+ const OUString aCommand(pToolBox->GetItemCommand(pToolBox->GetCurItemId()));
sal_uInt16 nSID = SID_TABLE_VERT_NONE;
EndTracking();
@@ -517,21 +515,21 @@ IMPL_LINK(ParaPropertyPanel, VertTbxSelectHandler, ToolBox*, pToolBox)
const sal_uInt16 nIdVertCenter = mpTBxVertAlign->GetItemId(UNO_CELLVERTCENTER);
const sal_uInt16 nIdVertBottom = mpTBxVertAlign->GetItemId(UNO_CELLVERTBOTTOM);
- if (nId == nIdVertTop)
+ if (aCommand == UNO_CELLVERTTOP)
{
nSID = SID_TABLE_VERT_NONE;
mpTBxVertAlign->SetItemState(nIdVertTop, STATE_CHECK);
mpTBxVertAlign->SetItemState(nIdVertCenter, STATE_NOCHECK);
mpTBxVertAlign->SetItemState(nIdVertBottom, STATE_NOCHECK);
}
- else if (nId == nIdVertCenter)
+ else if (aCommand == UNO_CELLVERTCENTER)
{
nSID = SID_TABLE_VERT_CENTER;
mpTBxVertAlign->SetItemState(nIdVertTop, STATE_NOCHECK);
mpTBxVertAlign->SetItemState(nIdVertCenter, STATE_CHECK);
mpTBxVertAlign->SetItemState(nIdVertBottom, STATE_NOCHECK);
}
- else if (nId == nIdVertBottom)
+ else if (aCommand == UNO_CELLVERTBOTTOM)
{
nSID = SID_TABLE_VERT_BOTTOM;
mpTBxVertAlign->SetItemState(nIdVertTop, STATE_NOCHECK);
@@ -618,10 +616,10 @@ void ParaPropertyPanel::VertStateChanged(sal_uInt16 nSID, SfxItemState eState, c
IMPL_LINK(ParaPropertyPanel, ToolBoxBackColorDDHandler,ToolBox*, pToolBox)
{
- const sal_uInt16 nIdBackColor = mpTBxBackColor->GetItemId(UNO_PARABACKCOLOR);
- sal_uInt16 nId = pToolBox->GetCurItemId();
- OSL_ASSERT(nId == nIdBackColor);
- if(nId == nIdBackColor)
+ const sal_uInt16 nId = pToolBox->GetCurItemId();
+ const OUString aCommand(pToolBox->GetItemCommand(nId));
+
+ if(aCommand == UNO_PARABACKCOLOR)
{
pToolBox->SetItemDown( nId, true );
maBGColorPopup.Show(*pToolBox);
@@ -674,12 +672,13 @@ void ParaPropertyPanel::SetBGColor (
//==================================for Paragraph Alignment=====================
IMPL_LINK( ParaPropertyPanel, AlignStyleModifyHdl_Impl, ToolBox*, pBox )
{
- const sal_uInt16 nIdLeft = mpAlignToolBox->GetItemId(UNO_LEFTPARA);
- const sal_uInt16 nIdRight = mpAlignToolBox->GetItemId(UNO_RIGHTPARA);
- const sal_uInt16 nIdCenter = mpAlignToolBox->GetItemId(UNO_CENTERPARA);
- const sal_uInt16 nIdJustify = mpAlignToolBox->GetItemId(UNO_JUSTIFYPARA);
+ const sal_uInt16 nIdLeft = pBox->GetItemId(UNO_LEFTPARA);
+ const sal_uInt16 nIdRight = pBox->GetItemId(UNO_RIGHTPARA);
+ const sal_uInt16 nIdCenter = pBox->GetItemId(UNO_CENTERPARA);
+ const sal_uInt16 nIdJustify = pBox->GetItemId(UNO_JUSTIFYPARA);
const OUString aCommand(pBox->GetItemCommand(pBox->GetCurItemId()));
+
if( aCommand == UNO_LEFTPARA )
{
pBox->SetItemState(nIdLeft, STATE_CHECK);
@@ -734,9 +733,9 @@ IMPL_LINK_NOARG( ParaPropertyPanel, ModifyIndentHdl_Impl)
IMPL_LINK(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pControl)
{
- switch (pControl->GetCurItemId())
- {
- case INDENT_INCREMENT:
+ const OUString aCommand(pControl->GetItemCommand(pControl->GetCurItemId()));
+
+ if (aCommand == UNO_INCREMENTINDENT)
{
switch (maContext.GetCombinedContext_DI())
{
@@ -765,8 +764,7 @@ IMPL_LINK(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pControl)
}
}
}
- break;
- case INDENT_DECREMENT:
+ else if (aCommand == UNO_DECREMENTINDENT)
{
switch (maContext.GetCombinedContext_DI())
{
@@ -800,8 +798,7 @@ IMPL_LINK(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pControl)
}
}
}
- break;
- case ID_HANGING_INDENT:
+ else if (aCommand == UNO_HANGINGINDENT)
{
SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE );
aMargin.SetTxtLeft( (const long)GetCoreValue( *mpLeftIndent, m_eLRSpaceUnit ) + (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
@@ -811,26 +808,23 @@ IMPL_LINK(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pControl)
GetBindings()->GetDispatcher()->Execute(
SID_ATTR_PARA_LRSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L);
}
- break;
- }
+
return( 0L );
}
IMPL_LINK(ParaPropertyPanel, ClickProDemote_Hdl_Impl, ToolBox *, pControl)
{
- switch (pControl->GetCurItemId())
- {
- case BT_TBX_INDENT_PROMOTE:
+ const OUString aCommand(pControl->GetItemCommand(pControl->GetCurItemId()));
+
+ if (aCommand == UNO_PROMOTE)
{
GetBindings()->GetDispatcher()->Execute( SID_OUTLINE_RIGHT, SFX_CALLMODE_RECORD );
}
- break;
- case BT_TBX_INDENT_DEMOTE:
+ else if (aCommand == UNO_DEMOTE)
{
GetBindings()->GetDispatcher()->Execute( SID_OUTLINE_LEFT, SFX_CALLMODE_RECORD );
}
- break;
- case SD_HANGING_INDENT:
+ else if (aCommand == UNO_HANGINGINDENT2)
{
SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE );
aMargin.SetTxtLeft( (const long)GetCoreValue( *mpLeftIndent, m_eLRSpaceUnit ) + (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
@@ -839,19 +833,17 @@ IMPL_LINK(ParaPropertyPanel, ClickProDemote_Hdl_Impl, ToolBox *, pControl)
GetBindings()->GetDispatcher()->Execute( SID_ATTR_PARA_LRSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L);
}
- break;
- }
+
return( 0L );
}
//==================================for Paragraph Line Spacing=====================
IMPL_LINK( ParaPropertyPanel, ClickLineSPDropDownHdl_Impl, ToolBox*, pBox )
{
- const sal_uInt16 nIdLeft = mpAlignToolBox->GetItemId(UNO_LEFTPARA);
const sal_uInt16 nId = pBox->GetCurItemId();
+ const OUString aCommand(pBox->GetItemCommand(nId));
- OSL_ASSERT(nId == nIdLeft);
- if(nId == nIdLeft)
+ if (aCommand == UNO_LINESPACING)
{
pBox->SetItemDown( nId, true );
maLineSpacePopup.Rearrange(meLnSpState,m_eMetricUnit,mpLnSPItem,maContext);
@@ -1311,15 +1303,18 @@ void ParaPropertyPanel::StateChangeOutLineImpl( sal_uInt16 nSID, SfxItemState eS
else
mbOutLineRight = 0;
}
+
+ const sal_uInt16 nIdDemote = mpTbxProDemote->GetItemId(UNO_DEMOTE);
if(mbOutLineLeft)
- mpTbxProDemote->EnableItem(BT_TBX_INDENT_DEMOTE, sal_True);
+ mpTbxProDemote->EnableItem(nIdDemote, sal_True);
else
- mpTbxProDemote->EnableItem(BT_TBX_INDENT_DEMOTE, sal_False);
+ mpTbxProDemote->EnableItem(nIdDemote, sal_False);
+ const sal_uInt16 nIdPromote = mpTbxProDemote->GetItemId(UNO_PROMOTE);
if(mbOutLineRight)
- mpTbxProDemote->EnableItem(BT_TBX_INDENT_PROMOTE, sal_True);
+ mpTbxProDemote->EnableItem(nIdPromote, sal_True);
else
- mpTbxProDemote->EnableItem(BT_TBX_INDENT_PROMOTE, sal_False);
+ mpTbxProDemote->EnableItem(nIdPromote, sal_False);
}
commit bdb5d369ccc1c9848624f305fe2d84d2d1be19de
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Jun 28 18:02:31 2013 +0200
sidebar: Show images on the increase / decrease buttons again.
Change-Id: Ib1afe892ebb23422cb5ce405ccbaed7e211ef5de
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 533f34f..0c16ba0 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -387,10 +387,10 @@ void ParaPropertyPanel::InitToolBoxSpacing()
const sal_uInt16 nIdParaSpaceDec = mpTbxUL_IncDec->GetItemId(UNO_PARASPACEDEC);
mpTbxUL_IncDec->SetItemImage(
nIdParaSpaceInc,
- sfx2::sidebar::Tools::GetImage(mpTbxUL_IncDec->GetItemCommand(nIdParaSpaceInc), mxFrame));
+ sfx2::sidebar::Tools::GetImage("private:graphicrepository/cmd/sc_paraspaceincrease.png" /* i#122446 */, mxFrame));
mpTbxUL_IncDec->SetItemImage(
nIdParaSpaceDec,
- sfx2::sidebar::Tools::GetImage(mpTbxUL_IncDec->GetItemCommand(nIdParaSpaceDec), mxFrame));
+ sfx2::sidebar::Tools::GetImage("private:graphicrepository/cmd/sc_paraspacedecrease.png" /* i#122446 */, mxFrame));
aLink = LINK( this, ParaPropertyPanel, ClickUL_IncDec_Hdl_Impl );
mpTbxUL_IncDec->SetSelectHdl(aLink);
diff --git a/svx/uiconfig/ui/sidebarparagraph.ui b/svx/uiconfig/ui/sidebarparagraph.ui
index 82b0d0e..3193f5b 100644
--- a/svx/uiconfig/ui/sidebarparagraph.ui
+++ b/svx/uiconfig/ui/sidebarparagraph.ui
@@ -314,7 +314,7 @@
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Decrease Spacing</property>
- <property name="action_name">.uno:ParaSpaceDecrease</property>
+ <property name="action_name">.uno:ParaspaceDecrease</property>
<property name="use_underline">True</property>
</object>
<packing>
commit e024336ec4c0c2667de68fce9d9b6fffd3496e7b
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Jun 28 17:52:09 2013 +0200
sidebar: Fix the bullets & numbering in ParaPropertyPanel.
Change-Id: Iab60c34dc7f8ce8cb65f709a65e2f1914f06c48a
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 07e3cf4..533f34f 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -461,17 +461,18 @@ void ParaPropertyPanel::InitImageList(::boost::scoped_ptr<ToolBox>& rTbx, ImageL
IMPL_LINK(ParaPropertyPanel, NumBTbxDDHandler, ToolBox*, pToolBox)
{
- sal_uInt16 nId = pToolBox->GetCurItemId();
+ const sal_uInt16 nId = pToolBox->GetCurItemId();
+ const OUString aCommand(pToolBox->GetItemCommand(nId));
EndTracking();
pToolBox->SetItemDown( nId, sal_True );
- if (nId == 1)
+ if (aCommand == UNO_DEFAULTBULLET)
{
maBulletsPopup.UpdateValueSet();
maBulletsPopup.Show(*pToolBox);
}
- else if (nId == 2)
+ else if (aCommand == UNO_DEFAULTNUMBERING)
{
maNumberingPopup.UpdateValueSet();
maNumberingPopup.Show(*pToolBox);
@@ -482,15 +483,16 @@ IMPL_LINK(ParaPropertyPanel, NumBTbxDDHandler, ToolBox*, pToolBox)
IMPL_LINK(ParaPropertyPanel, NumBTbxSelectHandler, ToolBox*, pToolBox)
{
- sal_uInt16 nId = pToolBox->GetCurItemId();
+ const sal_uInt16 nId = pToolBox->GetCurItemId();
+ const OUString aCommand(pToolBox->GetItemCommand(nId));
sal_uInt16 nSID = SID_TABLE_VERT_NONE;
EndTracking();
- if (nId == 1)
+ if (aCommand == UNO_DEFAULTBULLET)
{
nSID = FN_NUM_BULLET_ON;
}
- else if ( nId == 2)
+ else if (aCommand == UNO_DEFAULTNUMBERING)
{
nSID = FN_NUM_NUMBERING_ON;
}
@@ -507,7 +509,7 @@ IMPL_LINK(ParaPropertyPanel, NumBTbxSelectHandler, ToolBox*, pToolBox)
IMPL_LINK(ParaPropertyPanel, VertTbxSelectHandler, ToolBox*, pToolBox)
{
- sal_uInt16 nId = pToolBox->GetCurItemId();
+ const sal_uInt16 nId = pToolBox->GetCurItemId();
sal_uInt16 nSID = SID_TABLE_VERT_NONE;
EndTracking();
@@ -515,21 +517,21 @@ IMPL_LINK(ParaPropertyPanel, VertTbxSelectHandler, ToolBox*, pToolBox)
const sal_uInt16 nIdVertCenter = mpTBxVertAlign->GetItemId(UNO_CELLVERTCENTER);
const sal_uInt16 nIdVertBottom = mpTBxVertAlign->GetItemId(UNO_CELLVERTBOTTOM);
- if (nId == 1)
+ if (nId == nIdVertTop)
{
nSID = SID_TABLE_VERT_NONE;
mpTBxVertAlign->SetItemState(nIdVertTop, STATE_CHECK);
mpTBxVertAlign->SetItemState(nIdVertCenter, STATE_NOCHECK);
mpTBxVertAlign->SetItemState(nIdVertBottom, STATE_NOCHECK);
}
- else if (nId == 2)
+ else if (nId == nIdVertCenter)
{
nSID = SID_TABLE_VERT_CENTER;
mpTBxVertAlign->SetItemState(nIdVertTop, STATE_NOCHECK);
mpTBxVertAlign->SetItemState(nIdVertCenter, STATE_CHECK);
mpTBxVertAlign->SetItemState(nIdVertBottom, STATE_NOCHECK);
}
- else if (nId == 3)
+ else if (nId == nIdVertBottom)
{
nSID = SID_TABLE_VERT_BOTTOM;
mpTBxVertAlign->SetItemState(nIdVertTop, STATE_NOCHECK);
commit 0521f0ea71864969ab59e3ac3dfe4aa286b3ef80
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Jun 28 17:33:51 2013 +0200
sidebar: Re-introduce the promote/demote toolbar in ParaPropertyPanel.
For the moment it is easier to do it as it was done before, and cleanup later.
Change-Id: I122870ffb51a7ee61825a3ac9e83e9e0a3335c4f
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 1d11ebb..07e3cf4 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -64,8 +64,8 @@ const char UNO_INCREMENTINDENT[] = ".uno:IncrementIndent";
const char UNO_DECREMENTINDENT[] = ".uno:DecrementIndent";
const char UNO_HANGINGINDENT[] = ".uno:HangingIndent";
-const char UNO_INCREMENTINDENT2[] = ".uno:IncrementIndent2";
-const char UNO_DECREMENTINDENT2[] = ".uno:DecrementIndent2";
+const char UNO_PROMOTE[] = ".uno:IncrementIndent2";
+const char UNO_DEMOTE[] = ".uno:DecrementIndent2";
const char UNO_HANGINGINDENT2[] = ".uno:HangingIndent2";
const char UNO_LINESPACING[] = ".uno:LineSpacing";
@@ -304,37 +304,40 @@ void ParaPropertyPanel::InitToolBoxIndent()
mpRightIndent->SetAccessibleName(mpRightIndent->GetQuickHelpText());
mpFLineIndent->SetAccessibleName(mpFLineIndent->GetQuickHelpText());
- const sal_uInt16 nIdLeft = mpAlignToolBox->GetItemId(UNO_LEFTPARA);
- const sal_uInt16 nIdCenter = mpAlignToolBox->GetItemId(UNO_CENTERPARA);
- const sal_uInt16 nIdRight = mpAlignToolBox->GetItemId(UNO_RIGHTPARA);
+ const sal_uInt16 nIdIncrement = mpTbxIndent_IncDec->GetItemId(UNO_INCREMENTINDENT);
+ const sal_uInt16 nIdDecrement = mpTbxIndent_IncDec->GetItemId(UNO_DECREMENTINDENT);
+ const sal_uInt16 nIdHanging = mpTbxIndent_IncDec->GetItemId(UNO_HANGINGINDENT);
if( Application::GetSettings().GetLayoutRTL())
{
- mpTbxIndent_IncDec->SetItemImage(nIdLeft, maIncIndentControl.GetIcon());
- mpTbxIndent_IncDec->SetItemImage(nIdCenter, maDecIndentControl.GetIcon());
+ mpTbxIndent_IncDec->SetItemImage(nIdIncrement, maIncIndentControl.GetIcon());
+ mpTbxIndent_IncDec->SetItemImage(nIdDecrement, maDecIndentControl.GetIcon());
}
else
{
- mpTbxIndent_IncDec->SetItemImage(nIdLeft, maIncIndentControl.GetIcon());
- mpTbxIndent_IncDec->SetItemImage(nIdCenter, maDecIndentControl.GetIcon());
+ mpTbxIndent_IncDec->SetItemImage(nIdIncrement, maIncIndentControl.GetIcon());
+ mpTbxIndent_IncDec->SetItemImage(nIdDecrement, maDecIndentControl.GetIcon());
}
- mpTbxIndent_IncDec->SetItemImage(nIdRight, maIndHang);
+ mpTbxIndent_IncDec->SetItemImage(nIdHanging, maIndHang);
aLink = LINK( this, ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl );
mpTbxIndent_IncDec->SetSelectHdl(aLink);
m_eLRSpaceUnit = maLRSpaceControl.GetCoreMetric();
+ const sal_uInt16 nIdPromote = mpTbxProDemote->GetItemId(UNO_PROMOTE);
+ const sal_uInt16 nIdDemote = mpTbxProDemote->GetItemId(UNO_DEMOTE);
+ const sal_uInt16 nIdHanging2 = mpTbxProDemote->GetItemId(UNO_HANGINGINDENT2);
if( Application::GetSettings().GetLayoutRTL())
{
- mpTbxProDemote->SetItemImage(nIdLeft, maOutLineLeftControl.GetIcon());
- mpTbxProDemote->SetItemImage(nIdCenter, maOutLineRightControl.GetIcon());
+ mpTbxProDemote->SetItemImage(nIdPromote, maOutLineLeftControl.GetIcon());
+ mpTbxProDemote->SetItemImage(nIdDemote, maOutLineRightControl.GetIcon());
}
else
{
- mpTbxProDemote->SetItemImage(nIdLeft, maOutLineLeftControl.GetIcon());
- mpTbxProDemote->SetItemImage(nIdCenter, maOutLineRightControl.GetIcon());
+ mpTbxProDemote->SetItemImage(nIdPromote, maOutLineLeftControl.GetIcon());
+ mpTbxProDemote->SetItemImage(nIdDemote, maOutLineRightControl.GetIcon());
}
- mpTbxProDemote->SetItemImage(nIdRight, maIndHang);
+ mpTbxProDemote->SetItemImage(nIdHanging2, maIndHang);
aLink = LINK( this, ParaPropertyPanel, ClickProDemote_Hdl_Impl );
mpTbxProDemote->SetSelectHdl(aLink);
m_eLRSpaceUnit = maLRSpaceControl.GetCoreMetric();
@@ -1530,6 +1533,7 @@ ParaPropertyPanel::ParaPropertyPanel(Window* pParent,
get(mpTopDist, "aboveparaspacing");
get(mpBottomDist, "belowparaspacing");
get(mpTbxIndent_IncDec, "indent");
+ get(mpTbxProDemote, "promotedemote");
get(mpLineSPTbx, "linespacing");
get(mpTbxUL_IncDec, "paraspacing");
get(mpLeftIndent, "beforetextindent");
diff --git a/svx/uiconfig/ui/sidebarparagraph.ui b/svx/uiconfig/ui/sidebarparagraph.ui
index b5b4a8f..82b0d0e 100644
--- a/svx/uiconfig/ui/sidebarparagraph.ui
+++ b/svx/uiconfig/ui/sidebarparagraph.ui
@@ -101,7 +101,6 @@
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Align Top</property>
<property name="action_name">.uno:CellVertTop</property>
- <property name="label" translatable="yes">toolbutton1</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -115,7 +114,6 @@
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Align Center Vertically</property>
<property name="action_name">.uno:CellVertCenter</property>
- <property name="label" translatable="yes">toolbutton2</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -130,7 +128,6 @@
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Align Bottom</property>
<property name="action_name">.uno:CellVertBottom</property>
- <property name="label" translatable="yes">toolbutton3</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -216,7 +213,6 @@
<property name="valign">start</property>
<property name="margin_left">35</property>
<property name="action_name">.uno:ParaBackColor</property>
- <property name="label" translatable="yes">toolbutton1</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -305,7 +301,6 @@
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Increase Spacing</property>
<property name="action_name">.uno:ParaspaceIncrease</property>
- <property name="label" translatable="yes">toolbutton1</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -320,7 +315,6 @@
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Decrease Spacing</property>
<property name="action_name">.uno:ParaSpaceDecrease</property>
- <property name="label" translatable="yes">toolbutton1</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -343,7 +337,7 @@
<property name="margin_left">63</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="increaseindent1">
+ <object class="GtkToolButton" id="increaseindent">
<property name="width_request">15</property>
<property name="height_request">25</property>
<property name="visible">True</property>
@@ -351,7 +345,6 @@
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Increase Indent</property>
<property name="action_name">.uno:IncrementIndent</property>
- <property name="label" translatable="yes">toolbutton1</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -360,13 +353,12 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="decreaseindent1">
+ <object class="GtkToolButton" id="decreaseindent">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Decrease Indent</property>
<property name="action_name">.uno:DecrementIndent</property>
- <property name="label" translatable="yes">toolbutton1</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -375,13 +367,56 @@
</packing>
</child>
<child>
- <object class="GtkToolButton" id="hangingindent1">
+ <object class="GtkToolButton" id="hangingindent">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Switch to Hanging Indent</property>
<property name="action_name">.uno:HangingIndent</property>
- <property name="label" translatable="yes">toolbutton1</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolbar" id="promotedemote">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Indent</property>
+ <property name="margin_left">63</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="promote">
+ <property name="width_request">15</property>
+ <property name="height_request">25</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Increase Indent</property>
+ <property name="action_name">.uno:Promote</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="demote">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Decrease Indent</property>
+ <property name="action_name">.uno:Demote</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -393,9 +428,9 @@
<object class="GtkToolButton" id="hangingindent2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Switch to Hanging Indent</property>
<property name="action_name">.uno:HangingIndent2</property>
- <property name="label" translatable="yes">toolbutton3</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -517,7 +552,6 @@
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Line Spacing</property>
<property name="action_name">.uno:LineSpacing</property>
- <property name="label" translatable="yes">toolbutton1</property>
<property name="use_underline">True</property>
</object>
<packing>
commit 5cd490ea6aec9006c769ba33fe9084c726a61342
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Jun 28 17:01:41 2013 +0200
sidebar: Fix resource id's for ParaPropertyPanel.
Change-Id: I88879e4985f0864e874619107754b224d8fd2d2e
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 0f8d02c..1172df7 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -1008,7 +1008,7 @@
#define RID_SVX_SIDEBAR_BEGIN (RID_SVX_START + 1240)
// !!! IMPORTANT: consider and update RID_SVXSTR_NEXTFREE when introducing new RIDs for Strings !!!
-#define RID_SVXSTR_NEXTFREE (RID_SVX_START + 1260)
+#define RID_SVXSTR_NEXTFREE (RID_SVX_START + 1270)
// ----------------------------------------------------------------------------
// if we have _a_lot_ time, we should group the resource ids by type, instead
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc b/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
index 32464a7..9cab02b 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
@@ -32,10 +32,8 @@
#define MF_ABOVE_PARASPACING 32
#define MF_BELOW_PARASPACING 34
#define TBX_INDENT_PRO_DEMOTE 35
-#define IL_NUM_BULLET 45
#define FT_BACK_COLOR 47
-#define IL_NUM_BULLET_RTL 52 //sym2_7380
#define TBI_HOR_ALIGN_LEFT 65
#define TBI_HOR_ALIGN_CENTER 66
@@ -62,6 +60,8 @@
#define IMG_SEL_SPACING2 (RID_SVX_SIDEBAR_BEGIN + 16)
#define IMG_CUSTOM (RID_SVX_SIDEBAR_BEGIN + 17)
#define IMG_CUSTOM_GRAY (RID_SVX_SIDEBAR_BEGIN + 18)
+#define IL_NUM_BULLET (RID_SVX_SIDEBAR_BEGIN + 19)
+#define IL_NUM_BULLET_RTL (RID_SVX_SIDEBAR_BEGIN + 20)
//for numbering and bullet
#define IID_BULLET 1
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.src b/svx/source/sidebar/paragraph/ParaPropertyPanel.src
index 601ac7c..9471ab0 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.src
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.src
@@ -83,175 +83,17 @@ Image IMG_INDENT_HANG
{
ImageBitmap = Bitmap{File = "symphony/Indent_Hanging.png";};
};
-
-Control RID_SIDEBAR_PARA_PANEL
+ImageList IL_NUM_BULLET
{
- OutputSize = TRUE;
- DialogControl = TRUE;
- Border = FALSE;
- Size = MAP_APPFONT( PROPERTYPAGE_WIDTH, PARA_SECTIONPAGE_HEIGHT );
- HelpID = HID_PROPERTYPANEL_PARA_SECTION ;
- Text = "Paragraph";
-
- MetricField MF_ABOVE_PARASPACING
- {
- HelpID = HID_POPUP_PS_ED_SBINDE_TOPDIST ;
- Border = TRUE;
- Pos = MAP_APPFONT ( MBX_TOP_DIST_X, MBX_TOP_DIST_Y );
- Size = MAP_APPFONT ( CONTROL_WIDTH -10 ,MBOX_HEIGHT ) ;
- QuickHelpText [ en-US ] = "Above Paragraph Spacing";
- TabStop = TRUE;
- Repeat = TRUE;
- Spin = TRUE;
- Maximum = 999;
- Unit = FUNIT_INCH;
- Last = 999;
- SpinSize = 1;
-
- };
- MetricField MF_BELOW_PARASPACING
- {
- Border = TRUE;
- Pos = MAP_APPFONT ( MBX_BOT_DIST_X, MBX_BOT_DIST_Y );
- Size = MAP_APPFONT ( CONTROL_WIDTH -10,MBOX_HEIGHT ) ;
- QuickHelpText [ en-US ] = "Below Paragraph Spacing";
- HelpID = HID_POPUP_PS_ED_SBINDE_BOTTOMDIST ;
- Repeat = TRUE;
- Spin = TRUE;
- Maximum = 999;
- Unit = FUNIT_INCH;
- Last = 999;
- SpinSize = 1;
- };
- ToolBox TBX_INDENT_INC_DEC
- {
- Pos = MAP_APPFONT ( TBX_PARA_INDENT_INC_DEC_X, TBX_PARA_INDENT_INC_DEC_Y );
- Size = MAP_APPFONT (ALIGNMENT_TBX_WIDTH*2,ALIGNMENT_TBX_HEIGHT);
- SVLook = TRUE ;
- Border = FALSE ;
- HelpID = HID_PPROPERTYPANEL_PARA_TBX_INDENT_INC_DEC ;
- Text = "Indent";
- ItemList =
- {
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list