chart2/AllLangResTarget_chartcontroller.mk | 1
chart2/UIConfig_chart2.mk | 1
chart2/source/controller/dialogs/ResourceIds.hrc | 1
chart2/source/controller/dialogs/dlg_View3D.cxx | 31 -
chart2/source/controller/dialogs/dlg_View3D.hrc | 34 -
chart2/source/controller/dialogs/dlg_View3D.src | 41 --
chart2/source/controller/inc/HelpIds.hrc | 1
chart2/source/controller/inc/dlg_View3D.hxx | 7
chart2/uiconfig/ui/3dviewdialog.ui | 91 ++++
chart2/uiconfig/ui/inserttitledlg.ui | 1
chart2/uiconfig/ui/tp_3D_SceneIllumination.ui | 467 +++++++++++++----------
helpcontent2 | 2
12 files changed, 373 insertions(+), 305 deletions(-)
New commits:
commit 592719cda0fc1f0ab0f249b321d1a3b16fbcbbbe
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Dec 9 20:31:15 2013 +0000
missing title text
Change-Id: Ic3e2791c752aee5a5ec081f4a544e0a45f3ea0e1
diff --git a/chart2/uiconfig/ui/inserttitledlg.ui
b/chart2/uiconfig/ui/inserttitledlg.ui
index 407cd62..d3938e8 100644
--- a/chart2/uiconfig/ui/inserttitledlg.ui
+++ b/chart2/uiconfig/ui/inserttitledlg.ui
@@ -4,6 +4,7 @@
<object class="GtkDialog" id="InsertTitleDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
+ <property name="title" translatable="yes">Titles</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
commit e3a5fec0ead2d0ac5319265c19b4988cf241d81d
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Dec 9 20:23:16 2013 +0000
convert 3dview dialog to .ui
Change-Id: I790d8cccedeac70f5430cfb75e03914472b9c3d6
diff --git a/chart2/AllLangResTarget_chartcontroller.mk
b/chart2/AllLangResTarget_chartcontroller.mk
index a3affa3..9342cc7 100644
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -37,7 +37,6 @@ $(eval $(call gb_SrsTarget_add_files,chart2/res,\
chart2/source/controller/dialogs/dlg_InsertLegend.src \
chart2/source/controller/dialogs/dlg_ShapeFont.src \
chart2/source/controller/dialogs/dlg_ShapeParagraph.src \
- chart2/source/controller/dialogs/dlg_View3D.src \
chart2/source/controller/dialogs/res_BarGeometry.src \
chart2/source/controller/dialogs/res_TextSeparator.src \
chart2/source/controller/dialogs/Strings_AdditionalControls.src \
diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk
index a146bf9..41a5fa9 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/3dviewdialog \
chart2/uiconfig/ui/attributedialog \
chart2/uiconfig/ui/insertaxisdlg \
chart2/uiconfig/ui/insertgriddlg \
diff --git a/chart2/source/controller/dialogs/ResourceIds.hrc
b/chart2/source/controller/dialogs/ResourceIds.hrc
index fa61cce..10effe1 100644
--- a/chart2/source/controller/dialogs/ResourceIds.hrc
+++ b/chart2/source/controller/dialogs/ResourceIds.hrc
@@ -30,7 +30,6 @@
#define DLG_DATA_SOURCE 901
#define DLG_DATA_DESCR 836
#define DLG_LEGEND 835
-#define DLG_3D_VIEW 752
#define DLG_SPLINE_PROPERTIES 904
#define DLG_DATA_YERRORBAR 842
#define DLG_SHAPE_FONT 921
diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx
b/chart2/source/controller/dialogs/dlg_View3D.cxx
index 7eda837..61f3826 100644
--- a/chart2/source/controller/dialogs/dlg_View3D.cxx
+++ b/chart2/source/controller/dialogs/dlg_View3D.cxx
@@ -18,7 +18,6 @@
*/
#include "dlg_View3D.hxx"
-#include "dlg_View3D.hrc"
#include "Strings.hrc"
#include "TabPages.hrc"
#include "ResId.hxx"
@@ -42,32 +41,28 @@ using namespace ::com::sun::star::chart2;
sal_uInt16 View3DDialog::m_nLastPageId = 0;
View3DDialog::View3DDialog(Window* pParent, const uno::Reference<
frame::XModel > & xChartModel, const XColorListRef &pColorTable )
- : TabDialog(pParent,SchResId(DLG_3D_VIEW))
- , m_aTabControl(this,SchResId(TABCTRL))
- , m_aBtnOK(this,SchResId(BTN_OK))
- , m_aBtnCancel(this,SchResId(BTN_CANCEL))
- , m_aBtnHelp(this,SchResId(BTN_HELP))
+ : TabDialog(pParent, "3DViewDialog", "modules/schart/ui/3dviewdialog.ui")
, m_pGeometry(0)
, m_pAppearance(0)
, m_pIllumination(0)
, m_aControllerLocker(xChartModel)
{
- FreeResource();
+ get(m_pTabControl, "tabcontrol");
uno::Reference< beans::XPropertySet > xSceneProperties(
ChartModelHelper::findDiagram( xChartModel ), uno::UNO_QUERY );
- m_pGeometry = new
ThreeD_SceneGeometry_TabPage(&m_aTabControl,xSceneProperties,m_aControllerLocker);
- m_pAppearance = new
ThreeD_SceneAppearance_TabPage(&m_aTabControl,xChartModel,m_aControllerLocker);
- m_pIllumination = new
ThreeD_SceneIllumination_TabPage(&m_aTabControl,xSceneProperties,xChartModel,pColorTable);
+ m_pGeometry = new
ThreeD_SceneGeometry_TabPage(m_pTabControl,xSceneProperties,m_aControllerLocker);
+ m_pAppearance = new
ThreeD_SceneAppearance_TabPage(m_pTabControl,xChartModel,m_aControllerLocker);
+ m_pIllumination = new
ThreeD_SceneIllumination_TabPage(m_pTabControl,xSceneProperties,xChartModel,pColorTable);
- m_aTabControl.InsertPage( TP_3D_SCENEGEOMETRY,
SCH_RESSTR(STR_PAGE_PERSPECTIVE) );
- m_aTabControl.InsertPage( TP_3D_SCENEAPPEARANCE,
SCH_RESSTR(STR_PAGE_APPEARANCE) );
- m_aTabControl.InsertPage( TP_3D_SCENEILLUMINATION,
SCH_RESSTR(STR_PAGE_ILLUMINATION) );
+ m_pTabControl->InsertPage( TP_3D_SCENEGEOMETRY,
SCH_RESSTR(STR_PAGE_PERSPECTIVE) );
+ m_pTabControl->InsertPage( TP_3D_SCENEAPPEARANCE,
SCH_RESSTR(STR_PAGE_APPEARANCE) );
+ m_pTabControl->InsertPage( TP_3D_SCENEILLUMINATION,
SCH_RESSTR(STR_PAGE_ILLUMINATION) );
- m_aTabControl.SetTabPage( TP_3D_SCENEGEOMETRY, m_pGeometry );
- m_aTabControl.SetTabPage( TP_3D_SCENEAPPEARANCE, m_pAppearance );
- m_aTabControl.SetTabPage( TP_3D_SCENEILLUMINATION, m_pIllumination );
+ m_pTabControl->SetTabPage( TP_3D_SCENEGEOMETRY, m_pGeometry );
+ m_pTabControl->SetTabPage( TP_3D_SCENEAPPEARANCE, m_pAppearance );
+ m_pTabControl->SetTabPage( TP_3D_SCENEILLUMINATION, m_pIllumination );
- m_aTabControl.SelectTabPage( m_nLastPageId );
+ m_pTabControl->SelectTabPage( m_nLastPageId );
}
View3DDialog::~View3DDialog()
@@ -76,7 +71,7 @@ View3DDialog::~View3DDialog()
delete m_pAppearance;
delete m_pIllumination;
- m_nLastPageId = m_aTabControl.GetCurPageId();
+ m_nLastPageId = m_pTabControl->GetCurPageId();
}
short View3DDialog::Execute()
diff --git a/chart2/source/controller/dialogs/dlg_View3D.hrc
b/chart2/source/controller/dialogs/dlg_View3D.hrc
deleted file mode 100644
index 3e4269f..0000000
--- a/chart2/source/controller/dialogs/dlg_View3D.hrc
+++ /dev/null
@@ -1,34 +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"
-
-//position and size defines:
-#define VIEW3D_PAGE_WIDTH 160
-#define VIEW3D_PAGE_HEIGHT 110
-
-//resource ids:
-
-#define TABCTRL 1
-
-#define BTN_OK 1
-#define BTN_CANCEL 2
-#define BTN_HELP 3
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/dlg_View3D.src
b/chart2/source/controller/dialogs/dlg_View3D.src
deleted file mode 100644
index dc74fb3..0000000
--- a/chart2/source/controller/dialogs/dlg_View3D.src
+++ /dev/null
@@ -1,41 +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 "dlg_View3D.hrc"
-#include "CommonResources.hrc"
-#include "HelpIds.hrc"
-
-TabDialog DLG_3D_VIEW
-{
- HelpID = HID_3D_VIEW ;
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Moveable = TRUE ;
- Size = MAP_APPFONT ( VIEW3D_PAGE_WIDTH , VIEW3D_PAGE_HEIGHT+40 ) ;
- Text [ en-US ] = "3D View" ;
- TabControl TABCTRL
- {
- OutputSize = TRUE ;
- Pos = MAP_APPFONT ( 3 , 3 ) ;
- Size = MAP_APPFONT ( VIEW3D_PAGE_WIDTH , VIEW3D_PAGE_HEIGHT ) ;
- };
- BUTTONS_OK_CANCEL_HELP_STACKED(VIEW3D_PAGE_HEIGHT+3)
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/HelpIds.hrc
b/chart2/source/controller/inc/HelpIds.hrc
index 2d0a4f3..2c85344 100644
--- a/chart2/source/controller/inc/HelpIds.hrc
+++ b/chart2/source/controller/inc/HelpIds.hrc
@@ -102,7 +102,6 @@
#define HID_SCH_STATISTIK_SHOW_NEGATIVE
"CHART2_HID_SCH_STATISTIK_SHOW_NEGATIVE"
#define HID_DIAGRAM_TYPE
"CHART2_HID_DIAGRAM_TYPE"
-#define HID_3D_VIEW
"CHART2_HID_3D_VIEW"
#define HID_DIAGRAM_DATA
"CHART2_HID_DIAGRAM_DATA"
#define HID_INSERT_STATISTICS
"CHART2_HID_INSERT_STATISTICS"
#define HID_INSERT_CHART_LEGEND
"CHART2_HID_INSERT_CHART_LEGEND"
diff --git a/chart2/source/controller/inc/dlg_View3D.hxx
b/chart2/source/controller/inc/dlg_View3D.hxx
index bfd6b12..f4a13a9 100644
--- a/chart2/source/controller/inc/dlg_View3D.hxx
+++ b/chart2/source/controller/inc/dlg_View3D.hxx
@@ -26,8 +26,6 @@
#include <vcl/tabdlg.hxx>
// header for class TabControl
#include <vcl/tabctrl.hxx>
-// header for class OKButton
-#include <vcl/button.hxx>
// header for class XColorList
#include <svx/xtable.hxx>
@@ -51,10 +49,7 @@ public:
virtual short Execute();
private:
- TabControl m_aTabControl;
- OKButton m_aBtnOK;
- CancelButton m_aBtnCancel;
- HelpButton m_aBtnHelp;
+ TabControl* m_pTabControl;
ThreeD_SceneGeometry_TabPage* m_pGeometry;
ThreeD_SceneAppearance_TabPage* m_pAppearance;
diff --git a/chart2/uiconfig/ui/3dviewdialog.ui
b/chart2/uiconfig/ui/3dviewdialog.ui
new file mode 100644
index 0000000..e32c1be
--- /dev/null
+++ b/chart2/uiconfig/ui/3dviewdialog.ui
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="3DViewDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">3D View</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">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>
+ <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-widgets>
+ </object>
+</interface>
diff --git a/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui
b/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui
index 429a789..6addfed 100644
--- a/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui
+++ b/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui
@@ -70,242 +70,303 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkLabel" id="FT_LIGHTSOURCE">
+ <object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Light source</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">BTN_LIGHT_1</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid" id="grid1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <object class="chartcontrollerlo-LightButton" id="BTN_LIGHT_1">
+ <object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Light source
1</property>
- <property name="image">IMG_LIGHT_1</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="chartcontrollerlo-LightButton"
id="BTN_LIGHT_1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup"
translatable="yes">Light source 1</property>
+ <property name="tooltip_text"
translatable="yes">Light source 1</property>
+ <property name="image">IMG_LIGHT_1</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="chartcontrollerlo-LightButton"
id="BTN_LIGHT_2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup"
translatable="yes">Light source 2</property>
+ <property name="tooltip_text"
translatable="yes">Light source 2</property>
+ <property name="image">IMG_LIGHT_2</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="chartcontrollerlo-LightButton"
id="BTN_LIGHT_3">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup"
translatable="yes">Light source 3</property>
+ <property name="tooltip_text"
translatable="yes">Light source 3</property>
+ <property name="image">IMG_LIGHT_3</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="chartcontrollerlo-LightButton"
id="BTN_LIGHT_4">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup"
translatable="yes">Light source 4</property>
+ <property name="tooltip_text"
translatable="yes">Light source 4</property>
+ <property name="image">IMG_LIGHT_4</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="chartcontrollerlo-LightButton"
id="BTN_LIGHT_5">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup"
translatable="yes">Light source 5</property>
+ <property name="tooltip_text"
translatable="yes">Light source 5</property>
+ <property name="image">IMG_LIGHT_5</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="chartcontrollerlo-LightButton"
id="BTN_LIGHT_6">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup"
translatable="yes">Light source 6</property>
+ <property name="tooltip_text"
translatable="yes">Light source 6</property>
+ <property name="image">IMG_LIGHT_6</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>
+ <child>
+ <object class="chartcontrollerlo-LightButton"
id="BTN_LIGHT_7">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup"
translatable="yes">Light source 7</property>
+ <property name="tooltip_text"
translatable="yes">Light source 7</property>
+ <property name="image">IMG_LIGHT_7</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="chartcontrollerlo-LightButton"
id="BTN_LIGHT_8">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup"
translatable="yes">Light source 8</property>
+ <property name="tooltip_text"
translatable="yes">Light source 8</property>
+ <property name="image">IMG_LIGHT_8</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</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">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="svxlo-ColorLB" id="LB_LIGHTSOURCE">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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="BTN_LIGHTSOURCE_COLOR">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup"
translatable="yes">Select a color using the color dialog</property>
+ <property name="tooltip_text"
translatable="yes">Select a color using the color dialog</property>
+ <property
name="image">IMG_LIGHTSOURCE_COLOR</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">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
</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="chartcontrollerlo-LightButton" id="BTN_LIGHT_2">
+ <child type="label">
+ <object class="GtkLabel" id="FT_LIGHTSOURCE">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Light source
2</property>
- <property name="image">IMG_LIGHT_2</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Light
source</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">BTN_LIGHT_1</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</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="chartcontrollerlo-LightButton" id="BTN_LIGHT_3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Light source
3</property>
- <property name="image">IMG_LIGHT_3</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="chartcontrollerlo-LightButton" id="BTN_LIGHT_4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Light source
4</property>
- <property name="image">IMG_LIGHT_4</property>
- </object>
- <packing>
- <property name="left_attach">3</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="chartcontrollerlo-LightButton" id="BTN_LIGHT_5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Light source
5</property>
- <property name="image">IMG_LIGHT_5</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="chartcontrollerlo-LightButton" id="BTN_LIGHT_6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Light source
6</property>
- <property name="image">IMG_LIGHT_6</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>
- <child>
- <object class="chartcontrollerlo-LightButton" id="BTN_LIGHT_7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Light source
7</property>
- <property name="image">IMG_LIGHT_7</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="chartcontrollerlo-LightButton" id="BTN_LIGHT_8">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Light source
8</property>
- <property name="image">IMG_LIGHT_8</property>
- </object>
- <packing>
- <property name="left_attach">3</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">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="svxlo-ColorLB" id="LB_LIGHTSOURCE">
- <property name="visible">True</property>
- <property name="can_focus">False</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="BTN_LIGHTSOURCE_COLOR">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Select a
color using the color dialog</property>
- <property name="image">IMG_LIGHTSOURCE_COLOR</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">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="FT_AMBIENTLIGHT">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Ambient light</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">LB_AMBIENTLIGHT</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box4">
+ <object class="GtkFrame" id="frame2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <object class="svxlo-ColorLB" id="LB_AMBIENTLIGHT">
+ <object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkBox" id="box4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="svxlo-ColorLB" id="LB_AMBIENTLIGHT">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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="BTN_AMBIENT_COLOR">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup"
translatable="yes">Select a color using the color dialog</property>
+ <property name="tooltip_text"
translatable="yes">Select a color using the color dialog</property>
+ <property name="image">IMG_AMBIENT_COLOR</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
- <child>
- <object class="GtkButton" id="BTN_AMBIENT_COLOR">
+ <child type="label">
+ <object class="GtkLabel" id="FT_AMBIENTLIGHT">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Select a
color using the color dialog</property>
- <property name="image">IMG_AMBIENT_COLOR</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Ambient
light</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">LB_AMBIENTLIGHT</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</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">4</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -320,6 +381,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Light
Preview</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
</object>
<packing>
<property name="expand">False</property>
commit 10583b74f0d6ad306ccc05676f97ab34e8cd229f
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Dec 9 20:39:33 2013 +0000
Updated core
Project: help 63d213bbd4e500d4bae0e36208c439ab2f346846
diff --git a/helpcontent2 b/helpcontent2
index 709409b..63d213b 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 709409b5a4b5f77127fdd6f9669f39530b382b63
+Subproject commit 63d213bbd4e500d4bae0e36208c439ab2f346846
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
