mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove .ui mark-up in favor of font attributes

Browse Source 
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
This commit is contained in:
Caolán McNamara 2012-10-25 14:46:59 +01:00
parent 725eba738e
commit d3fb6d227c
37 changed files with 466 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cui/uiconfig/ui/charnamepage.ui
View File

@ -156,8 +156,10 @@
<object class="GtkLabel" id="label21">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Font&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Font</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -305,8 +307,10 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Western text font&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Western text font</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -454,8 +458,10 @@
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Asian text font&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Asian text font</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -603,8 +609,10 @@
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;CTL font&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">CTL font</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -638,8 +646,10 @@
<object class="GtkLabel" id="label19">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Preview&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Preview</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>

12
cui/uiconfig/ui/effectspage.ui
View File

@ -617,8 +617,10 @@
<object class="GtkLabel" id="label42">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Options&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Options</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -652,8 +654,10 @@
<object class="GtkLabel" id="label50">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Preview&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Preview</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>

12
cui/uiconfig/ui/insertoleobject.ui
View File

@ -90,8 +90,10 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Object type&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Object type</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -173,8 +175,10 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;File&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">File</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>

12
cui/uiconfig/ui/insertplugin.ui
View File

@ -69,8 +69,10 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;File/URL&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">File/URL</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -117,8 +119,10 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Options&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Options</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>

30
cui/uiconfig/ui/positionpage.ui
View File

@ -210,8 +210,10 @@
<object class="GtkLabel" id="label20">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Position&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Position</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -370,8 +372,10 @@
<object class="GtkLabel" id="rotateandscale">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Rotation / Scaling&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Rotation / Scaling</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
<packing>
<property name="expand">False</property>
@ -384,8 +388,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">&lt;b&gt;Rotation&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Rotation</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
<packing>
<property name="expand">False</property>
@ -482,8 +488,10 @@
<object class="GtkLabel" id="label22">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Spacing&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Spacing</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -517,8 +525,10 @@
<object class="GtkLabel" id="label51">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Preview&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Preview</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>

18
cui/uiconfig/ui/twolinespage.ui
View File

@ -34,8 +34,10 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Double-lined&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Double-lined</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -130,8 +132,10 @@
<object class="GtkLabel" id="label28">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Enclosing character&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Enclosing character</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -165,8 +169,10 @@
<object class="GtkLabel" id="label52">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Preview&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Preview</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>

12
cui/uiconfig/ui/zoomdialog.ui
View File

@ -224,8 +224,10 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Zoom factor&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Zoom factor</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -363,8 +365,10 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;View layout&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">View layout</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>

6
sc/uiconfig/scalc/ui/printeroptions.ui
View File

@ -36,8 +36,10 @@
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Pages&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Pages</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>

18
sd/uiconfig/sdraw/ui/printeroptions.ui
View File

@ -65,8 +65,10 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Contents&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Contents</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -157,8 +159,10 @@
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Color&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Color</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -268,8 +272,10 @@
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Size&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Size</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>

18
sd/uiconfig/simpress/ui/printeroptions.ui
View File

@ -82,8 +82,10 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Contents&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Contents</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -174,8 +176,10 @@
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Color&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Color</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -285,8 +289,10 @@
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Size&lt;b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Size</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>

12
sfx2/uiconfig/ui/password.ui
View File

@ -191,8 +191,10 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Password&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Password</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -287,8 +289,10 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Second Password&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Second Password</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>

12
starmath/uiconfig/smath/ui/printeroptions.ui
View File

@ -82,8 +82,10 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Contents&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Contents</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -195,8 +197,10 @@
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Size&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Size</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>

78
svtools/uiconfig/ui/graphicexport.ui
View File

@ -239,8 +239,10 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Size&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Size</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -272,8 +274,10 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Color Depth&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Color Depth</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -365,8 +369,10 @@
<object class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Quality&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Quality</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -458,8 +464,10 @@
<object class="GtkLabel" id="label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Compression&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Compression</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -498,8 +506,10 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Compression&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Compression</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -538,8 +548,10 @@
<object class="GtkLabel" id="label12">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Mode&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Mode</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -578,8 +590,10 @@
<object class="GtkLabel" id="labe">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Drawing Objects&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Drawing Objects</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -650,8 +664,10 @@
<object class="GtkLabel" id="label16">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Encoding&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Encoding</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -724,8 +740,10 @@
<object class="GtkLabel" id="label17">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Preview&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Preview</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -798,8 +816,10 @@
<object class="GtkLabel" id="label18">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Color format&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Color format</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -872,8 +892,10 @@
<object class="GtkLabel" id="label19">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Version&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Version</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -946,8 +968,10 @@
<object class="GtkLabel" id="label20">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Compression&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Compression</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -991,8 +1015,10 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Information&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Information</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>

12
sw/uiconfig/sw/ui/20872.ui
View File

@ -79,8 +79,10 @@
<object class="GtkLabel" id="1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Level&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Level</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -430,8 +432,10 @@
<object class="GtkLabel" id="3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Position and spacing&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Position and spacing</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>

12
sw/uiconfig/sw/ui/20876.ui
View File

@ -34,8 +34,10 @@
<object class="GtkLabel" id="130">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Level&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Level</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -326,8 +328,10 @@
<object class="GtkLabel" id="30">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Numbering&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Numbering</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>

12
sw/uiconfig/swriter/ui/autoformattable.ui
View File

@ -184,8 +184,10 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Format&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Format</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -313,8 +315,10 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Formatting&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Formatting</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>

6
sw/uiconfig/swriter/ui/bibliographyentry.ui
View File

@ -279,8 +279,10 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Entry&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Entry</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>

12
sw/uiconfig/swriter/ui/charurlpage.ui
View File

@ -197,8 +197,10 @@
<object class="GtkLabel" id="label32">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Hyperlink&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Hyperlink</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -284,8 +286,10 @@
<object class="GtkLabel" id="label33">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Character styles&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Character styles</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>

6
sw/uiconfig/swriter/ui/columnwidth.ui
View File

@ -162,8 +162,10 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Width&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Width</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>

12
sw/uiconfig/swriter/ui/converttexttable.ui
View File

@ -231,8 +231,10 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Separate text at&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Separate text at</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -415,8 +417,10 @@
<object class="GtkLabel" id="2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Options&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Options</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>

6
sw/uiconfig/swriter/ui/horizontalrule.ui
View File

@ -98,8 +98,10 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Selection&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Selection</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>

6
sw/uiconfig/swriter/ui/indexentry.ui
View File

@ -625,8 +625,10 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Selection&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Selection</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>

6
sw/uiconfig/swriter/ui/insertbreak.ui
View File

@ -239,8 +239,10 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Type&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Type</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>

18
sw/uiconfig/swriter/ui/inserttable.ui
View File

@ -115,8 +115,10 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Name&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Name</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -221,8 +223,10 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Size&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Size</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -390,8 +394,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0.47999998927116394</property>
<property name="label" translatable="yes">&lt;b&gt;Options&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Options</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>

30
sw/uiconfig/swriter/ui/linenumbering.ui
View File

@ -301,8 +301,10 @@
<object class="GtkLabel" id="view">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;View&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">View</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -412,8 +414,10 @@
<object class="GtkLabel" id="separator">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Separator&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Separator</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -501,8 +505,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="ypad">1</property>
<property name="label" translatable="yes">&lt;b&gt;Count&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Count</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -548,6 +554,12 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkAdjustment" id="lineadjustment">
<property name="upper">1000</property>
<property name="value">3</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkListStore" id="positionstore">
<columns>
<!-- column-name positions -->
@ -568,12 +580,6 @@
</row>
</data>
</object>
<object class="GtkAdjustment" id="lineadjustment">
<property name="upper">1000</property>
<property name="value">3</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkAdjustment" id="spacingadjustment">
<property name="upper">9999</property>
<property name="value">0.5</property>

18
sw/uiconfig/swriter/ui/printeroptions.ui
View File

@ -116,8 +116,10 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Contents&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Contents</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -156,8 +158,10 @@
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Color&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Color</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -196,8 +200,10 @@
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Pages&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Pages</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>

30
sw/uiconfig/swriter/ui/sortdialog.ui
View File

@ -457,8 +457,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0.56000000238418579</property>
<property name="label" translatable="yes">&lt;b&gt;Sort criteria&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Sort criteria</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -538,8 +540,10 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Direction&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Direction</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -660,8 +664,10 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Separator&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Separator</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -708,8 +714,10 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Language&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Language</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -749,8 +757,10 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Setting&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Setting</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>

6
sw/uiconfig/swriter/ui/splittable.ui
View File

@ -176,8 +176,10 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Mode&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Mode</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>

6
sw/uiconfig/swriter/ui/stringinput.ui
View File

@ -71,8 +71,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">&lt;b&gt;Name&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Name</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
<packing>
<property name="left_attach">0</property>

18
sw/uiconfig/swriter/ui/titlepage.ui
View File

@ -268,8 +268,10 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Make Title Pages&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Make Title Pages</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -414,8 +416,10 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Page Numbering&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Page Numbering</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -474,8 +478,10 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Edit Page Properties&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Edit Page Properties</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>

12
sw/uiconfig/swriter/ui/wordcount.ui
View File

@ -187,8 +187,10 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Current selection&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Current selection</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -322,8 +324,10 @@
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Whole document&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Whole document</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>

5
vcl/inc/vcl/builder.hxx
View File

@ -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);

7
vcl/inc/vcl/window.hxx
View File

@ -1221,6 +1221,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
*/

11
vcl/qa/cppunit/builder/demo.ui
View File

@ -348,7 +348,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Frame Label</property>
<property name="use_markup">True</property>
</object>
</child>
</object>
@ -557,7 +556,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Make Title Pages</property>
<property name="use_markup">True</property>
</object>
</child>
</object>
@ -703,7 +701,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Page Numbering</property>
<property name="use_markup">True</property>
</object>
</child>
</object>
@ -763,7 +760,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Edit Page Properties</property>
<property name="use_markup">True</property>
</object>
</child>
</object>
@ -937,7 +933,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Type</property>
<property name="use_markup">True</property>
</object>
</child>
</object>
@ -1100,7 +1095,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Zoom factor</property>
<property name="use_markup">True</property>
</object>
</child>
</object>
@ -1237,7 +1231,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">View layout</property>
<property name="use_markup">True</property>
</object>
</child>
</object>
@ -1299,7 +1292,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Level</property>
<property name="use_markup">True</property>
</object>
</child>
</object>
@ -1589,7 +1581,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Numbering</property>
<property name="use_markup">True</property>
</object>
</child>
</object>
@ -1651,7 +1642,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Level</property>
<property name="use_markup">True</property>
</object>
</child>
</object>
@ -1854,7 +1844,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Position and spacing</property>
<property name="use_markup">True</property>
</object>
</child>
</object>

123
vcl/source/window/builder.cxx
View File

@ -328,18 +328,6 @@ namespace
return bVertical;
}
bool extractMarkup(VclBuilder::stringmap &rMap)
{
bool bUseMarkup = false;
VclBuilder::stringmap::iterator aFind = rMap.find(OString("use-markup"));
if (aFind != rMap.end())
{
bUseMarkup = toBool(aFind->second);
rMap.erase(aFind);
}
return bUseMarkup;
}
bool extractInconsistent(VclBuilder::stringmap &rMap)
{
bool bInconsistent = false;
@ -837,50 +825,10 @@ namespace
{
return pWindow->GetType() == WINDOW_TABPAGE;
}
//super cheesy markup, just globally set bold and/or
//italic if any tag exists and return detagged string
OString handleMarkup(Window &rWindow, const OString &rLabel)
{
OStringBuffer aBuf;
xmlreader::XmlReader reader(rLabel.getStr(), rLabel.getLength());
xmlreader::Span name;
int nsId;
while(1)
{
xmlreader::XmlReader::Result res = reader.nextItem(
xmlreader::XmlReader::TEXT_RAW, &name, &nsId);
if (res == xmlreader::XmlReader::RESULT_BEGIN)
{
if (name.equals(RTL_CONSTASCII_STRINGPARAM("b")))
{
Font aFont(rWindow.GetControlFont());
aFont.SetWeight(WEIGHT_BOLD);
rWindow.SetControlFont(aFont);
}
else if (name.equals(RTL_CONSTASCII_STRINGPARAM("i")))
{
Font aFont(rWindow.GetControlFont());
aFont.SetItalic(ITALIC_NORMAL);
rWindow.SetControlFont(aFont);
}
}
if (res == xmlreader::XmlReader::RESULT_TEXT)
aBuf.append(name.begin, name.length);
if (res == xmlreader::XmlReader::RESULT_DONE)
break;
}
return aBuf.makeStringAndClear();
}
}
Window *VclBuilder::insertObject(Window *pParent, const OString &rClass, const OString &rID, stringmap &rMap)
Window *VclBuilder::insertObject(Window *pParent, const OString &rClass,
const OString &rID, stringmap &rProps, stringmap &rPango)
{
Window *pCurrentChild = NULL;
@ -891,7 +839,7 @@ Window *VclBuilder::insertObject(Window *pParent, const OString &rClass, const O
if (pCurrentChild->IsDialog())
{
Dialog *pDialog = (Dialog*)pCurrentChild;
pDialog->doDeferredInit(extractResizable(rMap));
pDialog->doDeferredInit(extractResizable(rProps));
m_bToplevelHasDeferredInit = false;
}
if (pCurrentChild->GetHelpId().isEmpty())
@ -909,32 +857,28 @@ Window *VclBuilder::insertObject(Window *pParent, const OString &rClass, const O
//been seen yet, then make unattached widgets parent-less toplevels
if (pParent == m_pParent && m_bToplevelHasDeferredInit)
pParent = NULL;
pCurrentChild = makeObject(pParent, rClass, rID, rMap);
pCurrentChild = makeObject(pParent, rClass, rID, rProps);
}
if (pCurrentChild)
{
//Support super-basic bold/italic hints
if (extractMarkup(rMap))
{
VclBuilder::stringmap::iterator aFind = rMap.find(OString("label"));
if (aFind != rMap.end())
{
OString &rLabel = aFind->second;
if (rLabel.indexOf('<') != -1)
rLabel = handleMarkup(*pCurrentChild, aFind->second);
}
}
for (stringmap::iterator aI = rMap.begin(), aEnd = rMap.end(); aI != aEnd; ++aI)
for (stringmap::iterator aI = rProps.begin(), aEnd = rProps.end(); aI != aEnd; ++aI)
{
const OString &rKey = aI->first;
const OString &rValue = aI->second;
pCurrentChild->set_property(rKey, rValue);
}
for (stringmap::iterator aI = rPango.begin(), aEnd = rPango.end(); aI != aEnd; ++aI)
{
const OString &rKey = aI->first;
const OString &rValue = aI->second;
pCurrentChild->set_font_attribute(rKey, rValue);
}
}
rMap.clear();
rProps.clear();
rPango.clear();
if (!pCurrentChild)
pCurrentChild = m_aChildren.empty() ? pParent : m_aChildren.back().m_pWindow;
@ -1186,6 +1130,32 @@ void VclBuilder::handleChild(Window *pParent, xmlreader::XmlReader &reader)
}
}
void VclBuilder::collectPangoAttribute(xmlreader::XmlReader &reader, stringmap &rMap)
{
xmlreader::Span span;
int nsId;
OString sProperty;
OString sValue;
while (reader.nextAttribute(&nsId, &span))
{
if (span.equals(RTL_CONSTASCII_STRINGPARAM("name")))
{
span = reader.getAttributeValue(false);
sProperty = OString(span.begin, span.length);
}
else if (span.equals(RTL_CONSTASCII_STRINGPARAM("value")))
{
span = reader.getAttributeValue(false);
sValue = OString(span.begin, span.length);
}
}
if (!sProperty.isEmpty())
rMap[sProperty] = sValue;
}
void VclBuilder::handleAdjustment(const OString &rID, stringmap &rProperties)
{
m_pParserState->m_aAdjustments.push_back(AdjustmentAndId(rID, rProperties));
@ -1329,7 +1299,7 @@ Window* VclBuilder::handleObject(Window *pParent, xmlreader::XmlReader &reader)
int nLevel = 1;
stringmap aProperties;
stringmap aProperties, aPangoAttributes;
if (!sPattern.isEmpty())
aProperties[OString("pattern")] = sPattern;
@ -1348,7 +1318,10 @@ Window* VclBuilder::handleObject(Window *pParent, xmlreader::XmlReader &reader)
if (name.equals(RTL_CONSTASCII_STRINGPARAM("child")))
{
if (!pCurrentChild)
pCurrentChild = insertObject(pParent, sClass, sID, aProperties);
{
pCurrentChild = insertObject(pParent, sClass, sID,
aProperties, aPangoAttributes);
}
handleChild(pCurrentChild, reader);
}
else
@ -1356,6 +1329,8 @@ Window* VclBuilder::handleObject(Window *pParent, xmlreader::XmlReader &reader)
++nLevel;
if (name.equals(RTL_CONSTASCII_STRINGPARAM("property")))
collectProperty(reader, sID, aProperties);
else if (name.equals(RTL_CONSTASCII_STRINGPARAM("attribute")))
collectPangoAttribute(reader, aPangoAttributes);
}
}
@ -1375,7 +1350,7 @@ Window* VclBuilder::handleObject(Window *pParent, xmlreader::XmlReader &reader)
}
if (!pCurrentChild)
pCurrentChild = insertObject(pParent, sClass, sID, aProperties);
pCurrentChild = insertObject(pParent, sClass, sID, aProperties, aPangoAttributes);
return pCurrentChild;
}
@ -1528,6 +1503,8 @@ void VclBuilder::collectProperty(xmlreader::XmlReader &reader, const OString &rI
if (!sProperty.isEmpty())
{
sProperty = sProperty.replace('_', '-');
//https://live.gnome.org/GnomeGoals/RemoveMarkupInMessages
SAL_WARN_IF(sProperty == "use-markup", "vcl.layout", "Use pango attributes instead of mark-up");
rMap[sProperty] = sValue;
}
}

47
vcl/source/window/window2.cxx
View File

@ -1974,6 +1974,53 @@ namespace
}
}
bool Window::set_font_attribute(const OString &rKey, const OString &rValue)
{
if (rKey == "weight")
{
Font aFont(GetControlFont());
if (rValue == "thin")
aFont.SetWeight(WEIGHT_THIN);
else if (rValue == "ultralight")
aFont.SetWeight(WEIGHT_ULTRALIGHT);
else if (rValue == "light")
aFont.SetWeight(WEIGHT_LIGHT);
else if (rValue == "book")
aFont.SetWeight(WEIGHT_SEMILIGHT);
else if (rValue == "normal")
aFont.SetWeight(WEIGHT_NORMAL);
else if (rValue == "medium")
aFont.SetWeight(WEIGHT_MEDIUM);
else if (rValue == "semibold")
aFont.SetWeight(WEIGHT_SEMIBOLD);
else if (rValue == "bold")
aFont.SetWeight(WEIGHT_BOLD);
else if (rValue == "ultrabold")
aFont.SetWeight(WEIGHT_ULTRABOLD);
else
aFont.SetWeight(WEIGHT_BLACK);
SetControlFont(aFont);
}
else if (rKey == "style")
{
Font aFont(GetControlFont());
if (rValue == "normal")
aFont.SetItalic(ITALIC_NONE);
else if (rValue == "oblique")
aFont.SetItalic(ITALIC_OBLIQUE);
else if (rValue == "italic")
aFont.SetItalic(ITALIC_NORMAL);
SetControlFont(aFont);
}
else
{
SAL_INFO("vcl.layout", "unhandled font attribute: " << rKey.getStr());
return false;
}
return true;
}
bool Window::set_property(const OString &rKey, const OString &rValue)
{
if (

42
vcl/uiconfig/ui/printdialog.ui
View File

@ -372,8 +372,10 @@
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Printer&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Printer</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -712,8 +714,10 @@
<object class="GtkLabel" id="label13">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Range and copies&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Range and copies</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -769,8 +773,10 @@
<object class="GtkLabel" id="label15">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Print&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Print</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -897,8 +903,10 @@
<object class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Print&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Print</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -1292,8 +1300,10 @@
<object class="GtkLabel" id="label18">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Layout&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Layout</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -1350,8 +1360,10 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Page sides&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Page sides</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
@ -1453,8 +1465,10 @@
<object class="GtkLabel" id="label21">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Options&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="label" translatable="yes">Options</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>