diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-02-08 15:06:08 +0000 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2013-02-11 08:37:22 +0000 |
commit | 03ca2a8fde19498e8c584c899877c7332204a082 (patch) | |
tree | 13f601a4223bf0c2eaf4a94f7a1bb269b0e1b2bd | |
parent | 56215a00ed256977b802e0a742cf13a481b234cb (diff) |
resolve fdo#60450 - Printer list is missing its border in Print dialog
Reviewed-on: https://gerrit.libreoffice.org/2043
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit f10ba07935951e6c74663a35de9a79b7d66beb37)
Conflicts:
vcl/source/window/builder.cxx
allow a custom border property for drawing areas
(cherry picked from commit e258b760563dc2a69a1cc8b0c8b7b4c15a2774ad)
Change-Id: I2e28b9f9d52bcb01b04f98d39d12b6d8a627bec5
1e5777e5dcc04d0aa53d1ac4b9091f310ae59035
Reviewed-on: https://gerrit.libreoffice.org/2052
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
-rw-r--r-- | vcl/source/window/builder.cxx | 33 | ||||
-rw-r--r-- | vcl/uiconfig/ui/printdialog.ui | 2 |
2 files changed, 21 insertions, 14 deletions
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 68bc43433a18..355b28fc637e 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -307,16 +307,16 @@ void VclBuilder::handleTranslations(xmlreader::XmlReader &reader) namespace { - OString extractPattern(VclBuilder::stringmap &rMap) + OString extractCustomProperty(VclBuilder::stringmap &rMap) { - OString sPattern; - VclBuilder::stringmap::iterator aFind = rMap.find(OString("pattern")); + OString sCustomProperty; + VclBuilder::stringmap::iterator aFind = rMap.find(OString("customproperty")); if (aFind != rMap.end()) { - sPattern = aFind->second; + sCustomProperty = aFind->second; rMap.erase(aFind); } - return sPattern; + return sCustomProperty; } bool extractResizable(VclBuilder::stringmap &rMap) @@ -688,7 +688,7 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri else if (name == "GtkSpinButton") { extractSpinAdjustment(id, rMap); - OString sPattern = extractPattern(rMap); + OString sPattern = extractCustomProperty(rMap); OString sUnit = sPattern; for (sal_Int32 i = 0; i < sPattern.getLength(); ++i) @@ -755,7 +755,11 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri // everything over to SvTreeViewBox //d) remove the users of makeSvTreeViewBox extractModel(id, rMap); - pWindow = new ListBox(pParent, WB_LEFT|WB_VCENTER|WB_3DLOOK); + WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK; + OString sBorder = extractCustomProperty(rMap); + if (!sBorder.isEmpty()) + nWinStyle |= WB_BORDER; + pWindow = new ListBox(pParent, nWinStyle); } else if (name == "GtkLabel") pWindow = new FixedText(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK); @@ -802,7 +806,10 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri else if (name == "GtkNotebook") pWindow = new TabControl(pParent, WB_STDTABCONTROL|WB_3DLOOK); else if (name == "GtkDrawingArea") - pWindow = new Window(pParent); + { + OString sBorder = extractCustomProperty(rMap); + pWindow = new Window(pParent, sBorder.isEmpty() ? 0 : WB_BORDER); + } else if (name == "GtkTextView") { extractBuffer(id, rMap); @@ -1013,7 +1020,7 @@ void VclBuilder::handleTabChild(Window *pParent, xmlreader::XmlReader &reader) if (nDelim != -1) { OString sPattern = sID.copy(nDelim+1); - aProperties[OString("pattern")] = sPattern; + aProperties[OString("customproperty")] = sPattern; sID = sID.copy(0, nDelim); } } @@ -1340,7 +1347,7 @@ Window* VclBuilder::handleObject(Window *pParent, xmlreader::XmlReader &reader) { OString sClass; OString sID; - OString sPattern; + OString sCustomProperty; xmlreader::Span name; int nsId; @@ -1359,7 +1366,7 @@ Window* VclBuilder::handleObject(Window *pParent, xmlreader::XmlReader &reader) sal_Int32 nDelim = sID.indexOf(':'); if (nDelim != -1) { - sPattern = sID.copy(nDelim+1); + sCustomProperty = sID.copy(nDelim+1); sID = sID.copy(0, nDelim); } } @@ -1375,8 +1382,8 @@ Window* VclBuilder::handleObject(Window *pParent, xmlreader::XmlReader &reader) stringmap aProperties, aPangoAttributes; - if (!sPattern.isEmpty()) - aProperties[OString("pattern")] = sPattern; + if (!sCustomProperty.isEmpty()) + aProperties[OString("customproperty")] = sCustomProperty; Window *pCurrentChild = NULL; while(1) diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui index a0204b52d640..575eda9e5cc8 100644 --- a/vcl/uiconfig/ui/printdialog.ui +++ b/vcl/uiconfig/ui/printdialog.ui @@ -350,7 +350,7 @@ </packing> </child> <child> - <object class="GtkTreeView" id="printers"> + <object class="GtkTreeView" id="printers:border"> <property name="height_request">100</property> <property name="visible">True</property> <property name="can_focus">True</property> |