[Libreoffice-commits] core.git: include/svx sd/source svx/inc svx/source svx/uiconfig
Caolán McNamara
caolanm at redhat.com
Mon Jul 8 07:49:13 PDT 2013
include/svx/optgrid.hxx | 25 +++++++++++++------------
sd/source/ui/dlg/tpoption.cxx | 11 +----------
svx/inc/helpid.hrc | 1 -
svx/source/dialog/optgrid.cxx | 1 +
svx/uiconfig/ui/optgridpage.ui | 27 +++++++++++++++++++++++++--
5 files changed, 40 insertions(+), 25 deletions(-)
New commits:
commit b78f61458be8f1428e0f3acaed373659854415ba
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 8 15:48:03 2013 +0100
little tweak to get the two hidden frames shown in draw/impress
Change-Id: Icd4b81749a369828c45101b1b82f4e3a5e8ebb9a
diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx
index 9da5493..bc0b6e7 100644
--- a/include/svx/optgrid.hxx
+++ b/include/svx/optgrid.hxx
@@ -122,18 +122,19 @@ private:
CheckBox* pCbxSynchronize;
protected:
- //these controls are used in draw and impress
- CheckBox* pCbxSnapHelplines;
- CheckBox* pCbxSnapBorder;
- CheckBox* pCbxSnapFrame;
- CheckBox* pCbxSnapPoints;
- MetricField* pMtrFldSnapArea;
-
- CheckBox* pCbxOrtho;
- CheckBox* pCbxBigOrtho;
- CheckBox* pCbxRotate;
- MetricField* pMtrFldAngle;
- MetricField* pMtrFldBezAngle;
+ //these controls are used in draw and impress
+ VclContainer* pSnapFrames;
+ CheckBox* pCbxSnapHelplines;
+ CheckBox* pCbxSnapBorder;
+ CheckBox* pCbxSnapFrame;
+ CheckBox* pCbxSnapPoints;
+ MetricField* pMtrFldSnapArea;
+
+ CheckBox* pCbxOrtho;
+ CheckBox* pCbxBigOrtho;
+ CheckBox* pCbxRotate;
+ MetricField* pMtrFldAngle;
+ MetricField* pMtrFldBezAngle;
private:
sal_Bool bAttrModified;
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index 3e32ed3..da7e24e 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -49,16 +49,7 @@ using namespace ::com::sun::star::uno;
SdTpOptionsSnap::SdTpOptionsSnap( Window* pParent, const SfxItemSet& rInAttrs ) :
SvxGridTabPage(pParent, rInAttrs)
{
- pCbxSnapHelplines->Show();
- pCbxSnapBorder->Show();
- pCbxSnapFrame->Show();
- pCbxSnapPoints->Show();
- pMtrFldSnapArea->Show();
- pCbxOrtho->Show();
- pCbxBigOrtho->Show();
- pCbxRotate->Show();
- pMtrFldAngle->Show();
- pMtrFldBezAngle->Show();
+ pSnapFrames->Show();
}
// -----------------------------------------------------------------------
diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index ddfb233..e9e1666 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -143,7 +143,6 @@
#define HID_MNU_ZOOM_OPTIMAL "SVX_HID_MNU_ZOOM_OPTIMAL"
#define HID_MNU_ZOOM_PAGE_WIDTH "SVX_HID_MNU_ZOOM_PAGE_WIDTH"
#define HID_MNU_ZOOM_WHOLE_PAGE "SVX_HID_MNU_ZOOM_WHOLE_PAGE"
-#define HID_OPTIONS_GRID "SVX_HID_OPTIONS_GRID"
#define HID_PASSWORD "SVX_HID_PASSWORD"
#define HID_POPUP_COLOR "SVX_HID_POPUP_COLOR"
#define HID_POPUP_COLOR_CTRL "SVX_HID_POPUP_COLOR_CTRL"
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index 662f4ec..95350c2 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -139,6 +139,7 @@ SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) :
get(pNumFldDivisionY,"numflddivisiony");
get(pCbxSynchronize,"synchronize");
+ get(pSnapFrames,"snapframes");
get(pCbxSnapHelplines,"snaphelplines");
get(pCbxSnapBorder,"snapborder");
get(pCbxSnapFrame,"snapframe");
diff --git a/svx/uiconfig/ui/optgridpage.ui b/svx/uiconfig/ui/optgridpage.ui
index db71011..f027e83 100644
--- a/svx/uiconfig/ui/optgridpage.ui
+++ b/svx/uiconfig/ui/optgridpage.ui
@@ -31,6 +31,7 @@
<object class="GtkBox" id="OptGridPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
@@ -404,14 +405,15 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box3">
- <property name="sensitive">False</property>
+ <object class="GtkBox" id="snapframes">
<property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
<property name="spacing">12</property>
<child>
<object class="GtkFrame" id="frame4">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
@@ -560,6 +562,7 @@
<object class="GtkFrame" id="frame5">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
@@ -621,6 +624,9 @@
<property name="invisible_char">â—</property>
<property name="adjustment">adjustment4</property>
<property name="digits">2</property>
+ <accessibility>
+ <relation type="labelled-by" target="rotate"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">1</property>
@@ -638,6 +644,9 @@
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
+ <accessibility>
+ <relation type="label-for" target="mtrfldangle:0.00 degrees"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">0</property>
@@ -714,4 +723,18 @@
</packing>
</child>
</object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <property name="ignore_hidden">True</property>
+ <widgets>
+ <widget name="frame2"/>
+ <widget name="frame4"/>
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup2">
+ <property name="ignore_hidden">True</property>
+ <widgets>
+ <widget name="frame3"/>
+ <widget name="frame5"/>
+ </widgets>
+ </object>
</interface>
More information about the Libreoffice-commits
mailing list