diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-07-08 16:27:04 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-07-08 18:40:11 +0100 |
commit | d0e65716347377628635c053ccb425d6284e3533 (patch) | |
tree | 02b9e186282577a295a9fefaa35dd1fdb8ea1f82 /sd | |
parent | 94956b3b29ae761a793363ec9e9e27fb612d7444 (diff) |
add degrees and pixels as known spin field units
Change-Id: I5937843a5c5485f469ef1fb6b5844aa15c33a14d
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/dlg/copydlg.cxx | 2 | ||||
-rw-r--r-- | sd/uiconfig/sdraw/ui/copydlg.ui | 36 |
2 files changed, 7 insertions, 31 deletions
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx index caf6956b87ee..4f8baa3c5e67 100644 --- a/sd/source/ui/dlg/copydlg.cxx +++ b/sd/source/ui/dlg/copydlg.cxx @@ -55,8 +55,6 @@ CopyDlg::CopyDlg(::Window* pWindow, const SfxItemSet& rInAttrs, get(m_pMtrFldMoveX, "x"); get(m_pMtrFldMoveY, "y"); get(m_pMtrFldAngle, "angle"); - m_pMtrFldAngle->SetUnit(FUNIT_CUSTOM); - m_pMtrFldAngle->SetCustomUnitText(get<FixedText>("degrees")->GetText()); get(m_pMtrFldWidth, "width"); get(m_pMtrFldHeight, "height"); get(m_pLbStartColor, "start"); diff --git a/sd/uiconfig/sdraw/ui/copydlg.ui b/sd/uiconfig/sdraw/ui/copydlg.ui index 6719126412ad..5d8f3207381f 100644 --- a/sd/uiconfig/sdraw/ui/copydlg.ui +++ b/sd/uiconfig/sdraw/ui/copydlg.ui @@ -228,6 +228,7 @@ <property name="xalign">0</property> <property name="label" translatable="yes">_Angle</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">angle:0degrees</property> </object> <packing> <property name="left_attach">0</property> @@ -269,36 +270,13 @@ </packing> </child> <child> - <object class="GtkBox" id="box3"> + <object class="GtkSpinButton" id="angle:0degrees"> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkSpinButton" id="angle:0"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="invisible_char">●</property> - <property name="invisible_char_set">True</property> - <property name="adjustment">adjustment2</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="degrees"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="label" translatable="yes"> degrees</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="invisible_char">●</property> + <property name="invisible_char_set">True</property> + <property name="adjustment">adjustment2</property> </object> <packing> <property name="left_attach">1</property> |