diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-03-28 10:08:31 +0100 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-03-28 10:11:02 +0100 |
commit | bc2f2ab20a44630097250a90393b7298b82fb9ea (patch) | |
tree | 3eb0b773f09152e1d453baf127e624cafa54923e /chart2 | |
parent | a2c8ae13a1ea76c9c7bcc06c8f40943978e8ac13 (diff) |
move the dialog to chart2
Change-Id: I9f6e967d52dd10072c57b4f55faedd4ed7f98094
Diffstat (limited to 'chart2')
-rw-r--r-- | chart2/Module_chart2.mk | 1 | ||||
-rw-r--r-- | chart2/UI_chart2.mk | 16 | ||||
-rw-r--r-- | chart2/source/controller/dialogs/tp_ChartType.cxx | 2 | ||||
-rw-r--r-- | chart2/uiconfig/ui/smoothlinesdlg.ui | 228 |
4 files changed, 246 insertions, 1 deletions
diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk index db763a4d1801..03fa54b3cc39 100644 --- a/chart2/Module_chart2.mk +++ b/chart2/Module_chart2.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Module_add_targets,chart2,\ Library_chartcontroller \ Library_chartcore \ Package_uiconfig \ + UI_chart2 \ )) $(eval $(call gb_Module_add_subsequentcheck_targets,chart2,\ diff --git a/chart2/UI_chart2.mk b/chart2/UI_chart2.mk new file mode 100644 index 000000000000..05348111845f --- /dev/null +++ b/chart2/UI_chart2.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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/. +# + +$(eval $(call gb_UI_UI,modules/chart2)) + +$(eval $(call gb_UI_add_uifiles,modules/chart2,\ + chart2/uiconfig/ui/smoothlinesdlg \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index bf24f38d074f..3907494c5385 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -453,7 +453,7 @@ private: }; SplinePropertiesDialog::SplinePropertiesDialog( Window* pParent ) - : ModalDialog( pParent, "SmoothLinesDialog", "modules/scalc/ui/smoothlinesdlg.ui") + : ModalDialog( pParent, "SmoothLinesDialog", "modules/chart2/ui/smoothlinesdlg.ui") { get(m_pRB_Splines_Cubic, "CubicSplineRadioButton"); get(m_pRB_Splines_B, "BSplineRadioButton"); diff --git a/chart2/uiconfig/ui/smoothlinesdlg.ui b/chart2/uiconfig/ui/smoothlinesdlg.ui new file mode 100644 index 000000000000..26fe81d44746 --- /dev/null +++ b/chart2/uiconfig/ui/smoothlinesdlg.ui @@ -0,0 +1,228 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <!-- interface-requires gtk+ 3.0 --> + <object class="GtkAdjustment" id="PolynomialsAdjustment"> + <property name="lower">1</property> + <property name="upper">15</property> + <property name="value">3</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkAdjustment" id="ResolutionAdjustment"> + <property name="lower">1</property> + <property name="upper">100</property> + <property name="value">20</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkDialog" id="SmoothLinesDialog"> + <property name="can_focus">False</property> + <property name="border_width">5</property> + <property name="title" translatable="yes">Smooth Lines</property> + <property name="modal">True</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">2</property> + <child> + <object class="GtkBox" id="box1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="box2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkRadioButton" id="CubicSplineRadioButton"> + <property name="label" translatable="yes">Cubic _spline</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <property name="group">BSplineRadioButton</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="BSplineRadioButton"> + <property name="label" translatable="yes">_B-Spline</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">CubicSplineRadioButton</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <object class="GtkGrid" id="grid2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkLabel" id="ResolutionLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">_Resolution</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">ResolutionSpinbutton</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="PolynomialsLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">_Degree of polynomials</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">PolynomialsSpinButton</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="ResolutionSpinbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">start</property> + <property name="invisible_char">●</property> + <property name="adjustment">ResolutionAdjustment</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="PolynomialsSpinButton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">start</property> + <property name="invisible_char">●</property> + <property name="adjustment">PolynomialsAdjustment</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child internal-child="action_area"> + <object class="GtkButtonBox" id="dialog-action_area1"> + <property name="can_focus">False</property> + <property name="homogeneous">True</property> + <property name="layout_style">spread</property> + <child> + <object class="GtkButton" id="OKButton"> + <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="CancelButton"> + <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="HelpButton"> + <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">2</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> + </object> + </child> + <action-widgets> + <action-widget response="0">OKButton</action-widget> + <action-widget response="0">CancelButton</action-widget> + <action-widget response="0">HelpButton</action-widget> + </action-widgets> + </object> +</interface> |