You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2013/02/19 18:43:29 UTC

svn commit: r1447846 [3/3] - in /openoffice/branches/sidebar/main: default_images/svx/res/symphony/ officecfg/registry/data/org/openoffice/Office/UI/ sfx2/inc/sfx2/sidebar/ svx/ svx/inc/svx/ svx/inc/svx/sidebar/ svx/source/sidebar/ svx/source/sidebar/g...

Added: openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.src
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.src?rev=1447846&view=auto
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.src (added)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.src Tue Feb 19 17:43:27 2013
@@ -0,0 +1,654 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
+
+#include <LinePropertyPanel.hrc>
+#include <sfx2/sidebar/propertypanel.hrc>
+#include <svx/dialogs.hrc>
+#include "helpid.hrc"
+
+#define TOOLBOX_WIDTH		50
+#define TOOLBOX_HEIGHT		14
+
+Control RID_SIDEBAR_LINE_PANEL
+{
+	OutputSize = TRUE;
+	DialogControl = TRUE;
+	Border = FALSE;
+	Text = "Line";
+
+	Size = MAP_APPFONT( PROPERTYPAGE_WIDTH, SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT*3 +  + TEXT_CONTROL_SPACING_VERTICAL*3 + TOOLBOX_HEIGHT*2  + CONTROL_SPACING_VERTICAL*2 + 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:" ;        
+	};
+	ToolBox TB_STYLE
+	{
+		SVLook = TRUE ;
+		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 ,TOOLBOX_HEIGHT ) ;
+		TabStop = TRUE ;
+		HelpID = HID_PPROPERTYPANEL_LINE_TBX_STYLE;
+		Text = "Style";
+		ItemList =
+		{
+			ToolBoxItem
+			{
+				Identifier = TBI_STYLE ;
+				DropDown = TRUE ;
+				Text [ en-US ] = "Style" ;
+				HelpID = HID_PPROPERTYPANEL_LINE_TBI_STYLE;
+			};
+		};
+	};
+	String STR_QH_TB_STYLE
+	{
+		Text [ 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 ;
+		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.";
+	};
+	
+	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 , 99 ) ;
+		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, 100 ) ;
+		TabStop = TRUE ;
+		DropDown = TRUE ;
+		DDExtraWidth = TRUE ;
+		QuickHelpText [ en-US ] = "Select the style of the ending arrowhead.";
+	};
+
+	
+	Image IMG_COLOR
+	{
+		ImageBitmap = Bitmap{File = "symphony/Line_color.png";};
+	};
+	Image IMG_COLOR_NO
+	{
+		ImageBitmap = Bitmap{File = "symphony/no color.png";};
+	};
+	
+	Image IMG_LINE1_ICON
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line1_s.png";};
+	};
+	Image IMG_LINE2_ICON
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line2_s.png";};
+	};
+	Image IMG_LINE3_ICON
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line3_s.png";};
+	};
+	Image IMG_LINE4_ICON
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line4_s.png";};
+	};
+	Image IMG_LINE5_ICON
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line5_s.png";};
+	};
+	Image IMG_LINE6_ICON
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line6_s.png";};
+	};
+	Image IMG_LINE7_ICON
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line7_s.png";};
+	};
+	Image IMG_LINE8_ICON
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line8_s.png";};
+	};
+	Image IMG_LINE9_ICON
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line9_s.png";};
+	};
+	Image IMG_LINE10_ICON
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line10_s.png";};
+	};
+	Image IMG_LINE11_ICON
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line11_s.png";};
+	};
+	Image IMG_NONE_ICON
+	{
+		ImageBitmap = Bitmap{File = "symphony/blank.png";};
+	};
+	
+	//high contrast for line style icon
+	Image IMG_LINE1_ICON_H
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line1_s_h.png";};
+	};
+	Image IMG_LINE2_ICON_H
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line2_s_h.png";};
+	};
+	Image IMG_LINE3_ICON_H
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line3_s_h.png";};
+	};
+	Image IMG_LINE4_ICON_H
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line4_s_h.png";};
+	};
+	Image IMG_LINE5_ICON_H
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line5_s_h.png";};
+	};
+	Image IMG_LINE6_ICON_H
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line6_s_h.png";};
+	};
+	Image IMG_LINE7_ICON_H
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line7_s_h.png";};
+	};
+	Image IMG_LINE8_ICON_H
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line8_s_h.png";};
+	};
+	Image IMG_LINE9_ICON_H
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line9_s_h.png";};
+	};
+	Image IMG_LINE10_ICON_H
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line10_s_h.png";};
+	};
+	Image IMG_LINE11_ICON_H
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line11_s_h.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";};
+	};	
+	
+	//high contrast for line width
+	//WIDTH ICON
+	Image IMG_WIDTH1_ICON_H
+	{
+		ImageBitmap = Bitmap{File = "symphony/width1_h.png";};
+	};
+	Image IMG_WIDTH2_ICON_H
+	{
+		ImageBitmap = Bitmap{File = "symphony/width2_h.png";};
+	};
+	Image IMG_WIDTH3_ICON_H
+	{
+		ImageBitmap = Bitmap{File = "symphony/width3_h.png";};
+	};
+	Image IMG_WIDTH4_ICON_H
+	{
+		ImageBitmap = Bitmap{File = "symphony/width4_h.png";};
+	};
+	Image IMG_WIDTH5_ICON_H
+	{
+		ImageBitmap = Bitmap{File = "symphony/width5_h.png";};
+	};
+	Image IMG_WIDTH6_ICON_H
+	{
+		ImageBitmap = Bitmap{File = "symphony/width6_h.png";};
+	};
+	Image IMG_WIDTH7_ICON_H
+	{
+		ImageBitmap = Bitmap{File = "symphony/width7_h.png";};
+	};
+	Image IMG_WIDTH8_ICON_H
+	{
+		ImageBitmap = Bitmap{File = "symphony/width8_h.png";};
+	};	
+};
+Control RID_POPUPPANEL_LINEPAGE_COLOR
+{
+	OutputSize = TRUE;
+	DialogControl = TRUE;
+	Border = FALSE;
+	Size = MAP_APPFONT(  POPUP_COLOR_PICKER_WIDTH , POPUP_COLOR_PICKER_HEIGHT  );
+	
+	Control VS_COLOR
+	{
+		HelpId = HID_PPROPERTYPANEL_LINE_VS_COLOR ;
+        Hide = TRUE ;
+        Pos = MAP_APPFONT ( OFFSET_X , OFFSET_Y );
+        Size = MAP_APPFONT (  POPUP_COLOR_PICKER_WIDTH - OFFSET_X * 2, POPUP_COLOR_PICKER_HEIGHT - OFFSET_Y * 2);
+		TabStop = TRUE ;
+		Text = "Color";
+	};
+	String STR_AUTOMATICE
+	{
+		Text [ en-US ] = "No Color";
+	};
+};
+Control RID_POPUPPANEL_LINEPAGE_STYLE
+{
+	OutputSize = TRUE;
+	DialogControl = TRUE;
+	Border = FALSE;
+	
+	Size = MAP_APPFONT(  POPUPPANEL_MARGIN_SMALL * 2 + POPUP_BORDER_WIDTH ,  13 + POPUP_BORDER_HEIGHT + POPUPPANEL_MARGIN_SMALL * 2 + POPUPPANEL_MARGIN_LARGE);
+	
+	Control VS_STYLE
+	{
+		HelpId = HID_PPROPERTYPANEL_LINE_VS_STYLE ;
+        Hide = TRUE ;
+        Pos = MAP_APPFONT(  POPUPPANEL_MARGIN_SMALL + OFFSET_X , POPUPPANEL_MARGIN_SMALL + OFFSET_Y ); 
+        Size = MAP_APPFONT ( 93  , 13 * 12);
+		TabStop = TRUE ;
+		Text = "Style";
+	};
+
+	PushButton PB_OPTIONS
+	{
+		HelpId = HID_PPROPERTYPANEL_LINE_BTN_STYLE;
+		Pos = MAP_APPFONT (  POPUPPANEL_MARGIN_LARGE + OFFSET_X , POPUPPANEL_MARGIN_SMALL * 2 + OFFSET_Y  );
+		Size = MAP_APPFONT ( 93 , 13 );
+		TabStop = TRUE;
+		Text [ en-US ] = "~More Options...";
+	};
+	
+	String STR_STYLE_NONE
+	{
+		Text [ en-US ] = "None";
+	};
+	String STR_STYLE_LINE1
+	{
+		Text [ en-US ] = "Continuous";
+	};
+	String STR_STYLE_LINE2
+	{
+		Text [ en-US ] = "Ultrafine dashed";
+	};
+	String STR_STYLE_LINE3
+	{
+		Text [ en-US ] = "Dashed (variable)";
+	};
+	String STR_STYLE_LINE4
+	{
+		Text [ en-US ] = "Fine dashed (variable)";
+	};
+	String STR_STYLE_LINE5
+	{
+		Text [ en-US ] = "Fine dashed";
+	};
+	String STR_STYLE_LINE6
+	{
+		Text [ en-US ] = "Fine dotted";
+	};
+	String STR_STYLE_LINE7
+	{
+		Text [ en-US ] = "Ultrafine dotted (variable)";
+	};
+	String STR_STYLE_LINE8
+	{
+		Text [ en-US ] = "3 dashes 3 dots (variable)";
+	};
+	String STR_STYLE_LINE9
+	{
+		Text [ en-US ] = "2 dots 1 dash";
+	};
+	String STR_STYLE_LINE10
+	{
+		Text [ en-US ] = "Ultrafine 2 dots 3 dashes";
+	};
+	String STR_STYLE_LINE11
+	{
+		Text [ en-US ] = "Line with fine dots";
+	};
+	
+	Image IMG_LINE1
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line1.png";};
+	};
+	Image IMG_LINE1_S
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line1_h.png";};
+	};
+	Image IMG_LINE2
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line2.png";};
+	};
+	Image IMG_LINE2_S
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line2_h.png";};
+	};
+	Image IMG_LINE3
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line3.png";};
+	};
+	Image IMG_LINE3_S
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line3_h.png";};
+	};
+	Image IMG_LINE4
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line4.png";};
+	};
+	Image IMG_LINE4_S
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line4_h.png";};
+	};
+	Image IMG_LINE5
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line5.png";};
+	};
+	Image IMG_LINE5_S
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line5_h.png";};
+	};
+	Image IMG_LINE6
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line6.png";};
+	};
+	Image IMG_LINE6_S
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line6_h.png";};
+	};
+	Image IMG_LINE7
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line7.png";};
+	};
+	Image IMG_LINE7_S
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line7_h.png";};
+	};
+	Image IMG_LINE8
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line8.png";};
+	};
+	Image IMG_LINE8_S
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line8_h.png";};
+	};
+	Image IMG_LINE9
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line9.png";};
+	};
+	Image IMG_LINE9_S
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line9_h.png";};
+	};
+	Image IMG_LINE10
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line10.png";};
+	};
+	Image IMG_LINE10_S
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line10_h.png";};
+	};
+	Image IMG_LINE11
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line11.png";};
+	};
+	Image IMG_LINE11_S
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line11_h.png";};
+	};
+	
+	//high contrast
+	Image IMG_LINE1_H
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line1_hh.png";};
+	};
+	Image IMG_LINE2_H
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line2_hh.png";};
+	};
+	Image IMG_LINE3_H
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line3_hh.png";};
+	};
+	Image IMG_LINE4_H
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line4_hh.png";};
+	};
+	Image IMG_LINE5_H
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line5_hh.png";};
+	};
+	Image IMG_LINE6_H
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line6_hh.png";};
+	};
+	Image IMG_LINE7_H
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line7_hh.png";};
+	};
+	Image IMG_LINE8_H
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line8_hh.png";};
+	};
+	Image IMG_LINE9_H
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line9_hh.png";};
+	};
+	Image IMG_LINE10_H
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line10_hh.png";};
+	};
+	Image IMG_LINE11_H
+	{
+		ImageBitmap = Bitmap{File = "symphony/style_line11_hh.png";};
+	};
+};
+Control RID_POPUPPANEL_LINEPAGE_WIDTH
+{
+	OutputSize = TRUE;
+	DialogControl = TRUE;
+	Border = FALSE;
+	
+	Size = MAP_APPFONT(  POPUPPANEL_MARGIN_SMALL * 2 + POPUP_BORDER_WIDTH  + 80,    POPUPPANEL_MARGIN_SMALL + POPUPPANEL_MARGIN_LARGE + POPUP_BORDER_WIDTH + 12 * 9 + POPUPPANEL_MARGIN_SMALL * 2 + TEXT_HEIGHT + (POPUPPANEL_MARGIN_LARGE * 2 +  TEXT_HEIGHT + 12 +  TEXT_CONTROL_SPACING_VERTICAL));
+	
+	Control VS_WIDTH
+	{
+		HelpId = HID_PPROPERTYPANEL_LINE_VS_WIDTH ;
+        Hide = TRUE ;
+        Pos = MAP_APPFONT( POPUPPANEL_MARGIN_SMALL + OFFSET_X , POPUPPANEL_MARGIN_SMALL + OFFSET_Y ); 
+        Size = MAP_APPFONT ( 80  , 12 * 9);
+		TabStop = TRUE ;
+		Text = "Width";
+	};
+	FixedText FT_CUSTOME
+	{
+        Pos = MAP_APPFONT ( POPUPPANEL_MARGIN_LARGE + OFFSET_X, POPUPPANEL_MARGIN_SMALL + OFFSET_Y + 12 * 9 + POPUPPANEL_MARGIN_SMALL ) ;
+        Size = MAP_APPFONT ( 80  , TEXT_HEIGHT ) ;
+        Text [ en-US ] = "Custom:" ;        
+	};
+	FixedText FT_LINE_WIDTH
+	{
+        Pos = MAP_APPFONT ( CUSTOM_X + POPUPPANEL_MARGIN_LARGE, CUSTOM_Y + POPUPPANEL_MARGIN_LARGE) ;
+        Size = MAP_APPFONT (  74 - POPUPPANEL_MARGIN_LARGE * 2   , TEXT_HEIGHT ) ;
+        Text [ en-US ] = "Line ~width:" ;        
+	};
+	MetricField MF_WIDTH
+	{
+		Border = TRUE ;
+		HelpID = HID_PPROPERTYPANEL_LINE_MTR_WIDTH ;
+		Pos = MAP_APPFONT (  CUSTOM_X + POPUPPANEL_MARGIN_LARGE  , CUSTOM_Y + POPUPPANEL_MARGIN_LARGE + TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL) ;
+		Size = MAP_APPFONT ( 40 , 12 ) ;
+		TabStop = TRUE ;
+		Right = TRUE ;
+		Repeat = TRUE ;
+		Spin = TRUE ;
+		Maximum = 5000 ;
+		StrictFormat = TRUE ;
+		DecimalDigits = 2 ;
+		Value = 1 ;
+		Unit = FUNIT_MM ;
+		Last = 5000 ;
+		SpinSize = 10 ;
+		QuickHelpText [ en-US ] = "Specify the width of the line.";
+	};
+
+	Image IMG_WIDTH_CUSTOM
+	{
+		ImageBitmap = Bitmap{File = "symphony/last_custom_common.png";};
+	};
+	Image IMG_WIDTH_CUSTOM_GRAY
+	{
+		ImageBitmap = Bitmap{File = "symphony/last_custom_common_grey.png";};
+	};
+	String STR_WIDTH_LAST_CUSTOM
+	{
+		Text [ en-US ] = "Last Custom Value";
+	};
+	String STR_PT
+	{
+		Text [ en-US ] = "pt";
+	};
+};	

Propchange: openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.src
------------------------------------------------------------------------------
    svn:executable = *

Modified: openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.hrc?rev=1447846&r1=1447845&r2=1447846&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.hrc (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.hrc Tue Feb 19 17:43:27 2013
@@ -88,8 +88,8 @@
 //popup window underline
 #define	VS_UNDERLINE			1
 #define PB_OPTIONS				2
-#define BMP_UNDERLINE_MORE		3
-#define BMP_UNDERLINE_MORE_H	4	
+// #define BMP_UNDERLINE_MORE		3
+// #define BMP_UNDERLINE_MORE_H	4	
 
 #define IMG_SINGLE				10
 #define IMG_DOUBLE				11

Modified: openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.src
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.src?rev=1447846&r1=1447845&r2=1447846&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.src (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.src Tue Feb 19 17:43:27 2013
@@ -535,15 +535,15 @@ Control RID_POPUPPANEL_TEXTPAGE_UNDERLIN
 		ImageBitmap = Bitmap{File = "symphony/selected-line10.bmp";};
 	};
 	
-	//more button bmps
-	Bitmap	BMP_UNDERLINE_MORE
-	{
-		File = "symphony/morebutton.bmp";
-	};
-	Bitmap	BMP_UNDERLINE_MORE_H
-	{
-		File = "symphony/morebutton_h.bmp";
-	};	
+//	//more button bmps
+//	Bitmap	BMP_UNDERLINE_MORE
+//	{
+//		File = "symphony/morebutton.bmp";
+//	};
+//	Bitmap	BMP_UNDERLINE_MORE_H
+//	{
+//		File = "symphony/morebutton_h.bmp";
+//	};	
 	
 	//tips 
 	String STR_SINGLE

Modified: openoffice/branches/sidebar/main/svx/source/sidebar/tools/PropertyPanelTools.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/tools/PropertyPanelTools.cxx?rev=1447846&r1=1447845&r2=1447846&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/tools/PropertyPanelTools.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/tools/PropertyPanelTools.cxx Tue Feb 19 17:43:27 2013
@@ -21,8 +21,6 @@
 
 #include <svx/sidebar/PropertyPanelTools.hxx>
 #include <sfx2/sidebar/Theme.hxx>
-//#include "propertypanel.hxx"
-//#include <vcl/svapp.hxx>
 #include <vcl/gradient.hxx>
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -30,89 +28,6 @@
 namespace svx { namespace sidebar {
 
 ////////////////////////////////////////////////////////////////////////////////
-//
-//SfxSectionPage::SfxSectionPage(Window* pParent, const ResId& rResId ,SfxPropertyPanel* pPanel, PropertySectionType nPageId)
-//:	Control(pParent, rResId ),
-//	mpPanel(pPanel),
-//	mnPageId(nPageId)
-//{
-//	mnMinimumWidth = GetOutputSizePixel().Width();
-//	EnableChildTransparentMode( TRUE);	
-//	//add  for high contract
-//	if(!GetSettings().GetStyleSettings().GetHighContrastMode())
-//		SetBackground(Wallpaper(GetSettings().GetStyleSettings().GetPropertyPanelBackgroundColor()));
-//	else
-//		SetBackground(Wallpaper(GetSettings().GetStyleSettings().GetMenuColor()));
-//}
-//
-//SfxSectionPage::~SfxSectionPage()
-//{
-//}
-//
-//SfxPropertyPanel* SfxSectionPage::GetPanel()
-//{
-//	return mpPanel;
-//}
-//
-//long SfxSectionPage::GetPanelWidth()
-//{
-//	return mpPanel->GetOutputSizePixel().Width();
-//}
-//
-//void SfxSectionPage::PanelResize()
-//{
-//	mpPanel->RequestReSize();
-//}
-//
-//sal_Int32 SfxSectionPage::GetPreferredWidth (sal_Int32 nHeight)
-//{
-//	//now we don't support auto layout, so return GetOutputSizePixel().Width();
-//	return GetOutputSizePixel().Width();
-//}
-//
-//sal_Int32 SfxSectionPage::GetPreferredHeight (sal_Int32 nWidth)
-//{
-//	//now we don't support auto layout, so return GetOutputSizePixel().Height();
-//	return GetOutputSizePixel().Height();
-//}
-//
-//sal_Int32 SfxSectionPage::GetMinimumWidth (void)
-//{
-//	return mnMinimumWidth;
-//}
-//
-//void SfxSectionPage::StateChangedImpl(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) 
-//{
-//    // The SubClass can override this function to listent context switching
-//}
-//
-//SfxBindings* SfxSectionPage::GetBindings()
-//{
-//	if(NULL == mpPanel) return NULL;
-//	return mpPanel->GetBindings();
-//}
-//
-////////////////////////////////////////////////////////////////////////////////
-//
-//SfxPropertyPageController::SfxPropertyPageController(sal_uInt16 nId, SfxSectionPage *p, SfxBindings &rBindings)
-//:   SfxControllerItem(nId, rBindings),
-//    mpPage(p)
-//{
-//}
-//
-//SfxPropertyPageController::~SfxPropertyPageController()
-//{
-//}
-//
-//void SfxPropertyPageController::StateChanged( sal_uInt16 nSID, SfxItemState eState,	const SfxPoolItem* pState )
-//{
-//    if(mpPage) 
-//    {
-//        mpPage->NotifyItemUpdate(nSID, eState, pState);
-//    }
-//}
-//
-////////////////////////////////////////////////////////////////////////////////
 
 PropertyPanelPopuplWindow::PropertyPanelPopuplWindow(Window* pParent)
 :   FloatingWindow(pParent, WB_SYSTEMWINDOW | WB_3DLOOK) //  | WB_POPUP_FOCUSWIN)

Modified: openoffice/branches/sidebar/main/svx/source/xoutdev/xpool.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/xoutdev/xpool.cxx?rev=1447846&r1=1447845&r2=1447846&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/xoutdev/xpool.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/xoutdev/xpool.cxx Tue Feb 19 17:43:27 2013
@@ -146,6 +146,7 @@ XOutdevItemPool::XOutdevItemPool(
 	mpLocalItemInfos[XATTR_LINEENDWIDTH     -XATTR_START]._nSID = SID_ATTR_LINE_ENDWIDTH;
 	mpLocalItemInfos[XATTR_LINESTARTCENTER  -XATTR_START]._nSID = SID_ATTR_LINE_STARTCENTER;
 	mpLocalItemInfos[XATTR_LINEENDCENTER    -XATTR_START]._nSID = SID_ATTR_LINE_ENDCENTER;
+	mpLocalItemInfos[XATTR_LINETRANSPARENCE -XATTR_START]._nSID = SID_ATTR_LINE_TRANSPARENCE;  
 	mpLocalItemInfos[XATTR_FILLSTYLE        -XATTR_START]._nSID = SID_ATTR_FILL_STYLE;
 	mpLocalItemInfos[XATTR_FILLCOLOR        -XATTR_START]._nSID = SID_ATTR_FILL_COLOR;
 	mpLocalItemInfos[XATTR_FILLGRADIENT     -XATTR_START]._nSID = SID_ATTR_FILL_GRADIENT;