Page margin popup converted to use outside sidebar

Change-Id: I3c4cc20fc8f2818677a77f848a1566bb56ceb7c6
Reviewed-on: https://gerrit.libreoffice.org/29363
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>

1 files changed, 12 insertions, 246 deletions

diff --git a/sw/source/ui/sidebar/PagePropertyPanel.src b/sw/source/ui/sidebar/PagePropertyPanel.src
index 6544520cba7a..78816a2971c6 100644
--- a/sw/source/ui/sidebar/PagePropertyPanel.src
+++ b/sw/source/ui/sidebar/PagePropertyPanel.src
@@ -19,265 +19,31 @@
 
 #include <sfx2/sidebar/ResourceDefinitions.hrc>
 #include "PropertyPanel.hrc"
-#include "PagePropertyPanel.hrc"
 #include "helpid.h"
 
-Image IMG_PAGE_NARROW
+String STR_MARGIN_TOOLTIP_LEFT
 {
-    ImageBitmap = Bitmap{File = "sidebar/pageproppanel/format_L_narrow_24x24.png";};
+    Text [ en-US ] = "Left: ";
 };
-Image IMG_PAGE_NORMAL
+String STR_MARGIN_TOOLTIP_RIGHT
 {
-    ImageBitmap = Bitmap{File = "sidebar/pageproppanel/format_L_nomal_24x24.png";};
+    Text [ en-US ] = ". Right: ";
 };
-Image IMG_PAGE_WIDE
+String STR_MARGIN_TOOLTIP_INNER
 {
-    ImageBitmap = Bitmap{File = "sidebar/pageproppanel/format_L_wide_24x24.png";};
+    Text [ en-US ] = "Inner: ";
 };
-Image IMG_PAGE_MIRRORED
+String STR_MARGIN_TOOLTIP_OUTER
 {
-    ImageBitmap = Bitmap{File = "sidebar/pageproppanel/format_L_mirror_24x24.png";};
+    Text [ en-US ] = ". Outer: ";
 };
-Image IMG_PAGE_MARGIN_CUSTOM
+String STR_MARGIN_TOOLTIP_TOP
 {
-    ImageBitmap = Bitmap{File = "sidebar/pageproppanel/format_L_copy_24x24.png";};
+    Text [ en-US ] = ". Top: ";
 };
-Image IMG_PAGE_NARROW_L
+String STR_MARGIN_TOOLTIP_BOT
 {
-    ImageBitmap = Bitmap{File = "sidebar/pageproppanel/formatnarrow_24x24.png";};
-};
-Image IMG_PAGE_NORMAL_L
-{
-    ImageBitmap = Bitmap{File = "sidebar/pageproppanel/formatnormal_24x24.png";};
-};
-Image IMG_PAGE_WIDE_L
-{
-    ImageBitmap = Bitmap{File = "sidebar/pageproppanel/formatwide_24x24.png";};
-};
-Image IMG_PAGE_MIRRORED_L
-{
-    ImageBitmap = Bitmap{File = "sidebar/pageproppanel/formatmirror_24x24.png";};
-};
-Image IMG_PAGE_MARGIN_CUSTOM_L
-{
-    ImageBitmap = Bitmap{File = "sidebar/pageproppanel/formatcopy_24x24.png";};
-};
-
-// popup for page style's margin attributes
-Control RID_POPUP_SWPAGE_MARGIN
-{
-    OutputSize = TRUE;
-    DialogControl = TRUE;
-    Border = FALSE;
-    Size = MAP_APPFONT( POPUPPANEL_MARGIN_SMALL * 2 + POPUP_BORDER_WIDTH + VS_WIDTH, MARGIN_PANEL_HEIGHT );
-
-    Control VS_MARGIN
-    {
-        Pos = MAP_APPFONT(  POPUPPANEL_MARGIN_SMALL + OFFSET_X, POPUPPANEL_MARGIN_SMALL + OFFSET_Y );
-        Size = MAP_APPFONT ( VS_WIDTH  , ITEM_HEIGHT*5);
-        HelpID = HID_SWPAGE_VS_MARGIN;
-        TabStop = TRUE ;
-        Text = "Margin";
-    };
-    FixedText FT_CUSTOM
-    {
-        Pos = MAP_APPFONT ( FT_CUSTOM_X, FT_CUSTOM_Y );
-        Size = MAP_APPFONT ( MBOX_WIDTH + 30, TEXT_HEIGHT) ;
-        Text [ en-US ] = "Custom:";
-    };
-    FixedText FT_LEFT
-    {
-        Pos = MAP_APPFONT ( FT_X, FT_LEFT_Y );
-        Size = MAP_APPFONT ( 25, TEXT_HEIGHT) ;
-        Text [ en-US ] = "~Left:";
-    };
-    FixedText FT_INNER
-    {
-        Pos = MAP_APPFONT ( FT_X, FT_LEFT_Y );
-        Size = MAP_APPFONT ( 25, TEXT_HEIGHT) ;
-        Text [ en-US ] = "I~nner:";
-    };
-    MetricField MF_SWLEFT_MARGIN
-    {
-        Border = TRUE;
-        Pos = MAP_APPFONT ( MF_X , LEFT_MF_Y );
-        Size = MAP_APPFONT ( MBOX_WIDTH - 12, MBOX_HEIGHT );
-        HelpID = HID_SWPAGE_LEFT_MARGIN;
-        Left = TRUE;
-        Repeat = TRUE;
-        Spin = TRUE;
-        Maximum = 9999;
-        DecimalDigits = 2;
-        Unit = FUNIT_CM;
-        Last = 9999;
-        SpinSize = 10;
-    };
-    FixedText FT_RIGHT
-    {
-        Pos = MAP_APPFONT ( FT_X, FT_RIGHT_Y );
-        Size = MAP_APPFONT ( 25, TEXT_HEIGHT) ;
-        Text [ en-US ] = "~Right:";
-    };
-    FixedText FT_OUTER
-    {
-        Pos = MAP_APPFONT ( FT_X, FT_RIGHT_Y );
-        Size = MAP_APPFONT ( 25, TEXT_HEIGHT) ;
-        Text [ en-US ] = "O~uter:";
-    };
-    MetricField MF_SWRIGHT_MARGIN
-    {
-        Border = TRUE;
-        Pos = MAP_APPFONT ( MF_X , RIGHT_MF_Y );
-        Size = MAP_APPFONT ( MBOX_WIDTH - 12, MBOX_HEIGHT );
-        HelpID = HID_SWPAGE_RIGHT_MARGIN;
-        Left = TRUE;
-        Repeat = TRUE;
-        Spin = TRUE;
-        Maximum = 9999;
-        DecimalDigits = 2;
-        Unit = FUNIT_CM;
-        Last = 9999;
-        SpinSize = 10;
-    };
-    FixedText FT_TOP
-    {
-        Pos = MAP_APPFONT ( FT_X, FT_TOP_Y );
-        Size = MAP_APPFONT ( 25, TEXT_HEIGHT) ;
-        Text [ en-US ] = "~Top:";
-    };
-    MetricField MF_SWTOP_MARGIN
-    {
-        Border = TRUE;
-        Pos = MAP_APPFONT ( MF_X , TOP_MF_Y );
-        Size = MAP_APPFONT ( MBOX_WIDTH - 12, MBOX_HEIGHT );
-        HelpID = HID_SWPAGE_TOP_MARGIN;
-        Left = TRUE;
-        Repeat = TRUE;
-        Spin = TRUE;
-        Maximum = 9999;
-        DecimalDigits = 2;
-        Unit = FUNIT_CM;
-        Last = 9999;
-        SpinSize = 10;
-    };
-    FixedText FT_BOTTOM
-    {
-        Pos = MAP_APPFONT ( FT_X, FT_BOTTOM_Y );
-        Size = MAP_APPFONT ( 25, TEXT_HEIGHT) ;
-        Text [ en-US ] = "~Bottom:";
-    };
-    MetricField MF_SWBOTTOM_MARGIN
-    {
-        Border = TRUE;
-        Pos = MAP_APPFONT ( MF_X , BOTTOM_MF_Y );
-        Size = MAP_APPFONT ( MBOX_WIDTH - 12, MBOX_HEIGHT );
-        HelpID = HID_SWPAGE_BOTTOM_MARGIN;
-        Left = TRUE;
-        Repeat = TRUE;
-        Spin = TRUE;
-        Maximum = 9999;
-        DecimalDigits = 2;
-        Unit = FUNIT_CM;
-        Last = 9999;
-        SpinSize = 10;
-    };
-    MetricField FLD_WIDTH_HEIGHT
-    {
-        Border = TRUE;
-        Left = TRUE;
-        Repeat = TRUE;
-        Spin = TRUE;
-        Maximum = 9999;
-        DecimalDigits = 2;
-        Unit = FUNIT_CM;
-        Last = 9999;
-        SpinSize = 10;
-    };
-
-    Image IMG_NARROW
-    {
-        ImageBitmap = Bitmap{File = "sidebar/pageproppanel/format_L_narrow_24x24.png";};
-    };
-    Image IMG_NORMAL
-    {
-        ImageBitmap = Bitmap{File = "sidebar/pageproppanel/format_L_nomal_24x24.png";};
-    };
-    Image IMG_WIDE
-    {
-        ImageBitmap = Bitmap{File = "sidebar/pageproppanel/format_L_wide_24x24.png";};
-    };
-    Image IMG_MIRRORED
-    {
-        ImageBitmap = Bitmap{File = "sidebar/pageproppanel/format_L_mirror_24x24.png";};
-    };
-    Image IMG_NARROW_L
-    {
-        ImageBitmap = Bitmap{File = "sidebar/pageproppanel/formatnarrow_24x24.png";};
-    };
-    Image IMG_NORMAL_L
-    {
-        ImageBitmap = Bitmap{File = "sidebar/pageproppanel/formatnormal_24x24.png";};
-    };
-    Image IMG_WIDE_L
-    {
-        ImageBitmap = Bitmap{File = "sidebar/pageproppanel/formatwide_24x24.png";};
-    };
-    Image IMG_MIRRORED_L
-    {
-        ImageBitmap = Bitmap{File = "sidebar/pageproppanel/formatmirror_24x24.png";};
-    };
-    Image IMG_CUSTOM
-    {
-        ImageBitmap = Bitmap{File = "sidebar/pageproppanel/last_custom_common.png";};
-    };
-    Image IMG_CUSTOM_DIS
-    {
-        ImageBitmap = Bitmap{File = "sidebar/pageproppanel/last_custom_common_grey.png";};
-    };
-    String STR_LCVALUE
-    {
-        Text [ en-US ] = "Last Custom Values";
-    };
-    String STR_NARROW
-    {
-        Text [ en-US ] = "Narrow";
-    };
-    String STR_NORMAL
-    {
-        Text [ en-US ] = "Normal";
-    };
-    String STR_WIDE
-    {
-        Text [ en-US ] = "Wide";
-    };
-    String STR_MIRRORED
-    {
-        Text [ en-US ] = "Mirrored";
-    };
-    String STR_MARGIN_TOOLTIP_LEFT
-    {
-        Text [ en-US ] = "Left: ";
-    };
-    String STR_MARGIN_TOOLTIP_RIGHT
-    {
-        Text [ en-US ] = ". Right: ";
-    };
-    String STR_MARGIN_TOOLTIP_INNER
-    {
-        Text [ en-US ] = "Inner: ";
-    };
-    String STR_MARGIN_TOOLTIP_OUTER
-    {
-        Text [ en-US ] = ". Outer: ";
-    };
-    String STR_MARGIN_TOOLTIP_TOP
-    {
-        Text [ en-US ] = ". Top: ";
-    };
-    String STR_MARGIN_TOOLTIP_BOT
-    {
-        Text [ en-US ] = ". Bottom: ";
-    };
+    Text [ en-US ] = ". Bottom: ";
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */