chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx | 40 ++++-----------
chart2/source/controller/inc/HelpIds.hrc | 2
chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx | 2
chart2/uiconfig/ui/insertaxisdlg.ui | 22 ++------
chart2/uiconfig/ui/insertgriddlg.ui | 22 ++------
5 files changed, 26 insertions(+), 62 deletions(-)
New commits:
commit 1c7e0ba6cd9b1ce6a3e1c65460a3a0849bcb3189
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Jul 11 10:49:11 2013 +0100
post .ui conversion we can remove explicit SetPosPixel and HelpIds
Change-Id: I2b7ff3e667ce1085676168e19a9c4ce7c404ac0b
diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
index a31f514..9b59ed4 100644
--- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
@@ -50,16 +50,15 @@ InsertAxisOrGridDialogData::InsertAxisOrGridDialogData()
//
//==============================
-SchAxisDlg::SchAxisDlg( Window* pWindow
- , const InsertAxisOrGridDialogData& rInput, sal_Bool
bAxisDlg )
- : ModalDialog(pWindow,
- bAxisDlg ?
- OString("InsertAxisDialog") :
- OString("InsertGridDialog"),
- bAxisDlg ?
- OUString("modules/schart/ui/insertaxisdlg.ui") :
- OUString("modules/schart/ui/insertgriddlg.ui"))
- //rOutAttrs( rInAttrs )
+SchAxisDlg::SchAxisDlg(Window* pWindow,
+ const InsertAxisOrGridDialogData& rInput, bool bAxisDlg)
+ : ModalDialog(pWindow,
+ bAxisDlg ?
+ OString("InsertAxisDialog") :
+ OString("InsertGridDialog"),
+ bAxisDlg ?
+ OUString("modules/schart/ui/insertaxisdlg.ui") :
+ OUString("modules/schart/ui/insertgriddlg.ui"))
{
get(m_pCbPrimaryX, "primaryX");
get(m_pCbPrimaryY, "primaryY");
@@ -68,28 +67,11 @@ SchAxisDlg::SchAxisDlg( Window* pWindow
get(m_pCbSecondaryY, "secondaryY");
get(m_pCbSecondaryZ, "secondaryZ");
- if(!bAxisDlg)
- {
- SetHelpId( HID_INSERT_GRIDS );
-
- m_pCbPrimaryX->SetHelpId( HID_SCH_CB_XGRID );
- m_pCbPrimaryY->SetHelpId( HID_SCH_CB_YGRID );
- m_pCbPrimaryZ->SetHelpId( HID_SCH_CB_ZGRID );
- m_pCbSecondaryX->SetHelpId( HID_SCH_CB_SECONDARY_XGRID );
- m_pCbSecondaryY->SetHelpId( HID_SCH_CB_SECONDARY_YGRID );
- m_pCbSecondaryZ->SetHelpId( HID_SCH_CB_SECONDARY_ZGRID );
- }
- else
+ if (bAxisDlg)
{
//todo: remove if secondary z axis are possible somewhere
- {
- m_pCbSecondaryZ->Hide();
-
- Size aSize( GetSizePixel() );
- aSize.Height() -= ( m_pCbSecondaryZ->GetPosPixel().Y() -
m_pCbSecondaryY->GetPosPixel().Y() );
- SetSizePixel(aSize);
- }
+ m_pCbSecondaryZ->Hide();
}
m_pCbPrimaryX->Check( rInput.aExistenceList[0] );
diff --git a/chart2/source/controller/inc/HelpIds.hrc
b/chart2/source/controller/inc/HelpIds.hrc
index 26ee1c8..32d5f6a 100644
--- a/chart2/source/controller/inc/HelpIds.hrc
+++ b/chart2/source/controller/inc/HelpIds.hrc
@@ -139,8 +139,6 @@
#define HID_SCH_STATISTIK_SHOW_POSITIVE
"CHART2_HID_SCH_STATISTIK_SHOW_POSITIVE"
#define HID_SCH_STATISTIK_SHOW_NEGATIVE
"CHART2_HID_SCH_STATISTIK_SHOW_NEGATIVE"
-#define HID_INSERT_GRIDS
"CHART2_HID_INSERT_GRIDS"
-
#define HID_DIAGRAM_TYPE
"CHART2_HID_DIAGRAM_TYPE"
#define HID_3D_VIEW
"CHART2_HID_3D_VIEW"
#define HID_DIAGRAM_DATA
"CHART2_HID_DIAGRAM_DATA"
diff --git a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx
b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx
index 37c9589..868a657 100644
--- a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx
+++ b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx
@@ -56,7 +56,7 @@ protected:
CheckBox* m_pCbSecondaryZ;
public:
- SchAxisDlg( Window* pParent, const InsertAxisOrGridDialogData& rInput,
sal_Bool bAxisDlg=true );
+ SchAxisDlg(Window* pParent, const InsertAxisOrGridDialogData& rInput, bool
bAxisDlg=true);
virtual ~SchAxisDlg();
void getResult( InsertAxisOrGridDialogData& rOutput );
diff --git a/chart2/uiconfig/ui/insertaxisdlg.ui
b/chart2/uiconfig/ui/insertaxisdlg.ui
index 9c686f4..3062d09 100644
--- a/chart2/uiconfig/ui/insertaxisdlg.ui
+++ b/chart2/uiconfig/ui/insertaxisdlg.ui
@@ -3,18 +3,18 @@
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="InsertAxisDialog">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Axes</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox3">
<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_area3">
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="layout_style">start</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="ok">
<property name="label">gtk-ok</property>
@@ -23,7 +23,6 @@
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -38,7 +37,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -53,7 +51,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
<property name="image_position">top</property>
</object>
@@ -75,13 +72,15 @@
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="spacing">12</property>
+ <property name="homogeneous">True</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
@@ -103,7 +102,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property
name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -120,7 +118,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property
name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -137,7 +134,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property
name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -175,7 +171,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
@@ -197,7 +192,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property
name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -214,7 +208,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property
name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -231,7 +224,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property
name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
diff --git a/chart2/uiconfig/ui/insertgriddlg.ui
b/chart2/uiconfig/ui/insertgriddlg.ui
index bbf6e90..428f9c4 100644
--- a/chart2/uiconfig/ui/insertgriddlg.ui
+++ b/chart2/uiconfig/ui/insertgriddlg.ui
@@ -3,18 +3,18 @@
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="InsertGridDialog">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Grids</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="orientation">vertical</property>
- <property name="layout_style">start</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="ok">
<property name="label">gtk-ok</property>
@@ -23,7 +23,6 @@
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -38,7 +37,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -53,7 +51,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
<property name="image_position">top</property>
</object>
@@ -75,13 +72,15 @@
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="spacing">12</property>
+ <property name="homogeneous">True</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
@@ -103,7 +102,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property
name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -120,7 +118,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property
name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -137,7 +134,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property
name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -175,7 +171,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
@@ -197,7 +192,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property
name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -214,7 +208,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property
name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -231,7 +224,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property
name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
