[Libreoffice-commits] core.git: cui/uiconfig include/tools rsc/source vcl/source
Caolán McNamara
caolanm at redhat.com
Sun Aug 18 05:48:05 PDT 2013
cui/uiconfig/ui/textanimtabpage.ui | 153 ++++++++++++++++++++++++++-----------
include/tools/fldunit.hxx | 2
rsc/source/parser/rscibas.cxx | 1
vcl/source/control/field.cxx | 4
vcl/source/src/units.src | 1
vcl/source/window/builder.cxx | 2
6 files changed, 119 insertions(+), 44 deletions(-)
New commits:
commit cc0b40f6a94f05b36b31b1a7a55431e1b5f2608e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Aug 18 13:00:45 2013 +0100
add some a11y relations and enable translation of ms
Change-Id: Ib509a7ae62aefc919bdaed269c1605ac6bae9564
diff --git a/cui/uiconfig/ui/textanimtabpage.ui b/cui/uiconfig/ui/textanimtabpage.ui
index 249d920..dc74c15 100644
--- a/cui/uiconfig/ui/textanimtabpage.ui
+++ b/cui/uiconfig/ui/textanimtabpage.ui
@@ -6,7 +6,7 @@
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkFrame" id="FL_EFFECT">
<property name="visible">True</property>
@@ -23,13 +23,40 @@
<object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
+ <property name="hexpand">True</property>
+ <property name="spacing">18</property>
<child>
- <object class="GtkLabel" id="FT_EFFECTS">
+ <object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">E_ffect:</property>
- <property name="use_underline">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="FT_EFFECTS">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">E_ffect:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">LB_EFFECT</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="LB_EFFECT">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="model">liststoreEFFECT</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -38,28 +65,19 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="LB_EFFECT">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="model">liststoreEFFECT</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
<object class="GtkBox" id="boxDIRECTION">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="hexpand">True</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="FT_DIRECTION">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Direction:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">grid1</property>
</object>
<packing>
<property name="expand">False</property>
@@ -84,6 +102,11 @@
<property name="halign">center</property>
<property name="hexpand">True</property>
<property name="image">imageUP</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="BTN_UP-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Up</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -103,6 +126,11 @@
<property name="halign">center</property>
<property name="hexpand">True</property>
<property name="image">imageRIGHT</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="BTN_RIGHT-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Right</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">2</property>
@@ -122,6 +150,11 @@
<property name="halign">center</property>
<property name="hexpand">True</property>
<property name="image">imageLEFT</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="BTN_LEFT-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Left</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -131,21 +164,6 @@
</packing>
</child>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
<object class="GtkButton" id="BTN_DOWN">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -156,6 +174,11 @@
<property name="halign">center</property>
<property name="hexpand">True</property>
<property name="image">imageDOWN</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="BTN_DOWN-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Down</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -164,6 +187,21 @@
<property name="height">1</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -175,7 +213,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -269,8 +307,9 @@
<object class="GtkBox" id="boxCOUNT">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">24</property>
- <property name="spacing">6</property>
+ <property name="halign">start</property>
+ <property name="margin_left">12</property>
+ <property name="spacing">12</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkCheckButton" id="TSB_ENDLESS">
@@ -282,6 +321,9 @@
<property name="xalign">0</property>
<property name="inconsistent">True</property>
<property name="draw_indicator">True</property>
+ <accessibility>
+ <relation type="label-for" target="NUM_FLD_COUNT"/>
+ </accessibility>
</object>
<packing>
<property name="expand">False</property>
@@ -293,7 +335,11 @@
<object class="GtkSpinButton" id="NUM_FLD_COUNT">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">start</property>
<property name="invisible_char">•</property>
+ <accessibility>
+ <relation type="labelled-by" target="TSB_ENDLESS"/>
+ </accessibility>
</object>
<packing>
<property name="expand">False</property>
@@ -325,8 +371,9 @@
<object class="GtkBox" id="boxAMOUNT">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">24</property>
- <property name="spacing">6</property>
+ <property name="halign">start</property>
+ <property name="margin_left">12</property>
+ <property name="spacing">12</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkCheckButton" id="TSB_PIXEL">
@@ -338,6 +385,9 @@
<property name="xalign">0</property>
<property name="inconsistent">True</property>
<property name="draw_indicator">True</property>
+ <accessibility>
+ <relation type="label-for" target="MTR_FLD_AMOUNT:0pixels"/>
+ </accessibility>
</object>
<packing>
<property name="expand">False</property>
@@ -346,10 +396,14 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="MTR_FLD_AMOUNT:0Pixels">
+ <object class="GtkSpinButton" id="MTR_FLD_AMOUNT:0pixels">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">start</property>
<property name="invisible_char">•</property>
+ <accessibility>
+ <relation type="labelled-by" target="TSB_PIXEL"/>
+ </accessibility>
</object>
<packing>
<property name="expand">False</property>
@@ -381,8 +435,9 @@
<object class="GtkBox" id="boxDELAY">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">24</property>
- <property name="spacing">6</property>
+ <property name="halign">start</property>
+ <property name="margin_left">12</property>
+ <property name="spacing">12</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkCheckButton" id="TSB_AUTO">
@@ -394,6 +449,9 @@
<property name="xalign">0</property>
<property name="inconsistent">True</property>
<property name="draw_indicator">True</property>
+ <accessibility>
+ <relation type="label-for" target="MTR_FLD_DELAY:0ms"/>
+ </accessibility>
</object>
<packing>
<property name="expand">False</property>
@@ -402,10 +460,14 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="MTR_FLD_DELAY:0,00ms">
+ <object class="GtkSpinButton" id="MTR_FLD_DELAY:0ms">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">start</property>
<property name="invisible_char">•</property>
+ <accessibility>
+ <relation type="labelled-by" target="TSB_AUTO"/>
+ </accessibility>
</object>
<packing>
<property name="expand">False</property>
@@ -508,4 +570,11 @@
</row>
</data>
</object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <widgets>
+ <widget name="TSB_ENDLESS"/>
+ <widget name="TSB_PIXEL"/>
+ <widget name="TSB_AUTO"/>
+ </widgets>
+ </object>
</interface>
diff --git a/include/tools/fldunit.hxx b/include/tools/fldunit.hxx
index 7b8fa4d..25c13db 100644
--- a/include/tools/fldunit.hxx
+++ b/include/tools/fldunit.hxx
@@ -22,7 +22,7 @@
enum FieldUnit { FUNIT_NONE, FUNIT_MM, FUNIT_CM, FUNIT_M, FUNIT_KM,
FUNIT_TWIP, FUNIT_POINT, FUNIT_PICA,
FUNIT_INCH, FUNIT_FOOT, FUNIT_MILE, FUNIT_CHAR, FUNIT_LINE, FUNIT_CUSTOM,
- FUNIT_PERCENT, FUNIT_100TH_MM, FUNIT_PIXEL, FUNIT_DEGREE, FUNIT_SECOND };
+ FUNIT_PERCENT, FUNIT_100TH_MM, FUNIT_PIXEL, FUNIT_DEGREE, FUNIT_SECOND, FUNIT_MILLISECOND };
#endif
diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx
index e402671..f4f05b5 100644
--- a/rsc/source/parser/rscibas.cxx
+++ b/rsc/source/parser/rscibas.cxx
@@ -196,6 +196,7 @@ RscEnum * RscTypCont::InitFieldUnitsType()
SETCONST( pFieldUnits, "FUNIT_PERCENT", FUNIT_PERCENT );
SETCONST( pFieldUnits, "FUNIT_DEGREE", FUNIT_DEGREE);
SETCONST( pFieldUnits, "FUNIT_SECOND", FUNIT_SECOND);
+ SETCONST( pFieldUnits, "FUNIT_MILLISECOND", FUNIT_MILLISECOND);
SETCONST( pFieldUnits, "FUNIT_PIXEL", FUNIT_PIXEL );
return pFieldUnits;
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 7ff247c..27367d7 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -1304,11 +1304,12 @@ double MetricField::ConvertDoubleValue( double nValue, sal_Int64 mnBaseValue, sa
eOutUnit == FUNIT_NONE ||
eOutUnit == FUNIT_DEGREE ||
eOutUnit == FUNIT_SECOND ||
+ eOutUnit == FUNIT_MILLISECOND ||
eOutUnit == FUNIT_PIXEL ||
eInUnit == FUNIT_CUSTOM ||
eInUnit == FUNIT_NONE ||
eInUnit == FUNIT_DEGREE ||
- eInUnit == FUNIT_SECOND ||
+ eInUnit == FUNIT_MILLISECOND ||
eInUnit == FUNIT_PIXEL )
return nValue;
else
@@ -1400,6 +1401,7 @@ double MetricField::ConvertDoubleValue( double nValue, sal_uInt16 nDigits,
eInUnit == FUNIT_NONE ||
eInUnit == FUNIT_DEGREE ||
eInUnit == FUNIT_SECOND ||
+ eInUnit == FUNIT_MILLISECOND ||
eInUnit == FUNIT_PIXEL ||
eOutUnit == MAP_PIXEL ||
eOutUnit == MAP_SYSFONT ||
diff --git a/vcl/source/src/units.src b/vcl/source/src/units.src
index 8f07c7f..3445e921 100644
--- a/vcl/source/src/units.src
+++ b/vcl/source/src/units.src
@@ -47,6 +47,7 @@ StringArray SV_FUNIT_STRINGS
< " pixel" ; FUNIT_PIXEL ; > ;
< "°" ; FUNIT_DEGREE ; > ;
< "sec" ; FUNIT_SECOND ; > ;
+ < "ms" ; FUNIT_MILLISECOND ; > ;
};
};
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 728eae5..8641ed2 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -833,6 +833,8 @@ namespace
eUnit = FUNIT_DEGREE;
else if ((sUnit == "sec") || (sUnit == "seconds") || (sUnit == "second"))
eUnit = FUNIT_SECOND;
+ else if ((sUnit == "ms") || (sUnit == "milliseconds") || (sUnit == "millisecond"))
+ eUnit = FUNIT_MILLISECOND;
else if (sUnit != "0")
eUnit = FUNIT_CUSTOM;
More information about the Libreoffice-commits
mailing list