diff options
author | Jan Holesovsky <kendy@suse.cz> | 2013-06-05 15:16:19 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2013-06-05 18:32:58 +0200 |
commit | 765a030767e2ca8cd4b6159587ccd232127b896b (patch) | |
tree | cafe3290eb1edf4896dd1333780118c806a0484b | |
parent | b3de4693ed6880f5a488dae6483959713ad1601c (diff) |
sidebar conversion tutorial: Cleanup - remove .src and .hrc (if possible).
When the .src/.hrc is not used by anything else, remove it from the makefile
and from repository. Otherwise remove at least the relevant parts that were
converted to .ui.
Change-Id: I2d28220416f90b87553023ec3c6aa015993f24fb
-rw-r--r-- | sc/AllLangResTarget_sc.mk | 1 | ||||
-rw-r--r-- | sc/source/ui/sidebar/AlignmentPropertyPanel.cxx | 1 | ||||
-rw-r--r-- | sc/source/ui/sidebar/AlignmentPropertyPanel.hrc | 84 | ||||
-rw-r--r-- | sc/source/ui/sidebar/AlignmentPropertyPanel.src | 213 |
4 files changed, 0 insertions, 299 deletions
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk index b83e0f941809..1230786b7386 100644 --- a/sc/AllLangResTarget_sc.mk +++ b/sc/AllLangResTarget_sc.mk @@ -85,7 +85,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\ sc/source/ui/miscdlgs/acredlin.src \ sc/source/ui/formdlg/formdlgs.src \ sc/source/ui/formdlg/dwfunctr.src \ - sc/source/ui/sidebar/AlignmentPropertyPanel.src \ sc/source/ui/sidebar/CellAppearancePropertyPanel.src \ sc/source/ui/sidebar/NumberFormatPropertyPanel.src \ sc/source/core/src/compiler.src \ diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx index b571b4f658d7..d20a9060d77a 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx @@ -20,7 +20,6 @@ #include <sfx2/sidebar/Theme.hxx> #include <sfx2/sidebar/ControlFactory.hxx> #include <AlignmentPropertyPanel.hxx> -#include <AlignmentPropertyPanel.hrc> #include <editeng/justifyitem.hxx> #include <svx/dialmgr.hxx> #include "sc.hrc" diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hrc b/sc/source/ui/sidebar/AlignmentPropertyPanel.hrc deleted file mode 100644 index 96b795f06fac..000000000000 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hrc +++ /dev/null @@ -1,84 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * 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 . - */ -// RID_PROPERTYPANEL_SC_ALIGNMENT-------------------------------------------------------------- -#define FT_ORIENT 1 -#define CBX_WRAP 5 -#define FT_LEFT_INDENT 7 -#define MF_LEFT_INDENT 8 -#define CBX_MERGE 9 -#define CBX_VERT 10 -#define CTL_SBSHAPE_POSREFERENCE 12 -#define CBOX_ANGLE 14 -#define TBX_HORIZONTAL_ALIGNMENT 15 -#define TBX_VERTICAL_ALIGN 16 -#define DIAL_CONTROL 17 -#define ID_SUBSTLEFT 20 -#define ID_SUBSTCENTER 21 -#define ID_SUBSTRIGHT 22 -#define ID_SUBSTJUSTIFY 23 -#define IID_VERT_TOP 24 -#define IID_VERT_CENTER 25 -#define IID_VERT_BOTTOM 26 - -#define MBOX_WIDTH 45 -#define TEXT_WIDTH 40 -#define FLIP_BUTTON_SIZE 13 -#define ALIGNMENT_TBX_HEIGHT 17 -#define ALIGNMENT_TBX_WIDTH 13 - -#define IMG_ALIGN_LEFT 50 -#define IMG_ALIGN_CENTER 51 -#define IMG_ALIGN_RIGHT 52 -#define IMG_ALIGN_JUST 53 -#define IMG_ALIGN_TOP 54 -#define IMG_ALIGN_CENTER_V 55 -#define IMG_ALIGN_BOTTOM 56 - -//---------------position----------------- - -#define ALIGNMENT_X SECTIONPAGE_MARGIN_HORIZONTAL -#define ALIGNMENT_Y SECTIONPAGE_MARGIN_VERTICAL_TOP -#define ALIGNMENT_VERT_X (ALIGNMENT_X + TBX_OUT_BORDER_OFFSET_X*2 + TOOLBOX_ITEM_WIDTH * 4 + CONTROL_SPACING_HORIZONTAL) -#define ALIGNMENT_VERT_Y ALIGNMENT_Y - -#define FT_LEFTINDENT_X ALIGNMENT_X -#define FT_LEFTINDENT_Y (ALIGNMENT_Y + TOOLBOX_ITEM_HEIGHT + TBX_OUT_BORDER_OFFSET_Y + CONTROL_SPACING_VERTICAL) -#define MTR_LEFTINDENT_X ALIGNMENT_X -#define MTR_LEFTINDENT_Y (FT_LEFTINDENT_Y + TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL) - -#define CBX_WRAP_X (ALIGNMENT_X + TEXT_WIDTH + 10 + CONTROL_SPACING_HORIZONTAL) -#define CBX_WRAP_Y (FT_LEFTINDENT_Y + 2) - -#define CBX_MERGE_X CBX_WRAP_X -#define CBX_MERGE_Y CBX_WRAP_Y + CBOX_HEIGHT + 2 - -#define FT_ORIENT_X ALIGNMENT_X -#define FT_ORIENT_Y MTR_LEFTINDENT_Y + MBOX_HEIGHT + CONTROL_SPACING_VERTICAL - -#define COMOBX_ROTATION_X FT_ORIENT_X + 30 + CONTROL_SPACING_HORIZONTAL -#define COMOBX_ROTATION_Y FT_ORIENT_Y + TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL + 5 - -#define ROTATE_CONTROL_X FT_ORIENT_X -#define ROTATE_CONTROL_Y COMOBX_ROTATION_Y - 3 - -#define CBX_VERT_X COMOBX_ROTATION_X -#define CBX_VERT_Y COMOBX_ROTATION_Y + CBOX_HEIGHT + CONTROL_SPACING_VERTICAL + 2 - -#define PANEL_HEIGHT CBX_VERT_Y + 6 + SECTIONPAGE_MARGIN_VERTICAL_BOT - -// eof diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.src b/sc/source/ui/sidebar/AlignmentPropertyPanel.src deleted file mode 100644 index 5a5501295524..000000000000 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.src +++ /dev/null @@ -1,213 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * 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 . - */ -#include "AlignmentPropertyPanel.hrc" -#include <sfx2/sidebar/ResourceDefinitions.hrc> -#include "sc.hrc" -#include "helpids.h" - -Control RID_PROPERTYPANEL_SC_ALIGNMENT -{ - OutputSize = TRUE; - DialogControl = TRUE; - Border = FALSE; - - Size = MAP_APPFONT( PROPERTYPAGE_WIDTH, PANEL_HEIGHT ); - HelpID = HID_PROPERTYPANEL_SC_ALIGN_SECTION; - Text [ en-US ] = "Alignment"; - - //------------ Alignment ------------- - ToolBox TBX_HORIZONTAL_ALIGNMENT - { - Pos = MAP_APPFONT ( ALIGNMENT_X , ALIGNMENT_Y ); - Size = MAP_APPFONT ( ALIGNMENT_TBX_WIDTH*4 ,ALIGNMENT_TBX_HEIGHT); - SVLook = TRUE ; - Border = FALSE ; - HelpID = HID_PROPERTY_PANEL_ALIGN_TBX_HOR; - Text [ en-US ] = "Horizontal Alignment" ; - ItemList = - { - ToolBoxItem - { - Identifier = ID_SUBSTLEFT ; - Text [ en-US ] = "Align Left" ; - HelpID = HID_PROPERTY_PANEL_ALIGN_TBI_HOR_L; - }; - ToolBoxItem - { - Identifier = ID_SUBSTCENTER ; - Text [ en-US ] = "Align Center" ; - HelpID = HID_PROPERTY_PANEL_ALIGN_TBI_HOR_C; - }; - ToolBoxItem - { - Identifier = ID_SUBSTRIGHT ; - Text [ en-US ] = "Align Right" ; - HelpID = HID_PROPERTY_PANEL_ALIGN_TBI_HOR_R; - }; - ToolBoxItem - { - Identifier = ID_SUBSTJUSTIFY ; - Text [ en-US ] = "Align Justified" ; - HelpID = HID_PROPERTY_PANEL_ALIGN_TBI_HOR_J; - }; - }; - }; - ToolBox TBX_VERTICAL_ALIGN - { - SVLook = TRUE ; - Border = FALSE ; - Pos = MAP_APPFONT ( ALIGNMENT_VERT_X, ALIGNMENT_VERT_Y ) ; - Size = MAP_APPFONT ( TOOLBOX_ITEM_WIDTH * 3 , TOOLBOX_ITEM_HEIGHT) ; - TabStop = TRUE ; - HelpID = HID_PROPERTY_PANEL_ALIGN_TBX_VER; - Text [ en-US ] = "Vertical Alignment" ; - ItemList = - { - ToolBoxItem - { - Identifier = IID_VERT_TOP ; - Text [ en-US ] = "Align Top" ; - HelpID = HID_PROPERTY_PANEL_ALIGN_TBI_VER_T; - }; - - ToolBoxItem - { - Identifier = IID_VERT_CENTER ; - Text [ en-US ] = "Align Center Vertically" ; - HelpID = HID_PROPERTY_PANEL_ALIGN_TBI_VER_C; - }; - - ToolBoxItem - { - Identifier = IID_VERT_BOTTOM ; - Text [ en-US ] = "Align Bottom" ; - HelpID = HID_PROPERTY_PANEL_ALIGN_TBI_VER_B; - }; - }; - }; - //------------ Left indent ------------ - FixedText FT_LEFT_INDENT - { - Pos = MAP_APPFONT ( FT_LEFTINDENT_X, FT_LEFTINDENT_Y ); - Size = MAP_APPFONT (CBX_WRAP_X - FT_LEFTINDENT_X - 1 , TEXT_HEIGHT) ; //MBOX_WIDTH - Text [ en-US ] = "Left ~indent:"; - }; - MetricField MF_LEFT_INDENT - { - Border = TRUE; - Pos = MAP_APPFONT ( MTR_LEFTINDENT_X , MTR_LEFTINDENT_Y ); - Size = MAP_APPFONT ( MBOX_WIDTH, MBOX_HEIGHT ) ; - TabStop = TRUE; - Repeat = TRUE; - Spin = TRUE; - Minimum = 0; - Maximum = 990; - Unit = FUNIT_POINT; - SpinSize = 10; - QuickHelpText [ en-US ] = "Indents from the left edge."; - HelpID = HID_PROPERTY_PANEL_ALIGN_MBX_INDENT; - }; - CheckBox CBX_WRAP - { - Pos = MAP_APPFONT ( CBX_WRAP_X , CBX_WRAP_Y ) ; - Size = MAP_APPFONT (PROPERTYPAGE_WIDTH - CBX_WRAP_X - 1 , CBOX_HEIGHT ) ;// - TabStop = TRUE ; - Text [ en-US ] = "~Wrap text" ; - QuickHelpText [ en-US ] = "Wrap texts automatically."; - HelpID = HID_PROPERTY_PANEL_ALIGN_CBX_WRAP; - }; - CheckBox CBX_MERGE - { - Pos = MAP_APPFONT ( CBX_MERGE_X , CBX_MERGE_Y ) ; - Size = MAP_APPFONT ( PROPERTYPAGE_WIDTH - CBX_WRAP_X - 1 , CBOX_HEIGHT ) ;// - TabStop = TRUE ; - Text [ en-US ] = "~Merge cells" ; - QuickHelpText [ en-US ] = "Joins the selected cells into one."; - HelpID = HID_PROPERTY_PANEL_ALIGN_CBX_MERGE; - }; - //------------ Text orientation ------------ - FixedText FT_ORIENT - { - Pos = MAP_APPFONT ( FT_ORIENT_X, FT_ORIENT_Y ); - Size = MAP_APPFONT ( TEXT_WIDTH + 50, TEXT_HEIGHT) ; - Text [ en-US ] = "Text ~orientation:"; - }; - MetricBox CBOX_ANGLE - { - Border = TRUE ; - Pos = MAP_APPFONT ( COMOBX_ROTATION_X , COMOBX_ROTATION_Y ); - Size = MAP_APPFONT ( MBOX_WIDTH + 20, MBOX_HEIGHT ) ; - Unit = FUNIT_CUSTOM ; - CustomUnitText [ en-US ] = " degrees"; - DecimalDigits = 0; - Minimum = 0; - Maximum = 359; - TabStop = TRUE ; - DropDown = TRUE ; - QuickHelpText [ en-US ] = "Select the angle for rotation."; - HelpID = HID_PROPERTY_PANEL_ALIGN_MBX_ANGLE; - }; - - Control DIAL_CONTROL - { - Pos = MAP_APPFONT ( ROTATE_CONTROL_X , ROTATE_CONTROL_Y ); - Size = MAP_PIXEL( 50, 50 ); - HelpID = HID_PROPERTY_PANEL_ALIGN_DIAL_CONTROL; - QuickHelpText [ en-US ] = "Drag to change the rotation value."; - }; - CheckBox CBX_VERT - { - Pos = MAP_APPFONT ( CBX_VERT_X , CBX_VERT_Y ) ; - Size = MAP_APPFONT ( MBOX_WIDTH + 20 , CBOX_HEIGHT + 5 ) ; - TabStop = TRUE ; - Text [ en-US ] = "~Vertically stacked" ; - QuickHelpText [ en-US ] = "Aligns text vertically."; - HelpID = HID_PROPERTY_PANEL_ALIGN_CBX_VERT; - }; - - Image IMG_ALIGN_LEFT - { - ImageBitmap = Bitmap{File = "sidebar/sc_alignleft.png";}; - }; - Image IMG_ALIGN_CENTER - { - ImageBitmap = Bitmap{File = "sidebar/sc_aligncenter.png";}; - }; - Image IMG_ALIGN_RIGHT - { - ImageBitmap = Bitmap{File = "sidebar/sc_alignright.png";}; - }; - Image IMG_ALIGN_JUST - { - ImageBitmap = Bitmap{File = "sidebar/sc_alignjust.png";}; - }; - Image IMG_ALIGN_TOP - { - ImageBitmap = Bitmap{File = "sidebar/sc_aligntop.png";}; - }; - Image IMG_ALIGN_CENTER_V - { - ImageBitmap = Bitmap{File = "sidebar/sc_aligncenter_v.png";}; - }; - Image IMG_ALIGN_BOTTOM - { - ImageBitmap = Bitmap{File = "sidebar/sc_alignbottom.png";}; - }; -}; - -// eof |