diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-10-25 14:46:59 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-10-25 15:32:09 +0100 |
| commit | d3fb6d227c77198aa0b70d6f5260ff239f5d692c (patch) | |
| tree | 160da1f4aa2bf1f0034969469b68b01b29b7f3d7 /vcl/inc | |
| parent | 725eba738eae4eee6cd9b833d375db5463833119 (diff) | |
remove .ui mark-up in favor of font attributes
so we can keep translations markup free, and it matches
better our existing font use in controls
Change-Id: Ib762030f8bf831f2b0afabdd643508e660ad9266
See: https://live.gnome.org/GnomeGoals/RemoveMarkupInMessages
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/vcl/builder.hxx | 5 | ||||
| -rw-r--r-- | vcl/inc/vcl/window.hxx | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/vcl/inc/vcl/builder.hxx b/vcl/inc/vcl/builder.hxx index 8ef33278acc2..de8da5154e84 100644 --- a/vcl/inc/vcl/builder.hxx +++ b/vcl/inc/vcl/builder.hxx @@ -165,7 +165,9 @@ public: //taking ownership of it bool replace(OString sID, Window &rReplacement); private: - Window *insertObject(Window *pParent, const OString &rClass, const OString &rID, stringmap &rVec); + Window *insertObject(Window *pParent, const OString &rClass, const OString &rID, + stringmap &rProps, stringmap &rPangoAttributes); + Window *makeObject(Window *pParent, const OString &rClass, const OString &rID, stringmap &rVec); bool extractGroup(const OString &id, stringmap &rVec); bool extractModel(const OString &id, stringmap &rVec); @@ -181,6 +183,7 @@ private: void handlePacking(Window *pCurrent, xmlreader::XmlReader &reader); void applyPackingProperty(Window *pCurrent, xmlreader::XmlReader &reader); void collectProperty(xmlreader::XmlReader &reader, const OString &rID, stringmap &rVec); + void collectPangoAttribute(xmlreader::XmlReader &reader, stringmap &rMap); void handleListStore(xmlreader::XmlReader &reader, const OString &rID); void handleRow(xmlreader::XmlReader &reader, const OString &rID, sal_Int32 nRowIndex); diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx index 54a9ba9bf394..90543e4207ee 100644 --- a/vcl/inc/vcl/window.hxx +++ b/vcl/inc/vcl/window.hxx @@ -1222,6 +1222,13 @@ public: virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue); /* + * Sets a font attribute + * + * @return false if attribute is unknown + */ + bool set_font_attribute(const rtl::OString &rKey, const rtl::OString &rValue); + + /* * Move this widget to be the nNewPosition'd child of its parent */ void reorderWithinParent(sal_uInt16 nNewPosition); |