[Libreoffice-commits] core.git: sd/source sd/uiconfig
Caolán McNamara
caolanm at redhat.com
Wed Jun 5 06:47:28 PDT 2013
sd/source/ui/dlg/tpoption.cxx | 15 -
sd/source/ui/inc/tpoption.hxx | 1
sd/uiconfig/simpress/ui/optimpressgeneralpage.ui | 301 ++++++++++++-----------
3 files changed, 173 insertions(+), 144 deletions(-)
New commits:
commit d691f4c9ed8de07dd902a98dbe5683de830b023c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jun 5 14:45:23 2013 +0100
various fixes to impress/draw general opt page
restore original mnemonics
get range of adjustments right
fix height and metric spellings, cosmetic, but it'll bug me
Change-Id: I94a7980d5513f8bfe29bc702bcf902037e1961b6
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index bb88975..b3084b4 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -217,6 +217,7 @@ SdTpOptionsMisc::SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs )
{
get(m_pCbxQuickEdit , "qickedit");
get(m_pCbxPickThrough , "textselected");
+ get(m_pNewDocumentFrame, "newdocumentframe");
get(m_pCbxStartWithTemplate,"startwithwizard");
get(m_pCbxMasterPageCache , "backgroundback");
get(m_pCbxCopy , "copywhenmove");
@@ -225,15 +226,15 @@ SdTpOptionsMisc::SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs )
get(m_pCbxStartWithActualPage , "strtwithPag");
get(m_pCbxEnableSdremote , "enremotcont");
get(m_pCbxEnablePresenterScreen , "enprsntcons");
- get(m_pCbxUsePrinterMetrics , "printermetrc");
+ get(m_pCbxUsePrinterMetrics , "printermetrics");
get(m_pPresentationFrame , "presentationframe");
get(m_pScaleFrame , "scaleframe");
get(m_pCbScale , "scaleBox");
- get(m_pMtrFldTabstop , "metericFields");
- get(m_pMtrFldOriginalWidth , "metericWidthFields");
- get(m_pMtrFldOriginalHeight , "metericHighteFields");
- get(m_pMtrFldInfo1 , "metericInfo1Fields");
- get(m_pMtrFldInfo2 , "metericInfo2Fields");
+ get(m_pMtrFldTabstop , "metricFields");
+ get(m_pMtrFldOriginalWidth , "metricWidthFields");
+ get(m_pMtrFldOriginalHeight , "metricHeightFields");
+ get(m_pMtrFldInfo1 , "metricInfo1Fields");
+ get(m_pMtrFldInfo2 , "metricInfo2Fields");
get(m_pCbxCompatibility ,"cbCompatibility" );
get(m_pFiInfo1 , "info1");
get(m_pFiInfo2 , "info2");
@@ -566,7 +567,7 @@ void SdTpOptionsMisc::SetImpressMode (void)
void SdTpOptionsMisc::SetDrawMode()
{
m_pScaleFrame->Show();
- m_pCbxStartWithTemplate->Hide();
+ m_pNewDocumentFrame->Hide();
m_pCbxStartWithActualPage->Hide();
m_pCbxEnableSdremote->Hide();
m_pCbxEnablePresenterScreen->Hide();
diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx
index 244eb44..f914686 100644
--- a/sd/source/ui/inc/tpoption.hxx
+++ b/sd/source/ui/inc/tpoption.hxx
@@ -79,6 +79,7 @@ private:
CheckBox *m_pCbxQuickEdit;
CheckBox *m_pCbxPickThrough;
+ VclFrame *m_pNewDocumentFrame;
CheckBox *m_pCbxStartWithTemplate;
CheckBox *m_pCbxMasterPageCache;
diff --git a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
index 7ff7d7e..4f16735 100644
--- a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
+++ b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
@@ -6,6 +6,7 @@
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkFrame" id="frame2">
<property name="visible">True</property>
@@ -23,7 +24,9 @@
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="column_spacing">69</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <property name="column_homogeneous">True</property>
<child>
<object class="GtkCheckButton" id="qickedit">
<property name="label" translatable="yes">Allow quick editing</property>
@@ -83,7 +86,7 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame3">
+ <object class="GtkFrame" id="newdocumentframe">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
@@ -99,9 +102,11 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="startwithwizard">
- <property name="label" translatable="yes">Start with wizard</property>
+ <property name="label" translatable="yes">Start with _wizard</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -155,6 +160,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<property name="column_homogeneous">True</property>
<child>
@@ -192,39 +198,6 @@
</packing>
</child>
<child>
- <object class="GtkComboBoxText" id="units">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_span_column">7</property>
- <property name="add_tearoffs">True</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="ypad">1</property>
- <property name="label" translatable="yes">Unit of _measurement</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">units</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
<object class="GtkCheckButton" id="backgroundback">
<property name="label" translatable="yes">Use background back</property>
<property name="visible">True</property>
@@ -242,25 +215,6 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="tapstoplabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="double_buffered">False</property>
- <property name="xpad">40</property>
- <property name="label" translatable="yes">Tab sto_ps</property>
- <property name="use_underline">True</property>
- <property name="justify">fill</property>
- <property name="mnemonic_widget">metericFields:0.00mm</property>
- <property name="track_visited_links">False</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
<object class="GtkCheckButton" id="distrotcb">
<property name="label" translatable="yes">Do not distort objects in curve</property>
<property name="visible">True</property>
@@ -279,43 +233,97 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="metericFields:0,00mm">
+ <object class="GtkGrid" id="grid4">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="digits">1</property>
- <property name="adjustment">adjustment1</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Unit of _measurement</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">units</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="GtkComboBoxText" id="units">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_span_column">7</property>
+ <property name="add_tearoffs">True</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</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>
</object>
<packing>
- <property name="left_attach">3</property>
+ <property name="left_attach">0</property>
<property name="top_attach">4</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
+ <object class="GtkGrid" id="grid8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="tapstoplabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="double_buffered">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Ta_b stops</property>
+ <property name="use_underline">True</property>
+ <property name="justify">fill</property>
+ <property name="mnemonic_widget">metricFields:0,00mm</property>
+ <property name="track_visited_links">False</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="GtkSpinButton" id="metricFields:0,00mm">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment1</property>
+ <property name="digits">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>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
</child>
</object>
</child>
@@ -356,6 +364,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
<child>
<object class="GtkCheckButton" id="strtwithPag">
<property name="label" translatable="yes">Always with current page</property>
@@ -445,56 +454,34 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="double_buffered">False</property>
- <property name="row_spacing">50</property>
- <property name="column_spacing">50</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="double_buffered">False</property>
<property name="margin_right">3</property>
- <property name="label" translatable="yes">Drawin_g scale</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Drawing scale</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">scaleBox</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">2</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="scaleBox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_span_column">300</property>
- <property name="column_span_column">2</property>
- <property name="active">0</property>
- <property name="button_sensitivity">off</property>
- <property name="has_entry">True</property>
- <property name="popup_fixed_width">False</property>
- <child internal-child="entry">
- <object class="GtkEntry" id="combobox-entry2">
- <property name="can_focus">False</property>
- <property name="xalign">0.5</property>
- <property name="shadow_type">none</property>
- <property name="caps_lock_warning">False</property>
- </object>
- </child>
- </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="GtkLabel" id="widthlbl">
- <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Width</property>
+ <property name="no_show_all">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Page _width</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">metricWidthFields:0.00mm</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -505,9 +492,12 @@
</child>
<child>
<object class="GtkLabel" id="heightlbl">
- <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Height</property>
+ <property name="no_show_all">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Page _height</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">metricHeightFields:0.00mm</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -517,10 +507,11 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="metericWidthFields:0.00mm">
- <property name="visible">True</property>
+ <object class="GtkSpinButton" id="metricWidthFields:0.00mm">
<property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
<property name="invisible_char">•</property>
+ <property name="digits">2</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -530,10 +521,11 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="metericHighteFields:0.00mm">
- <property name="visible">True</property>
+ <object class="GtkSpinButton" id="metricHeightFields:0.00mm">
<property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
<property name="invisible_char">•</property>
+ <property name="digits">2</property>
</object>
<packing>
<property name="left_attach">3</property>
@@ -544,9 +536,12 @@
</child>
<child>
<object class="GtkLabel" id="info1">
- <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">info1</property>
+ <property name="no_show_all">True</property>
+ <property name="xalign">0</property>
+ <property name="label">info1</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">metricInfo1Fields:0.00mm</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -556,9 +551,9 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="metericInfo1Fields:0.00mm">
- <property name="visible">True</property>
+ <object class="GtkSpinButton" id="metricInfo1Fields:0.00mm">
<property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
<property name="invisible_char">•</property>
<property name="invisible_char_set">True</property>
</object>
@@ -571,11 +566,12 @@
</child>
<child>
<object class="GtkLabel" id="info2">
- <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0.47999998927116394</property>
- <property name="yalign">0.43000000715255737</property>
- <property name="label" translatable="yes">info2</property>
+ <property name="no_show_all">True</property>
+ <property name="xalign">0</property>
+ <property name="label">info2</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">metricInfo2Fields:0.00mm</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -585,9 +581,9 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="metericInfo2Fields:0.00mm">
- <property name="visible">True</property>
+ <object class="GtkSpinButton" id="metricInfo2Fields:0.00mm">
<property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
<property name="invisible_char">•</property>
<property name="invisible_char_set">True</property>
</object>
@@ -601,6 +597,36 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="scaleBox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_span_column">300</property>
+ <property name="column_span_column">2</property>
+ <property name="active">0</property>
+ <property name="button_sensitivity">off</property>
+ <property name="has_entry">True</property>
+ <property name="popup_fixed_width">False</property>
+ <child internal-child="entry">
+ <object class="GtkEntry" id="combobox-entry">
+ <property name="can_focus">False</property>
+ <property name="invisible_char">â—</property>
+ <property name="xalign">0.5</property>
+ <property name="shadow_type">none</property>
+ <property name="caps_lock_warning">False</property>
+ </object>
+ </child>
+ </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>
</object>
</child>
</object>
@@ -638,9 +664,10 @@
<object class="GtkGrid" id="grid6">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
<child>
- <object class="GtkCheckButton" id="printermetrc">
- <property name="label" translatable="yes">Use printer metrics for document formatting</property>
+ <object class="GtkCheckButton" id="printermetrics">
+ <property name="label" translatable="yes">Us_e printer metrics for document formatting</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -657,7 +684,7 @@
</child>
<child>
<object class="GtkCheckButton" id="cbCompatibility">
- <property name="label" translatable="yes">Add spacing between paragraphs and tables (in current document)</property>
+ <property name="label" translatable="yes">Add _spacing between paragraphs and tables (in current document)</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -698,9 +725,9 @@
</object>
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">5</property>
- <property name="upper">2000</property>
- <property name="value">50</property>
- <property name="step_increment">10</property>
- <property name="page_increment">10</property>
+ <property name="upper">200</property>
+ <property name="value">5</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">1</property>
</object>
</interface>
More information about the Libreoffice-commits
mailing list