mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert attributes wrapper dialog to .ui

Browse Source 
currently unresizable until all possible tabpages that can be inserted into it
get converted over

Change-Id: I1e7d28cf2f2a04ca2c596136b7d26626058f2e4b
This commit is contained in:
Caolán McNamara
2013-08-02 22:30:29 +02:00
parent 973094a999
commit 55d7d03b0c
6 changed files with 108 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
chart2/AllLangResTarget_chartcontroller.mk
View File

@@ -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 \

1
chart2/UIConfig_chart2.mk
View File

@@ -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 \

1
chart2/source/controller/dialogs/ResourceIds.hrc
View File

@@ -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

4
chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
View File

@@ -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();

33
chart2/source/controller/dialogs/dlg_ObjectProperties.src
View File

@@ -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: */

106
chart2/uiconfig/ui/attributedialog.ui Normal file
View File

@@ -0,0 +1,106 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="AttributeDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="ok">
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="cancel">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="help">
<property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkButton" id="reset">
<property name="label">gtk-revert-to-saved</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">4</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkNotebook" id="tabcontrol">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
<action-widgets>
<action-widget response="0">ok</action-widget>
<action-widget response="0">cancel</action-widget>
<action-widget response="0">help</action-widget>
<action-widget response="0">reset</action-widget>
</action-widgets>
</object>
</interface>