From 55d7d03b0c70a8d8db61418a88559b8480a2e38d Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 2 Aug 2013 22:30:29 +0200 Subject: convert attributes wrapper dialog to .ui currently unresizable until all possible tabpages that can be inserted into it get converted over Change-Id: I1e7d28cf2f2a04ca2c596136b7d26626058f2e4b --- chart2/AllLangResTarget_chartcontroller.mk | 1 - chart2/UIConfig_chart2.mk | 1 + chart2/source/controller/dialogs/ResourceIds.hrc | 1 - .../controller/dialogs/dlg_ObjectProperties.cxx | 4 +- .../controller/dialogs/dlg_ObjectProperties.src | 33 ------- chart2/uiconfig/ui/attributedialog.ui | 106 +++++++++++++++++++++ 6 files changed, 108 insertions(+), 38 deletions(-) delete mode 100644 chart2/source/controller/dialogs/dlg_ObjectProperties.src create mode 100644 chart2/uiconfig/ui/attributedialog.ui (limited to 'chart2') diff --git a/chart2/AllLangResTarget_chartcontroller.mk b/chart2/AllLangResTarget_chartcontroller.mk index c60a3f4aff4e..ce4309ff7647 100644 --- a/chart2/AllLangResTarget_chartcontroller.mk +++ b/chart2/AllLangResTarget_chartcontroller.mk @@ -36,7 +36,6 @@ $(eval $(call gb_SrsTarget_add_files,chart2/res,\ chart2/source/controller/dialogs/dlg_InsertErrorBars.src \ chart2/source/controller/dialogs/dlg_InsertLegend.src \ chart2/source/controller/dialogs/dlg_InsertTitle.src \ - chart2/source/controller/dialogs/dlg_ObjectProperties.src \ chart2/source/controller/dialogs/dlg_ShapeFont.src \ chart2/source/controller/dialogs/dlg_ShapeParagraph.src \ chart2/source/controller/dialogs/dlg_View3D.src \ diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk index 76ab92489f83..1ad18c7df28a 100644 --- a/chart2/UIConfig_chart2.mk +++ b/chart2/UIConfig_chart2.mk @@ -30,6 +30,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/schart,\ )) $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\ + chart2/uiconfig/ui/attributedialog \ chart2/uiconfig/ui/insertaxisdlg \ chart2/uiconfig/ui/insertgriddlg \ chart2/uiconfig/ui/smoothlinesdlg \ diff --git a/chart2/source/controller/dialogs/ResourceIds.hrc b/chart2/source/controller/dialogs/ResourceIds.hrc index 09aa8d25174a..209cee01be2d 100644 --- a/chart2/source/controller/dialogs/ResourceIds.hrc +++ b/chart2/source/controller/dialogs/ResourceIds.hrc @@ -32,7 +32,6 @@ #define DLG_LEGEND 835 #define DLG_TITLE 834 #define DLG_3D_VIEW 752 -#define DLG_OBJECT_PROPERTIES 903 #define DLG_SPLINE_PROPERTIES 904 #define DLG_DATA_TRENDLINE 841 #define DLG_DATA_YERRORBAR 842 diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index bacd18e4358a..d7c658753c96 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -335,7 +335,7 @@ SchAttribTabDlg::SchAttribTabDlg(Window* pParent, const ViewElementListProvider* pViewElementListProvider, const uno::Reference< util::XNumberFormatsSupplier >& xNumberFormatsSupplier ) - : SfxTabDialog(pParent, SchResId(DLG_OBJECT_PROPERTIES), pAttr) + : SfxTabDialog(pParent, "AttributeDialog", "modules/schart/ui/attributedialog.ui", pAttr) , eObjectType(pDialogParameter->getObjectType()) , nDlgType(nNoArrowNoShadowDlg) , nPageType(0) @@ -347,8 +347,6 @@ SchAttribTabDlg::SchAttribTabDlg(Window* pParent, , m_fAxisMinorStepWidthForErrorBarDecimals(0.1) , m_bOKPressed(false) { - FreeResource(); - NumberFormatterWrapper aNumberFormatterWrapper( xNumberFormatsSupplier ); m_pNumberFormatter = aNumberFormatterWrapper.getSvNumberFormatter(); diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.src b/chart2/source/controller/dialogs/dlg_ObjectProperties.src deleted file mode 100644 index e0d173e6c8d0..000000000000 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.src +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 "ResourceIds.hrc" - -TabDialog DLG_OBJECT_PROPERTIES -{ - OutputSize = TRUE ; - SVLook = TRUE ; - Moveable = TRUE ; - TabControl 1 - { - OutputSize = TRUE ; - Pos = MAP_APPFONT ( 3 , 3 ) ; - }; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/uiconfig/ui/attributedialog.ui b/chart2/uiconfig/ui/attributedialog.ui new file mode 100644 index 000000000000..27972c384662 --- /dev/null +++ b/chart2/uiconfig/ui/attributedialog.ui @@ -0,0 +1,106 @@ + + + + + False + 6 + False + dialog + + + False + vertical + 12 + + + False + end + + + gtk-ok + True + True + True + True + True + True + + + False + True + 0 + + + + + gtk-cancel + True + True + True + True + + + False + True + 1 + + + + + gtk-help + True + True + True + True + + + False + True + 3 + + + + + gtk-revert-to-saved + True + True + True + True + + + False + True + 4 + + + + + False + True + end + 0 + + + + + True + True + True + True + + + False + True + 1 + + + + + + ok + cancel + help + reset + + + -- cgit v1.2.3