diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-09-25 15:36:40 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-09-25 17:20:31 +0100 |
commit | 892a7be963f5ffdb5af86a9de1cf8a613fbdc162 (patch) | |
tree | fad8ae447fea44c295abe8d5b74562659b655793 /chart2/uiconfig/ui | |
parent | Related: fdo#83010 implement wrapping on reaching NumericFormatter limits (diff) | |
download | core-892a7be963f5ffdb5af86a9de1cf8a613fbdc162.tar.gz core-892a7be963f5ffdb5af86a9de1cf8a613fbdc162.zip |
Resolves: fdo#83010 remove svx::WrapField
in favour of a wrap property on NumericField
Change-Id: I62c6bdb69a16f37ae6018a2fe41070fb18dbe4a0
Diffstat (limited to 'chart2/uiconfig/ui')
-rw-r--r-- | chart2/uiconfig/ui/dlg_DataLabel.ui | 183 | ||||
-rw-r--r-- | chart2/uiconfig/ui/titlerotationtabpage.ui | 2 | ||||
-rw-r--r-- | chart2/uiconfig/ui/tp_DataLabel.ui | 6 | ||||
-rw-r--r-- | chart2/uiconfig/ui/tp_PolarOptions.ui | 7 | ||||
-rw-r--r-- | chart2/uiconfig/ui/tp_axisLabel.ui | 6 |
5 files changed, 104 insertions, 100 deletions
diff --git a/chart2/uiconfig/ui/dlg_DataLabel.ui b/chart2/uiconfig/ui/dlg_DataLabel.ui index 2910aba77ba1..cd35953f7f80 100644 --- a/chart2/uiconfig/ui/dlg_DataLabel.ui +++ b/chart2/uiconfig/ui/dlg_DataLabel.ui @@ -1,12 +1,101 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.16.1 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <!-- interface-requires LibreOffice 1.0 --> <object class="GtkAdjustment" id="adjustmentDEGREE"> <property name="upper">359</property> <property name="step_increment">1</property> <property name="page_increment">10</property> </object> + <object class="GtkListStore" id="liststorePLACEMENT"> + <columns> + <!-- column-name gchararray1 --> + <column type="gchararray"/> + <!-- column-name guint1 --> + <column type="guint"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">Best fit</col> + <col id="1">0</col> + </row> + <row> + <col id="0" translatable="yes">Center</col> + <col id="1">1</col> + </row> + <row> + <col id="0" translatable="yes">Above</col> + <col id="1">2</col> + </row> + <row> + <col id="0" translatable="yes">Top left</col> + <col id="1">3</col> + </row> + <row> + <col id="0" translatable="yes">Left</col> + <col id="1">4</col> + </row> + <row> + <col id="0" translatable="yes">Bottom left</col> + <col id="1">5</col> + </row> + <row> + <col id="0" translatable="yes">Below</col> + <col id="1">6</col> + </row> + <row> + <col id="0" translatable="yes">Bottom right</col> + <col id="1">7</col> + </row> + <row> + <col id="0" translatable="yes">Right</col> + <col id="1">8</col> + </row> + <row> + <col id="0" translatable="yes">Top right</col> + <col id="1">9</col> + </row> + <row> + <col id="0" translatable="yes">Inside</col> + <col id="1">10</col> + </row> + <row> + <col id="0" translatable="yes">Outside</col> + <col id="1">11</col> + </row> + <row> + <col id="0" translatable="yes">Near origin</col> + <col id="1">12</col> + </row> + </data> + </object> + <object class="GtkListStore" id="liststoreSEPARATOR"> + <columns> + <!-- column-name gchararray1 --> + <column type="gchararray"/> + <!-- column-name guint1 --> + <column type="guint"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">Space</col> + <col id="1">0</col> + </row> + <row> + <col id="0" translatable="yes">Comma</col> + <col id="1">1</col> + </row> + <row> + <col id="0" translatable="yes">Semicolon</col> + <col id="1">2</col> + </row> + <row> + <col id="0" translatable="yes">New line</col> + <col id="1">3</col> + </row> + </data> + </object> <object class="GtkDialog" id="dlg_DataLabels"> <property name="can_focus">False</property> <property name="border_width">6</property> @@ -366,13 +455,13 @@ </packing> </child> <child> - <object class="svxlo-WrapField" id="NF_LABEL_DEGREES"> + <object class="GtkSpinButton" id="NF_LABEL_DEGREES"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="invisible_char">•</property> - <property name="invisible_char_set">True</property> <property name="adjustment">adjustmentDEGREE</property> + <property name="wrap">True</property> </object> <packing> <property name="expand">False</property> @@ -474,94 +563,6 @@ <action-widget response="0">help</action-widget> </action-widgets> </object> - <object class="GtkListStore" id="liststorePLACEMENT"> - <columns> - <!-- column-name gchararray1 --> - <column type="gchararray"/> - <!-- column-name guint1 --> - <column type="guint"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">Best fit</col> - <col id="1">0</col> - </row> - <row> - <col id="0" translatable="yes">Center</col> - <col id="1">1</col> - </row> - <row> - <col id="0" translatable="yes">Above</col> - <col id="1">2</col> - </row> - <row> - <col id="0" translatable="yes">Top left</col> - <col id="1">3</col> - </row> - <row> - <col id="0" translatable="yes">Left</col> - <col id="1">4</col> - </row> - <row> - <col id="0" translatable="yes">Bottom left</col> - <col id="1">5</col> - </row> - <row> - <col id="0" translatable="yes">Below</col> - <col id="1">6</col> - </row> - <row> - <col id="0" translatable="yes">Bottom right</col> - <col id="1">7</col> - </row> - <row> - <col id="0" translatable="yes">Right</col> - <col id="1">8</col> - </row> - <row> - <col id="0" translatable="yes">Top right</col> - <col id="1">9</col> - </row> - <row> - <col id="0" translatable="yes">Inside</col> - <col id="1">10</col> - </row> - <row> - <col id="0" translatable="yes">Outside</col> - <col id="1">11</col> - </row> - <row> - <col id="0" translatable="yes">Near origin</col> - <col id="1">12</col> - </row> - </data> - </object> - <object class="GtkListStore" id="liststoreSEPARATOR"> - <columns> - <!-- column-name gchararray1 --> - <column type="gchararray"/> - <!-- column-name guint1 --> - <column type="guint"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">Space</col> - <col id="1">0</col> - </row> - <row> - <col id="0" translatable="yes">Comma</col> - <col id="1">1</col> - </row> - <row> - <col id="0" translatable="yes">Semicolon</col> - <col id="1">2</col> - </row> - <row> - <col id="0" translatable="yes">New line</col> - <col id="1">3</col> - </row> - </data> - </object> <object class="GtkSizeGroup" id="sizegroup1"> <widgets> <widget name="FT_TEXT_SEPARATOR"/> diff --git a/chart2/uiconfig/ui/titlerotationtabpage.ui b/chart2/uiconfig/ui/titlerotationtabpage.ui index 7ee9e7a0c948..6e0eb4356e5e 100644 --- a/chart2/uiconfig/ui/titlerotationtabpage.ui +++ b/chart2/uiconfig/ui/titlerotationtabpage.ui @@ -33,7 +33,7 @@ <property name="row_spacing">6</property> <property name="column_spacing">12</property> <child> - <object class="svxlo-WrapField" id="OrientDegree"> + <object class="GtkSpinButton" id="OrientDegree"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="margin_top">40</property> diff --git a/chart2/uiconfig/ui/tp_DataLabel.ui b/chart2/uiconfig/ui/tp_DataLabel.ui index 798c9350edbc..b31bb2e1f895 100644 --- a/chart2/uiconfig/ui/tp_DataLabel.ui +++ b/chart2/uiconfig/ui/tp_DataLabel.ui @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.16.1 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <!-- interface-requires LibreOffice 1.0 --> <object class="GtkAdjustment" id="adjustmentDEGREE"> <property name="upper">359</property> @@ -387,12 +388,13 @@ </packing> </child> <child> - <object class="svxlo-WrapField" id="NF_LABEL_DEGREES"> + <object class="GtkSpinButton" id="NF_LABEL_DEGREES"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="invisible_char">•</property> <property name="adjustment">adjustmentDEGREE</property> + <property name="wrap">True</property> </object> <packing> <property name="expand">False</property> diff --git a/chart2/uiconfig/ui/tp_PolarOptions.ui b/chart2/uiconfig/ui/tp_PolarOptions.ui index edf84f0a02d7..6f5d8d85ebc9 100644 --- a/chart2/uiconfig/ui/tp_PolarOptions.ui +++ b/chart2/uiconfig/ui/tp_PolarOptions.ui @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.16.1 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <!-- interface-requires LibreOffice 1.0 --> <object class="GtkAdjustment" id="adjustmentDEGREE"> <property name="upper">359</property> @@ -85,13 +86,13 @@ </packing> </child> <child> - <object class="svxlo-WrapField" id="NF_STARTING_ANGLE"> + <object class="GtkSpinButton" id="NF_STARTING_ANGLE"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> <property name="invisible_char">•</property> - <property name="invisible_char_set">True</property> <property name="adjustment">adjustmentDEGREE</property> + <property name="wrap">True</property> </object> <packing> <property name="expand">False</property> diff --git a/chart2/uiconfig/ui/tp_axisLabel.ui b/chart2/uiconfig/ui/tp_axisLabel.ui index 4727c9d40eea..74d6fa5f315c 100644 --- a/chart2/uiconfig/ui/tp_axisLabel.ui +++ b/chart2/uiconfig/ui/tp_axisLabel.ui @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.16.1 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <!-- interface-requires LibreOffice 1.0 --> <object class="GtkAdjustment" id="adjustmentSpinDegrees"> <property name="upper">359</property> @@ -255,12 +256,11 @@ <property name="row_spacing">6</property> <property name="column_spacing">12</property> <child> - <object class="svxlo-WrapField" id="OrientDegree"> + <object class="GtkSpinButton" id="OrientDegree"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="margin_top">40</property> <property name="invisible_char">•</property> - <property name="invisible_char_set">True</property> <property name="progress_pulse_step">1</property> <property name="adjustment">adjustmentSpinDegrees</property> <property name="wrap">True</property> |