[Libreoffice-commits] core.git: vcl/uiconfig

[Taichi Haradaguchi (via logerrit)]

 vcl/uiconfig/ui/openlockedquerybox.ui |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 80e908b0ce68c13385c1eb5c0285665fa89d5e3d
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Nov 12 11:12:11 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Tue Nov 14 12:35:32 2023 +0100

tdf#155138 Change context strings

"stock" -> "openlockedquerybox|[id]"

Change-Id: I2325bf9257ba168d52dc37579f10a9b7685b0751
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159343
Tested-by: Jenkins
Reviewed-by: sabri unal 
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/vcl/uiconfig/ui/openlockedquerybox.ui 
b/vcl/uiconfig/ui/openlockedquerybox.ui
index 74094e793024..680698d2ecef 100644
--- a/vcl/uiconfig/ui/openlockedquerybox.ui
+++ b/vcl/uiconfig/ui/openlockedquerybox.ui
@@ -21,7 +21,7 @@
 end
 
   
-_Open
+_Open
 True
 True
 False
@@ -35,7 +35,7 @@
 
 
   
-_Cancel
+_Cancel
 True
 True
 True
@@ -189,7 +189,7 @@ local system.
 
 
   
-Open Co_py
+Open Co_py
 True
 True
 True
@@ -208,7 +208,7 @@ local system.
 3
 
   
-Open _R/O
+Open _R/O
 True
 True
 True
@@ -222,7 +222,7 @@ local system.
 
 
   
-_Notify
+_Notify
 True
 True
 False

[Libreoffice-commits] core.git: vcl/uiconfig vcl/unx

[Khaled Hosny (via logerrit)]

 vcl/uiconfig/ui/printerdevicepage.ui |   41 ++-
 vcl/unx/generic/print/prtsetup.cxx   |   52 ---
 vcl/unx/generic/print/prtsetup.hxx   |3 --
 3 files changed, 4 insertions(+), 92 deletions(-)

New commits:
commit c3a4f689f44d83e3e9520bc280c566c83c4f2b5e
Author: Khaled Hosny 
AuthorDate: Fri Jun 30 09:37:45 2023 +
Commit: Caolán McNamara 
CommitDate: Sat Jul 1 21:09:25 2023 +0200

Remove option to set printer language type

Drop support for changing printer language type from printer properties
dialog, in preparation for dropping support for PostScript printing.

This is a follow up to:

commit 2a40505d00fcd79bfa433c301ddc05a35287bfb1
Date:   Thu Jan 26 11:49:43 2023 +

remove option to toggle IsPDFAsStandardPrintJobFormat from UI

Change-Id: I970d627588396d6ff648d6e6304e449da7ec1425
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153817
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/uiconfig/ui/printerdevicepage.ui 
b/vcl/uiconfig/ui/printerdevicepage.ui
index 7b6d6f28213e..249562950ef9 100644
--- a/vcl/uiconfig/ui/printerdevicepage.ui
+++ b/vcl/uiconfig/ui/printerdevicepage.ui
@@ -161,7 +161,7 @@
   
 
 
-  
+  
   
 True
 False
@@ -178,7 +178,7 @@
   
   
 0
-2
+1
   
 
 
@@ -190,44 +190,11 @@
 colorspace
 1
   
-  
-0
-1
-  
-
-
-  
-True
-False
-Printer language _type:
-True
-level
-1
-  
   
 0
 0
   
 
-
-  
-True
-False
-True
-
-  Automatic : %s
-  PostScript (Level from driver)
-  PostScript Level 1
-  PostScript Level 2
-  PostScript Level 3
-  PDF
-
-  
-  
-1
-0
-  
-
 
   
 True
@@ -240,7 +207,7 @@
   
   
 1
-1
+0
   
 
 
@@ -254,7 +221,7 @@
   
   
 1
-2
+1
   
 
   
diff --git a/vcl/unx/generic/print/prtsetup.cxx 
b/vcl/unx/generic/print/prtsetup.cxx
index 90ae49ec5179..4b0a63c1b3e8 100644
--- a/vcl/unx/generic/print/prtsetup.cxx
+++ b/vcl/unx/generic/print/prtsetup.cxx
@@ -115,8 +115,6 @@ IMPL_LINK( RTSDialog, ClickButton, weld::Button&, rButton, 
void )
 {
 m_aJobData.m_nColorDepth= m_xDevicePage->getDepth();
 m_aJobData.m_nColorDevice   = m_xDevicePage->getColorDevice();
-m_aJobData.m_nPSLevel   = m_xDevicePage->getLevel();
-m_aJobData.m_nPDFDevice = m_xDevicePage->getPDFDevice();
 }
 m_xDialog->response(RET_OK);
 }
@@ -271,7 +269,6 @@ RTSDevicePage::RTSDevicePage(weld::Widget* pPage, 
RTSDialog* pParent)
 , m_xPPDKeyBox(m_xBuilder->weld_tree_view("options"))
 , m_xPPDValueBox(m_xBuilder->weld_tree_view("values"))
 , m_xCustomEdit(m_xBuilder->weld_entry("custom"))
-, m_xLevelBox(m_xBuilder->weld_combo_box("level"))
 , m_xSpaceBox(m_xBuilder->weld_combo_box("colorspace"))
 , m_xDepthBox(m_xBuilder->weld_combo_box("colordepth"))
 , m_aReselectCustomIdle("RTSDevicePage m_aReselectCustomIdle")
@@ -286,7 +283,6 @@ RTSDevicePage::RTSDevicePage(weld::Widget* pPage, 
RTSDialog* pParent)
 m_xPPDKeyBox->connect_changed( LINK( this, RTSDevicePage, SelectHdl ) );
 m_xPPDValueBox->connect_changed( LINK( this, RTSDevicePage, SelectHdl ) );
 
-m_xLevelBox->connect_changed(LINK(this, RTSDevicePage, ComboChangedHdl));
 m_xSpaceBox->connect_changed(LINK(this, RTSDevicePage, ComboChangedHdl));
 m_xDepthBox->connect_changed(LINK(this, RTSDevicePage, ComboChangedHdl));
 
@@ -303,36 +299,6 @@ RTSDevicePage::RTSDevicePage(weld::Widget* pPage, 
RTSDialog* pParent)
 break;
 }
 
-sal_Int32 nLevelEntryData = 0; //automatic
-if( m_pParent->m_aJobData.m_nPDFDevice == 2 ) //explicit PDF
-nLevelEntryData = 10;
-else if (m_pParent->m_aJobData.m_nPSLevel > 0) //explicit PS Level
-nLevelEntryData = m_pParent->m_aJobData.m_nPSLevel+1;
-else if (m_pParent->m_aJobData.m_nPDFDevice == 1) //automatically PDF
-nLevelEntryData = 0;
-else if (m_pParent->m_aJobData.m_nPDFDevice == -1) //explicitly PS from 
driver
-nLevelEntryData = 1;
-
-bool bAutoIsPDF = 
officecfg::Office::Common::Print::Option::Printer::PDFAsStandardPrintJobFormat::get();
-
-assert(nLevelEntryData != 0
-|| "Generic Printer" == m_pParent->m_aJobData.m_aPrinterName
-

[Libreoffice-commits] core.git: vcl/uiconfig

[Khaled Hosny (via logerrit)]

 vcl/uiconfig/ui/printerdevicepage.ui |  150 +--
 1 file changed, 75 insertions(+), 75 deletions(-)

New commits:
commit b1c97304f135702e53e6aa48483ede31eaa54fec
Author: Khaled Hosny 
AuthorDate: Fri Jun 30 09:14:49 2023 +
Commit: Caolán McNamara 
CommitDate: Sat Jul 1 21:08:17 2023 +0200

Resave with glade

Change-Id: I9ef19ef10be497842be25e03fb72d97d1465bedf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153816
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/uiconfig/ui/printerdevicepage.ui 
b/vcl/uiconfig/ui/printerdevicepage.ui
index 4bdee960d64a..7b6d6f28213e 100644
--- a/vcl/uiconfig/ui/printerdevicepage.ui
+++ b/vcl/uiconfig/ui/printerdevicepage.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -18,62 +18,62 @@
   
 
   
-  
+  
   
 True
-False
+False
 True
 True
-6
-6
-12
-True
+6
+6
+12
+True
 
   
 True
-False
+False
 _Option:
-True
-options
+True
+options
 0
   
   
-0
-0
+0
+0
   
 
 
   
 True
-False
+False
 Current _value:
-True
-values
+True
+values
 0
   
   
-1
-0
+1
+0
   
 
 
   
 True
-True
+True
 True
 True
-in
+in
 
   
 True
-True
+True
 True
 True
 liststore1
-False
-False
-0
-False
+False
+False
+0
+False
 
   
 
@@ -91,48 +91,48 @@
 
   
   
-0
-1
+0
+1
   
 
 
-  
+  
   
 True
-False
+False
 True
 True
-6
+6
 
   
-True
-True
+True
+True
+True
 True
-True
   
   
-0
-0
+0
+0
   
 
 
   
 True
-True
+True
 True
 True
-in
+in
 
   
 True
-True
+True
 True
 True
 liststore2
-False
-False
-0
-False
+False
+False
+0
+False
 
   
 
@@ -150,69 +150,69 @@
 
   
   
-0
-1
+0
+1
   
 
   
   
-1
-1
+1
+1
   
 
 
-  
+  
   
 True
-False
-6
-12
+False
+6
+12
 
   
 True
-False
+False
 Color _depth:
-True
-colordepth
+True
+colordepth
 1
   
   
-0
-2
+0
+2
   
 
 
   
 True
-False
+False
 Co_lor:
-True
-colorspace
+True
+colorspace
 1
   
   
-0
-1
+0
+1
   
 
 
   
 True
-False
+False
 Printer language _type:
-True
-level
+True
+level
 1
   
   
-0
-0
+0
+0
   
 
 
   
 True
-False
+False
 True
 
   Automatic : %s
@@ -224,14 +224,14 @@
 
   
   
-1
-0
+1
+0
   
 
 
   
 True
-False
+False
 
   From driver
   Color
@@ -239,28 +239,28 @@
 
   
   
-1
-1
+1
+1
   
 
 
   
 True
-False
+False
 
   8 Bit
   24 Bit
 
   
   
-1
-2
+1
+2
   
 
   
   
-0
-2
+0
+  

[Libreoffice-commits] core.git: vcl/uiconfig

[Heiko Tietze (via logerrit)]

 vcl/uiconfig/ui/printdialog.ui |  148 +
 1 file changed, 64 insertions(+), 84 deletions(-)

New commits:
commit bea05a79c8ed565909e341a24b298d8deab7e042
Author: Heiko Tietze 
AuthorDate: Fri Jun 23 11:42:35 2023 +0200
Commit: Heiko Tietze 
CommitDate: Sun Jun 25 09:08:49 2023 +0200

Resolves tdf#147514 - Number of copies on top of the print dialog

Swapped with Odd/Even pages option to keep the dialog small
Number of copies is assume to be the more relevant function
Simple "More" renamed to give some clue of the options

Change-Id: I8d1bd3455d5b8d57f47ac97c1a310fd47a4a5bbb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153495
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 9d941db942a2..6f0aa80d05fd 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -609,14 +609,13 @@
   
 
 
-  
+  
 True
 False
 start
-Include:
+_Number of 
copies:
 True
-evenoddbox
-0
+1
   
   
 0
@@ -624,19 +623,19 @@
   
 
 
-  
+  
 True
-False
-True
-0
-
-  Odd and Even Pages
-  Odd Pages
-  Even Pages
-
+True
+start
+center
+True
+1
+True
+adjustment2
+1
 
-  
-Select the subset of pages to 
print.
+  
+Enter the number of copies that 
you want to print.
   
 
   
@@ -661,7 +660,8 @@
   
 True
 False
-2
+6
+3
 6
 
   
@@ -674,7 +674,7 @@
   
   
 0
-0
+1
   
 
 
@@ -684,7 +684,7 @@
   
   
 1
-0
+1
   
 
 
@@ -699,7 +699,7 @@
   
   
 0
-1
+2
 

[Libreoffice-commits] core.git: vcl/uiconfig

[Caolán McNamara (via logerrit)]

 vcl/uiconfig/ui/openlockedquerybox.ui |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit cbb24a0316dec3d333c468247fc5fd73a5fb
Author: Caolán McNamara 
AuthorDate: Wed Feb 15 12:46:33 2023 +
Commit: Caolán McNamara 
CommitDate: Wed Feb 15 15:27:19 2023 +

resave with latest glade

Change-Id: Ib1cbf1869fd7b1633178e56a47977050457640f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147084
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/uiconfig/ui/openlockedquerybox.ui 
b/vcl/uiconfig/ui/openlockedquerybox.ui
index b62d56345fbb..54efbad18e4d 100644
--- a/vcl/uiconfig/ui/openlockedquerybox.ui
+++ b/vcl/uiconfig/ui/openlockedquerybox.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -10,9 +10,6 @@
 True
 True
 dialog
-
-  
-
 
   
 False

[Libreoffice-commits] core.git: vcl/uiconfig

[Caolán McNamara (via logerrit)]

 vcl/uiconfig/ui/printdialog.ui |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 570001ad3a045c9ca25ab06d2ecf1f9e9d9ad939
Author: Caolán McNamara 
AuthorDate: Sat Feb 5 19:01:45 2022 +
Commit: Caolán McNamara 
CommitDate: Sun Feb 6 14:03:16 2022 +0100

Resolves: tdf#147218 label doesn't have use-underline set

so the _ is shown to the user, not used to add an underline

Change-Id: I2de707a2d1da8d842ef03497f9b8f69d37368f12
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129531
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 3c6bc3d86a04..9d941db942a2 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -1043,6 +1043,7 @@
   
 True
 False
+True
   
   
 False

[Libreoffice-commits] core.git: vcl/uiconfig

[Caolán McNamara (via logerrit)]

 vcl/uiconfig/ui/menutogglebutton4.ui |8 
 1 file changed, 8 insertions(+)

New commits:
commit 59c9274ec408ec074d4b4b9e4645b0787312a370
Author: Caolán McNamara 
AuthorDate: Wed Aug 11 15:50:02 2021 +0100
Commit: Caolán McNamara 
CommitDate: Wed Aug 11 20:41:19 2021 +0200

gtk4: add a separator between toggle and menu buttons

Change-Id: I00e9245801529ce817781e65fb75fa59cd3d7f79
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120331
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/uiconfig/ui/menutogglebutton4.ui 
b/vcl/uiconfig/ui/menutogglebutton4.ui
index 74c1e2fe3353..cfecfda02c28 100644
--- a/vcl/uiconfig/ui/menutogglebutton4.ui
+++ b/vcl/uiconfig/ui/menutogglebutton4.ui
@@ -1,6 +1,7 @@
 
 
 
+  
   
 True
 False
@@ -14,6 +15,13 @@
 True
   
 
+
+  
+True
+False
+vertical
+  
+
 
   
 True

[Libreoffice-commits] core.git: vcl/uiconfig vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/uiconfig/ui/printdialog.ui |5 +
 vcl/unx/gtk3/gtkinst.cxx   |3 +++
 2 files changed, 8 insertions(+)

New commits:
commit 1afbc98428f7f8cb93a269eeaacc20fc0fa22b96
Author: Caolán McNamara 
AuthorDate: Wed Jun 2 19:54:12 2021 +0100
Commit: Caolán McNamara 
CommitDate: Wed Jun 2 21:48:47 2021 +0200

gtk4: get fancy blue "suggested-action" button for Print in print dialog

Change-Id: I60edccc6bb1a5cbbb615ad7be221158ee243f37b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116623
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index b173e22f0122..f289f482a544 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -1437,6 +1437,11 @@
 
   
 
+
+  help
+  ok
+  cancel
+
 
   
 Prints the current document, 
selection, or the pages that you specify. You can also set the print options 
for the current document.
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index f581d712b57a..45dae000d9ef 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -21458,6 +21458,9 @@ ConvertResult Convert3To4(const 
Reference& xNode)
 }
 }
 
+auto xUseHeaderBar = CreateProperty(xDoc, 
"use-header-bar", "1");
+SetPropertyOnTopLevel(xContentAreaCandidate, 
xUseHeaderBar);
+
 break;
 }
 xContentAreaCandidate = 
xContentAreaCandidate->getParentNode();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/uiconfig

[andreas kainz (via logerrit)]

 vcl/uiconfig/ui/printdialog.ui |   12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 5348b3946b8f2b9581cdd8b40fa774c2a9d23868
Author: andreas kainz 
AuthorDate: Thu Apr 15 19:20:33 2021 +0200
Commit: Andreas Kainz 
CommitDate: Fri Apr 16 09:26:47 2021 +0200

Print Dialog move Selection radio button next to All Pages

Change-Id: I2d87d5ccdaf533e6d93b5d07cbe19d5e454591bc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114169
Tested-by: Jenkins
Reviewed-by: Andreas Kainz 

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index f68e122f1797..e5fdfaa9cced 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -524,7 +524,6 @@
   
 0
 0
-2
   
 
 
@@ -575,15 +574,14 @@
 True
 False
 start
-2
+2
 True
 True
 rbAllPages
   
   
-0
-2
-2
+1
+0
   
 
 
@@ -598,7 +596,7 @@
   
   
 0
-3
+2
   
 
 
@@ -615,7 +613,7 @@
   
   
 1
-3
+2
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/uiconfig

[Julien Nabet (via logerrit)]

 vcl/uiconfig/ui/screenshotparent.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ffc8409024c0de97cd1cb5fadbe72d90c3fd7d3b
Author: Julien Nabet 
AuthorDate: Fri Jan 15 21:47:28 2021 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jan 16 16:08:35 2021 +0100

Cancel action here vcl/screenshotparent

Change-Id: I136fa04e873932621b92004e8eafd7b3a32ef945
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109423
Tested-by: Jenkins
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/vcl/uiconfig/ui/screenshotparent.ui 
b/vcl/uiconfig/ui/screenshotparent.ui
index 620338c80cf8..629b1741b5de 100644
--- a/vcl/uiconfig/ui/screenshotparent.ui
+++ b/vcl/uiconfig/ui/screenshotparent.ui
@@ -23,7 +23,7 @@
 end
 
   
-_Close
+_Cancel
 True
 True
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/uiconfig

[andreas kainz (via logerrit)]

 vcl/uiconfig/ui/printdialog.ui |   49 +
 1 file changed, 40 insertions(+), 9 deletions(-)

New commits:
commit fcfa40fabb2943d7cb1adfe0057c715e225daef9
Author: andreas kainz 
AuthorDate: Sun Nov 1 22:49:50 2020 +0100
Commit: Andreas Kainz 
CommitDate: Mon Nov 2 12:09:20 2020 +0100

Print dialog alignment fixes

Change-Id: Ife471e062745ce8aa7dd9b806612c00794e4d878
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105159
Tested-by: Jenkins
Reviewed-by: Andreas Kainz 

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index c52774c2cad9..4b6e0318ff57 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -509,7 +509,7 @@
   
 True
 False
-2
+3
 6
 
   
@@ -600,6 +600,7 @@
 Include:
 True
 evenoddbox
+0
   
   
 0
@@ -647,6 +648,7 @@
 _From which print:
 True
 printextrabox
+1
   
   
 0
@@ -671,6 +673,7 @@
 Paper 
_sides:
 True
 sidesbox
+1
   
   
 0
@@ -706,6 +709,7 @@
 _Number of 
copies:
 True
 copycount
+1
   
   
 0
@@ -734,13 +738,14 @@
   
 
 
-
+  
 True
 False
 start
 Order:
 True
 reverseorder
+1
   
   
 0
@@ -837,9 +842,6 @@
 
   
 
-
-  
-
   
 
 
@@ -908,6 +910,7 @@
 Orientation:
 True
 pageorientationbox
+0
   
   
 0
@@ -922,6 +925,7 @@
 Paper size:
 True
 papersizebox
+0
   
   
 0
@@ -987,6 +991,7 @@
   
   

[Libreoffice-commits] core.git: vcl/uiconfig

[Caolán McNamara (via logerrit)]

 vcl/uiconfig/ui/printdialog.ui |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 8beafb2849ab10e659d0c181ea1069cb9015d784
Author: Caolán McNamara 
AuthorDate: Wed Oct 28 16:48:53 2020 +
Commit: Caolán McNamara 
CommitDate: Thu Oct 29 10:09:07 2020 +0100

tdf#137556 max-content-height needs gtk >= 3.22

where the 7.0 baseline is 3.18 and 7.1 is 3.20

Change-Id: I73adb9bc3cf25112925e663f8fc0c3e5191bbf6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104971
Reviewed-by: Heiko Tietze 
Reviewed-by: Caolán McNamara 
Tested-by: Jenkins

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 362c967b0745..c52774c2cad9 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -353,7 +353,6 @@
 True
 never
 in
-450
 
   
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/uiconfig

[Caolán McNamara (via logerrit)]

 vcl/uiconfig/ui/printdialog.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ed4534d32fd760274c058374c8cfc443c01fea0c
Author: Caolán McNamara 
AuthorDate: Wed Oct 28 17:16:04 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Oct 28 21:21:35 2020 +0100

print dialog has one expander "more" and one "More"

since...

commit 8eff280bc08ec3d7b2312ae4ee48df4d7328b7de
Date:   Fri Oct 2 12:35:26 2020 +0200

ui files: fix some capitalisation issues

so make the other one capitalized to match

Change-Id: I7eeac239ea99b85b310354e3a0c6dddf15ceff04
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104973
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 175df1fbc524..76107646c85c 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -842,7 +842,7 @@
   
 True
 False
-_more
+_More
 True
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/uiconfig

[andreas kainz (via logerrit)]

 vcl/uiconfig/ui/printdialog.ui |   29 +
 1 file changed, 9 insertions(+), 20 deletions(-)

New commits:
commit 42aadbcc7a3d0754654582afab1bca10a6af32d9
Author: andreas kainz 
AuthorDate: Sat Jun 6 12:19:22 2020 +0200
Commit: Andreas Kainz 
CommitDate: Sat Jun 6 18:03:41 2020 +0200

tdf#128723 fix setting width when scaling preview get bigger only

Change-Id: Idb029cc1a72b03926b23d840670a8e6d9d0b1448
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95642
Tested-by: Jenkins
Reviewed-by: Andreas Kainz 

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index d10557ac1354..94d1c64181ec 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -156,6 +156,7 @@
 True
 False
 6
+True
 vertical
 12
 
@@ -338,7 +339,6 @@
 True
 True
 6
-True
 True
 
   
@@ -969,7 +969,7 @@
 
   
 False
-start
+end
 Pages:
 True
 pagerows
@@ -1020,7 +1020,7 @@
 
   
 False
-start
+end
 Margin:
 True
 pagemarginsb
@@ -1057,7 +1057,7 @@
 
   
 False
-start
+end
 Distance:
 True
 sheetmarginsb
@@ -1095,7 +1095,7 @@
   
 True
 False
-start
+end
 Order:
 True
 orderbox
@@ -1129,7 +1129,7 @@
 True
 True
 False
-start
+end
 True
 True
   
@@ -1175,7 +1175,8 @@
   
   
 4
-4
+0
+5
   
 
 
@@ -1184,18 +1185,6 @@
 
   
 
-
-  
-
-
-  
-
-
-  
-
-
-  
-
   
 
 

[Libreoffice-commits] core.git: vcl/uiconfig

[Heiko Tietze (via logerrit)]

 vcl/uiconfig/ui/printdialog.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fcb23ee8d29c47f55ca26382d3c6be924a6fec40
Author: Heiko Tietze 
AuthorDate: Fri Apr 24 15:50:11 2020 +0200
Commit: Heiko Tietze 
CommitDate: Sat Apr 25 09:23:12 2020 +0200

Fix for print dialog

Scroll window must not scroll horizontally

Change-Id: Id1ccf5399d05b846f1d8272657a5a5fa2df0a744
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92860
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index d0ebb7abe103..63a55cb64ce6 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -344,8 +344,8 @@
   
 True
 True
+never
 in
-500
 450
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/uiconfig

[Heiko Tietze (via logerrit)]

 vcl/uiconfig/ui/printdialog.ui | 1721 -
 1 file changed, 858 insertions(+), 863 deletions(-)

New commits:
commit 26ada4335a5804735ae37cf9a89f8145e0931fd7
Author: Heiko Tietze 
AuthorDate: Thu Apr 23 13:40:29 2020 +0200
Commit: Heiko Tietze 
CommitDate: Thu Apr 23 20:13:44 2020 +0200

tdf#127782 - New Print dialog is too high

ScrollWindow behind the tab control

Change-Id: I5560f4368f94a45eeb1e3af3bf18df0f305ab3da
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92758
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index f3935ecf24c8..d0ebb7abe103 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -66,7 +66,7 @@
 0
 0
 dialog
-
+
   
 
 
@@ -146,38 +146,30 @@
   
 
 
-  
+  
 True
 False
-6
+True
+True
 
-  
+  
 True
 False
+6
+vertical
+12
 
-  
+  
 True
-True
+False
 vertical
-6
 
-  
+  
 True
 False
-vertical
-
-  
-True
-False
-GDK_STRUCTURE_MASK | 
GDK_SCROLL_MASK
-Print preview
-  
-  
-True
-True
-0
-  
-
+GDK_STRUCTURE_MASK | 
GDK_SCROLL_MASK
+Print preview
+6
   
   
 True
@@ -185,103 +177,29 @@
 0
   
 
+  
+  
+True
+True
+0
+  
+
+
+  
+True
+False
 
-  
+  
 True
 False
+6
 
-  
+  
 True
-False
-10
-6
-
-  
-True
-True
-True
-Last page
-imgLast
-  
-  
-False
-True
-end
-0
-  
-
-
-  
-True
-True
-True
-Next page
-imgForward
-  
-  
-False
-False
-end
-1
-  
-
-
-  
-True
-False
-/ %n
-  
-  
-False
-True
-end
-2
-  
-
-
-  
-True
-True
-3
-1
-  
-  
-False
-True
-end
-3
-  
-
-
-

[Libreoffice-commits] core.git: vcl/uiconfig vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/uiconfig/ui/combobox.ui  |1 -
 vcl/unx/gtk3/gtk3gtkinst.cxx |   21 ++---
 2 files changed, 14 insertions(+), 8 deletions(-)

New commits:
commit a5d3bce44bc04251fd436fabd29878429bf1
Author: Caolán McNamara 
AuthorDate: Thu Apr 16 17:10:33 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 16 20:29:13 2020 +0200

hover selection start off in the wrong place in long lists

Change-Id: I61d93b45d32cfb29e436ae71b83c8d0b252386c6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92385
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/uiconfig/ui/combobox.ui b/vcl/uiconfig/ui/combobox.ui
index 167ae1a7f5ac..e5d31743fcf1 100644
--- a/vcl/uiconfig/ui/combobox.ui
+++ b/vcl/uiconfig/ui/combobox.ui
@@ -89,7 +89,6 @@
 False
 False
 0
-True
 False
 True
 
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index e38911f1c4b1..0ab70cdb8500 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -12818,12 +12818,6 @@ private:
 }
 else
 {
-if (!m_bHoverSelection)
-{
-gtk_tree_view_set_hover_selection(m_pTreeView, true);
-m_bHoverSelection = true;
-}
-
 GtkWidget* pComboBox = GTK_WIDGET(getContainer());
 
 gint nComboWidth = gtk_widget_get_allocated_width(pComboBox);
@@ -12836,8 +12830,21 @@ private:
 gtk_widget_set_size_request(GTK_WIDGET(m_pMenuWindow), 
nPopupWidth, nPopupHeight);
 
 m_nPrePopupCursorPos = get_active();
+
 m_bActivateCalled = false;
 show_menu(pComboBox, m_pMenuWindow);
+
+// under wayland I see that the cursor pos in super
+// long treeview menus ends up in the wrong place
+// but letting all pending events get processed
+// before enabling hover selection solve it
+Scheduler::ProcessEventsToIdle();
+
+if (!m_bHoverSelection)
+{
+gtk_tree_view_set_hover_selection(m_pTreeView, true);
+m_bHoverSelection = true;
+}
 }
 }
 
@@ -13369,7 +13376,7 @@ public:
 , m_pEntry(GTK_WIDGET(gtk_builder_get_object(pComboBuilder, "entry")))
 , m_pCellView(nullptr)
 , m_aQuickSelectionEngine(*this)
-, m_bHoverSelection(true)
+, m_bHoverSelection(false)
 , m_bPopupActive(false)
 , m_bAutoComplete(false)
 , m_bAutoCompleteCaseSensitive(false)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/uiconfig

[Caolán McNamara (via logerrit)]

 vcl/uiconfig/ui/printdialog.ui |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 80b4419d94e74b79330945aa76f06b0e62fe0d88
Author: Caolán McNamara 
AuthorDate: Tue Mar 17 18:15:40 2020 +
Commit: Caolán McNamara 
CommitDate: Tue Mar 17 20:51:52 2020 +0100

missing use_underlines

Change-Id: I2953069ee266c2a7850181826b299f0037a936ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90662
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 8bc2446f242e..f3935ecf24c8 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -100,6 +100,7 @@
 True
 True
 10
+True
   
   
 False
@@ -115,6 +116,7 @@
 True
 True
 True
+True
   
   
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/uiconfig

[Seth Chaiklin (via logerrit)]

 vcl/uiconfig/ui/printdialog.ui |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit aec3cce9e4aa12e6cfe229e11d6548f0c3a7cbb5
Author: Seth Chaiklin 
AuthorDate: Fri Feb 7 16:13:59 2020 +0100
Commit: Heiko Tietze 
CommitDate: Wed Feb 19 08:03:27 2020 +0100

change label in print dialog from "OK" to "Print"

Change-Id: I1d6b04678ab039138908bc9555763bea057fa996
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88212
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index c9e3fbe5c1ff..709e662f6394 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -109,13 +109,12 @@
 
 
   
-gtk-ok
+Print
 True
 True
 True
 True
 True
-True
   
   
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/uiconfig

[Caolán McNamara (via logerrit)]

 vcl/uiconfig/ui/printdialog.ui |  339 ++---
 1 file changed, 185 insertions(+), 154 deletions(-)

New commits:
commit 0874fa237b3b6be3890915a744c5d34ba2bef8f7
Author: Caolán McNamara 
AuthorDate: Thu Jan 16 12:59:57 2020 +
Commit: Caolán McNamara 
CommitDate: Thu Jan 16 15:20:51 2020 +0100

Related: tdf#127782 use size groups to avoid changing widths on using 
expanders

Change-Id: I07335d466cf8f9fa1692372eeecbb484a2f4386d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86923
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index d4de5956f3cc..c9e3fbe5c1ff 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -482,113 +482,124 @@
 6
 12
 
-  
+  
 True
 False
-2
-6
+6
 
-  
-_All pages
+  
 True
-True
-False
-start
-2
-True
-True
-True
+False
+2
+6
+
+  
+_All pages
+True
+True
+False
+start
+2
+True
+True
+True
+  
+  
+0
+0
+2
+  
+
+
+  
+_Pages:
+True
+True
+False
+start
+2
+2
+True
+True
+rbAllPages
+  
+  
+0
+1
+  
+
+
+  
+True
+True
+True
+True
+e.g.: 1, 3-5, 7, 9
+  
+  
+1
+1
+  
+
+
+  
+_Even pages
+True
+True
+False
+start
+2
+2
+True
+True
+rbAllPages
+  
+  
+0
+2
+   

[Libreoffice-commits] core.git: vcl/uiconfig

[Heiko Tietze (via logerrit)]

 vcl/uiconfig/ui/printdialog.ui |  911 +
 1 file changed, 486 insertions(+), 425 deletions(-)

New commits:
commit 96b4bf352b1dc43637080719c91eef61fef74bf8
Author: Heiko Tietze 
AuthorDate: Thu Jan 9 11:17:25 2020 +0100
Commit: Heiko Tietze 
CommitDate: Tue Jan 14 09:42:57 2020 +0100

Resolves tdf#127782 - New Print dialog is too high

Expander added

Change-Id: Iea41f9cf335b75210de0acf5688fddd5e3dd3dbb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86478
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 215e7d82f686..fc98a18a89a9 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -502,7 +502,7 @@
   
 0
 0
-3
+2
   
 
 
@@ -534,7 +534,6 @@
   
 1
 1
-2
   
 
 
@@ -553,7 +552,7 @@
   
 0
 2
-3
+2
   
 
 
@@ -572,191 +571,207 @@
   
 0
 3
-3
-  
-
-
-  
-False
-start
-_From which print:
-True
-printextrabox
-  
-  
-0
-6
-  
-
-
-  
-False
-True
-  
-  
-1
-6
 2
   
 
 
-  
-True
-False
-start
-Paper 
_sides:
-True
-sidesbox
-  
-  
-0
-7
-  
-
-
-  
-True
-False
-True
-
-  Print on one side (simplex)
-  Print on both sides (duplex long edge)
-  Print on both sides (duplex short edge)
-
-  
-  
-1
-7
-2
-  
-
-
-  
-True
-False
-start
-_Number of 
copies:
-True
-copycount
-  
-  
- 

[Libreoffice-commits] core.git: vcl/uiconfig

[Tomaž Vajngerl (via logerrit)]

 vcl/uiconfig/theme_definitions/ios/definition.xml |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit ab9ac0fc697f57f0804dea03812dd2adfd99794b
Author: Tomaž Vajngerl 
AuthorDate: Thu Dec 12 21:41:39 2019 +0100
Commit: Tomaž Vajngerl 
CommitDate: Thu Dec 12 21:41:39 2019 +0100

iOS theme: set spinbox orientation to "decrease-edit-increase"

iOS theme was designed to have spinbox orientation set to
"decrease-edit-increase", but this was not explicitly set in the
theme definition as it was also the default. The defualt was
changed recently to "stacked" and it broke the iOS theme.

Change-Id: If43fa46c04415dda1efe0855c4901b5aede7eb32

diff --git a/vcl/uiconfig/theme_definitions/ios/definition.xml 
b/vcl/uiconfig/theme_definitions/ios/definition.xml
index 8725e14ee1f2..958c85600e15 100644
--- a/vcl/uiconfig/theme_definitions/ios/definition.xml
+++ b/vcl/uiconfig/theme_definitions/ios/definition.xml
@@ -95,6 +95,11 @@
 selected="true|false|any"
 button-value="true|false|any"
 extra="{various}"
+
+control specific:
+ attributes:
+- orientation: stacked (default), edit-decrease-increase, 
decrease-edit-increase
+
 -->
 
 
@@ -242,7 +247,7 @@
 
 
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/uiconfig

[Heiko Tietze (via logerrit)]

 vcl/uiconfig/ui/printdialog.ui |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 291b1acd3b9664ed41954458648448d7799d4df9
Author: Heiko Tietze 
AuthorDate: Thu Dec 5 16:17:02 2019 +0100
Commit: Heiko Tietze 
CommitDate: Fri Dec 6 07:16:36 2019 +0100

Resolves tdf#129140 - Wording in printer dialog

Wording improved

Change-Id: I67fcee9bdae869eb57882b1944e8975d4c564735
Reviewed-on: https://gerrit.libreoffice.org/84572
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 1822f688a1c9..215e7d82f686 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -619,9 +619,9 @@
 False
 True
 
-  Print only in one side
-  Print in both sides (long edge)
-  Print in both sides (short edge)
+  Print on one side (simplex)
+  Print on both sides (duplex long edge)
+  Print on both sides (duplex short edge)
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/uiconfig

[Tomaž Vajngerl (via logerrit)]

 vcl/uiconfig/theme_definitions/ios/definition.xml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6ed8c8ab84cc344f5388056da20996dd5266aadf
Author: Tomaž Vajngerl 
AuthorDate: Sun Nov 10 22:12:15 2019 +0100
Commit: Tomaž Vajngerl 
CommitDate: Mon Nov 11 00:17:59 2019 +0100

widget theme: add missing actionButtonTextColor style to iOS theme

Forgot to add "actionButtonTextColor" to the iOS theme definition.

Change-Id: I29207512a04068759021d4ae6a30824b56498de6
Reviewed-on: https://gerrit.libreoffice.org/82394
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/uiconfig/theme_definitions/ios/definition.xml 
b/vcl/uiconfig/theme_definitions/ios/definition.xml
index 2a29df41d378..310f450f0f04 100644
--- a/vcl/uiconfig/theme_definitions/ios/definition.xml
+++ b/vcl/uiconfig/theme_definitions/ios/definition.xml
@@ -10,8 +10,8 @@
 
 
 
+
 
-
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/uiconfig

[Rasmus Jonsson (via logerrit)]

 vcl/uiconfig/ui/printdialog.ui |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 93cc8d83cd1f814e8b1df03de2e3c25efa4a9d16
Author: Rasmus Jonsson 
AuthorDate: Fri Apr 5 15:24:18 2019 +0200
Commit: Katarina Behrens 
CommitDate: Mon Apr 8 09:41:13 2019 +0200

tdf#124567 Print dialog: distance & margin mixed up

Change places of distance and margin input boxes (note: ids were set
correctly, they were merely labelled incorrectly).
Also moved the object in the .ui file to make it easier to read.

Change-Id: I180d7afdf9dfb483f5dbfcf7ba68c73900499807
Reviewed-on: https://gerrit.libreoffice.org/70303
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 063d961e8bca..043a27771a38 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -964,6 +964,15 @@
   
 
 
+  
+True
+  
+  
+1
+4
+  
+
+
   
 False
 start
@@ -982,15 +991,6 @@
   
   
 1
-4
-  
-
-
-  
-True
-  
-  
-1
 5
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/uiconfig

[Libreoffice Gerrit user]

 vcl/uiconfig/theme_definitions/ios/definition.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ac12cd5f6813bf740417a4d732f7b0a1761bd3e7
Author: Tomaž Vajngerl 
AuthorDate: Fri Mar 15 21:24:01 2019 +0800
Commit: Tomaž Vajngerl 
CommitDate: Sat Mar 16 00:26:58 2019 +0100

ios widget theme: fix wrong svg filename for the button in editbox

Change-Id: I3c40e62bba3590f547e50bb3eca221112ce92405
Reviewed-on: https://gerrit.libreoffice.org/69314
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/uiconfig/theme_definitions/ios/definition.xml 
b/vcl/uiconfig/theme_definitions/ios/definition.xml
index 5a4be114ea97..763967d9ede1 100644
--- a/vcl/uiconfig/theme_definitions/ios/definition.xml
+++ b/vcl/uiconfig/theme_definitions/ios/definition.xml
@@ -180,10 +180,10 @@
 
 
 
-
+
 
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/uiconfig

[Libreoffice Gerrit user]

 vcl/uiconfig/theme_definitions/definition.xml |   28 +-
 1 file changed, 14 insertions(+), 14 deletions(-)

New commits:
commit cdabde598e9569b9427b70d616e50f22daa1bb61
Author: Tomaž Vajngerl 
AuthorDate: Sun Mar 10 17:24:00 2019 +0100
Commit: Tomaž Vajngerl 
CommitDate: Sun Mar 10 21:24:46 2019 +0100

widget theme: toolbar drawing definition - separator, buttons

Change-Id: Ic8574c0f0c3c51526254c34d820977a0fbb520a0
Reviewed-on: https://gerrit.libreoffice.org/69011
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/uiconfig/theme_definitions/definition.xml 
b/vcl/uiconfig/theme_definitions/definition.xml
index 0a6f696320b5..027b78e5fd6e 100644
--- a/vcl/uiconfig/theme_definitions/definition.xml
+++ b/vcl/uiconfig/theme_definitions/definition.xml
@@ -191,12 +191,10 @@
 
 
 
-
-
+ 
 
 
-
-
+ 
 
 
 
@@ -395,32 +393,34 @@
 
 
 
-
-
-
+ 
 
 
 
-
-
-
+ 
 
 
 
 
-
+
 
 
 
 
 
-
+
 
 
 
 
- 
-
+
+
+
+
+
+
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/uiconfig

[Libreoffice Gerrit user]

 vcl/uiconfig/theme_definitions/definition.xml |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 0db0c1edd91e73a655d2db093d35f03e4966a68d
Author: Tomaž Vajngerl 
AuthorDate: Sun Mar 3 13:39:01 2019 +0100
Commit: Tomaž Vajngerl 
CommitDate: Wed Mar 6 22:47:10 2019 +0100

draw combobox (entire areaonly) from external svg, fix editbox

Change-Id: Iba7e5b45c4f1ac6f87cbca963bb5284ce810ebcf
Reviewed-on: https://gerrit.libreoffice.org/68825
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/uiconfig/theme_definitions/definition.xml 
b/vcl/uiconfig/theme_definitions/definition.xml
index 244f9c259ce4..d12161d6081c 100644
--- a/vcl/uiconfig/theme_definitions/definition.xml
+++ b/vcl/uiconfig/theme_definitions/definition.xml
@@ -114,7 +114,11 @@
 
 
 
-   
+
+
+
+
+
 
 
 
@@ -134,7 +138,7 @@
 
 
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/uiconfig

[Libreoffice Gerrit user]

 vcl/uiconfig/ui/printdialog.ui |1 -
 1 file changed, 1 deletion(-)

New commits:
commit bfa1595f94da80e6d27d0ef2e9b8f83407f075ca
Author: Roman Kuznetsov 
AuthorDate: Sat Feb 9 14:29:51 2019 +0100
Commit: Heiko Tietze 
CommitDate: Mon Feb 11 09:56:38 2019 +0100

tdf#123311: Label "Order" in Print dialog should be left align

Change-Id: Ibaeac1ddfbe34a11d3205abc6257367497dc855e
Reviewed-on: https://gerrit.libreoffice.org/67581
Reviewed-by: Heiko Tietze 
Tested-by: Heiko Tietze 

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 99fff2bce55e..8ede860fa291 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -793,7 +793,6 @@
 True
 False
 start
-12
 Order:
 True
 orderbox
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/uiconfig

[Libreoffice Gerrit user]

 vcl/uiconfig/ui/printdialog.ui |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 2b34be5be176e6080f0a39294bf09c6d6183f4b5
Author: Sass Dávid 
AuthorDate: Thu Jan 10 13:45:45 2019 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Jan 21 07:27:47 2019 +0100

tdf#122616 UI Enhancement: Print dialog texts changed as requested in 
comments

Print dialog text's capitalization changed to follow the styles used in 
GNOME user interface elements.

Change-Id: I718c4776eaa28e98c5209d160cd47e27782b1101
Reviewed-on: https://gerrit.libreoffice.org/66093
Reviewed-by: Gabor Kelemen 
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 4ab0d8f9c6ba..99fff2bce55e 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -527,7 +527,7 @@
 False
 start
 8
-Number of 
Copies:
+Number of 
copies:
 True
 copycount
   
@@ -651,7 +651,7 @@
 False
 start
 6
-Paper Sides:
+Paper sides:
 True
 sidesbox
   
@@ -698,7 +698,7 @@
 
 
   
-Print in Reverse 
Order
+Print in reverse 
order
 True
 True
 False
@@ -779,7 +779,7 @@
 True
 False
 start
-Paper Size:
+Paper size:
 True
 papersizebox
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/uiconfig

[Libreoffice Gerrit user]

 vcl/uiconfig/ui/printdialog.ui |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e8bee017fb46f47a4164517813b9d89e43a258e0
Author: Adolfo Jayme Barrientos 
AuthorDate: Fri Jan 11 14:41:40 2019 -0600
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Jan 11 14:41:40 2019 -0600

Add back Print dialog’s title…

... which went missing in commit cb443d07d54d6698eff51b5be2c6b56323f10315

Change-Id: I5f980fd0c6b66b2a2135a659bcb0d3330d3b887e

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 7d0d2aa1e01f..4ab0d8f9c6ba 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -124,6 +124,7 @@
   
 False
 6
+Print
 dialog
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/uiconfig

[Libreoffice Gerrit user]

 vcl/uiconfig/ui/printdialog.ui |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 5cba44179be4eefae428eb9703520972b02b9ac4
Author: Roman Kuznetsov 
AuthorDate: Wed Jan 9 14:20:11 2019 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Jan 9 22:42:27 2019 +0100

tdf#122595 Capitalize item in list Order in Print dialogue

Change-Id: I395735c60eaf33b58781abe5d7e1c7b4793cfccf
Reviewed-on: https://gerrit.libreoffice.org/66027
Reviewed-by: Heiko Tietze 
Tested-by: Jenkins

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index f15ea28151e3..7d0d2aa1e01f 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -74,16 +74,16 @@
 
 
   
-left 
to right, then down
+Left 
to right, then down
   
   
-top to 
bottom, then right
+Top to 
bottom, then right
   
   
-top to 
bottom, then left
+Top to 
bottom, then left
   
   
-right 
to left, then down
+Right 
to left, then down
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/uiconfig

[Libreoffice Gerrit user]

 vcl/uiconfig/ui/printdialog.ui |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 2086b781056fe8885ba8caaf27975ef46a6a814b
Author: Michael Weghorn 
AuthorDate: Sat Dec 29 00:13:28 2018 +0100
Commit: Noel Grandin 
CommitDate: Sat Dec 29 07:08:34 2018 +0100

tdf#122360 Decrease size of spinbutton for copy count

Explicitly set vertical alignment to "centre" rather than the
default "fill" which caused the spinbutton to fill the same vertical
space as the neighbouring GtkBox holding the collate settings,
making it appear to large.

Change-Id: I04818d59cf8babe424d96d0c9ef322fac9ef756a
Reviewed-on: https://gerrit.libreoffice.org/65694
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index b8a04ebf9093..f15ea28151e3 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -125,6 +125,9 @@
 False
 6
 dialog
+
+  
+
 
   
 False
@@ -537,6 +540,7 @@
   
 True
 True
+center
 adjustment2
   
   
@@ -1147,8 +1151,5 @@
 
   
 
-
-  
-
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/uiconfig

[Libreoffice Gerrit user]

 vcl/uiconfig/ui/printdialog.ui |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 3c7c4afc2d34702151484105925bca3c0ba660c8
Author: Samuel Thibault 
AuthorDate: Fri Sep 7 12:53:41 2018 +0200
Commit: Katarina Behrens 
CommitDate: Tue Oct 2 15:27:08 2018 +0200

printdialog: Use labelling a11y relation instead of static role

The field names are arguably rather labels for the static-role widgets
providing the status.

Change-Id: Ic3407adf84d7399696e51de712635a986fa0c190
Reviewed-on: https://gerrit.libreoffice.org/60142
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index ce29839953e7..2c2061c22c43 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -335,7 +335,7 @@
 Status:
 0
 
-  
+  
 
   
   
@@ -350,7 +350,7 @@
 Location:
 0
 
-  
+  
 
   
   
@@ -365,7 +365,7 @@
 Comment:
 0
 
-  
+  
 
   
   
@@ -381,6 +381,7 @@
 0
 
   
+  
 
   
   
@@ -396,6 +397,7 @@
 0
 
   
+  
 
   
   
@@ -411,6 +413,7 @@
 0
 
   
+  
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/uiconfig

[Gabor Kelemen]

 vcl/uiconfig/ui/printdialog.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fb027f0f556c48e42a08059c8e92c3bfc0f52209
Author: Gabor Kelemen 
Date:   Thu May 3 21:03:07 2018 +0200

tdf#112607 Use better wording for single/multiple print job option

Separate seems to be more straightforward here

Change-Id: I214211d75354da4b01ca5fe23dd51525d9892743
Reviewed-on: https://gerrit.libreoffice.org/53816
Tested-by: Jenkins 
Reviewed-by: Heiko Tietze 

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 3ea852d44397..b2308cf2f5b9 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -1454,7 +1454,7 @@
 6
 
   
-Create single print jobs for collated 
output
+Create separate print jobs for collated 
output
 True
 True
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/uiconfig vcl/unx

[Caolán McNamara]

 vcl/uiconfig/ui/cupspassworddialog.ui |   16 ++--
 vcl/unx/generic/printer/cupsmgr.cxx   |   61 --
 2 files changed, 34 insertions(+), 43 deletions(-)

New commits:
commit 1e9e78bde0e659c89ea96b259845539dab500195
Author: Caolán McNamara 
Date:   Thu Apr 12 10:33:34 2018 +0100

weld RTSPWDialog

Change-Id: I822c15bb4326d1b7b96b2af9aefbb3deecc7b229
Reviewed-on: https://gerrit.libreoffice.org/52770
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/uiconfig/ui/cupspassworddialog.ui 
b/vcl/uiconfig/ui/cupspassworddialog.ui
index 7b2cb5d0232d..9b37d3eacc2d 100644
--- a/vcl/uiconfig/ui/cupspassworddialog.ui
+++ b/vcl/uiconfig/ui/cupspassworddialog.ui
@@ -1,11 +1,14 @@
 
-
+
 
   
   
 False
 6
 Authentication 
Request
+True
+0
+0
 normal
 
   
@@ -66,10 +69,10 @@
   
 True
 False
-1
 _User:
 True
 user
+1
   
   
 0
@@ -80,10 +83,10 @@
   
 True
 False
-1
 _Password:
 True
 pass
+1
   
   
 0
@@ -94,11 +97,11 @@
   
 True
 False
-0
 Please enter your authentication data for 
server “%s”
 True
 True
 56
+0
   
   
 0
@@ -111,6 +114,7 @@
 True
 True
 True
+True
   
   
 1
@@ -123,6 +127,7 @@
 True
 True
 False
+True
   
   
 1
@@ -142,5 +147,8 @@
   ok
   cancel
 
+
+  
+
   
 
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx 
b/vcl/unx/generic/printer/cupsmgr.cxx
index 328e9246e9f5..a6cae038aa36 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -34,9 +34,8 @@
 
 #include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 
@@ -827,66 +826,50 @@ bool CUPSManager::writePrinterConfig()
 
 namespace
 {
-class RTSPWDialog : public ModalDialog
+class RTSPWDialog : public weld::GenericDialogController
 {
-VclPtr m_pText;
-VclPtr  m_pUserEdit;
-VclPtr  m_pPassEdit;
+std::unique_ptr m_xText;
+std::unique_ptr m_xUserEdit;
+std::unique_ptr m_xPassEdit;
 
 public:
-RTSPWDialog(const OString& rServer, const OString& rUserName, 
vcl::Window* pParent);
-virtual ~RTSPWDialog() override;
-virtual void dispose() override;
+RTSPWDialog(const OString& rServer, const OString& rUserName, 
weld::Window* pParent);
 OString getUserName() const;
 OString getPassword() const;
 };
 
-RTSPWDialog::RTSPWDialog( const OString& rServer, const OString& 
rUserName, vcl::Window* pParent )
-: ModalDialog(pParent, "CUPSPasswordDialog",
-"vcl/ui/cupspassworddialog.ui")
+RTSPWDialog::RTSPWDialog( const OString& rServer, const OString& 
rUserName, weld::Window* pParent )
+: GenericDialogController(pParent, "vcl/ui/cupspassworddialog.ui", 
"CUPSPasswordDialog")
+, m_xText(m_xBuilder->weld_label("text"))
+, m_xUserEdit(m_xBuilder->weld_entry("user"))
+, m_xPassEdit(m_xBuilder->weld_entry("pass"))
 {
-get(m_pText, "text");
-get(m_pUserEdit, "user");
-get(m_pPassEdit, "pass");
-
-OUString aText(m_pText->GetText());
+OUString aText(m_xText->get_label());
 aText = aText.replaceFirst("%s", OStringToOUString(rServer, 
osl_getThreadTextEncoding()));
-m_pText->SetText(aText);
-m_pUserEdit->SetText( OStringToOUString(rUserName, 
osl_getThreadTextEncoding()));
-}
-
-RTSPWDialog::~RTSPWDialog()
-{
-disposeOnce();
-}
-
-void RTSPWDialog::dispose()
-{
-m_pText.clear();
-m_pUserEdit.clear();
-m_pPassEdit.clear();
-ModalDialog::dispose();
+m_xText->set_label(aText);
+m_xUserEdit->set_text(OStringToOUString(rUserName, 
osl_getThreadTextEncoding()));
 }
 
 OString RTSPWDialog::getUserName() const
 {
-return OUStringToOString( m_pUserEdit->GetText(), 
osl_getThreadTextEncoding() );
+return OUStringToOString( m_xUserEdit->get_text(), 
osl_getThreadTextEncoding() );
 }
 
 OString RTSPWDialog::getPassword() const
 {
-return OUStringToOString( m_pPassEdit->GetText(), 

[Libreoffice-commits] core.git: vcl/uiconfig vcl/unx

[Caolán McNamara]

 vcl/uiconfig/ui/querydialog.ui  |   11 +-
 vcl/unx/generic/print/genprnpsp.cxx |   63 ++--
 2 files changed, 35 insertions(+), 39 deletions(-)

New commits:
commit 388cee7be6d27fefeadc709c501b700817bce5fd
Author: Caolán McNamara 
Date:   Thu Apr 12 10:41:12 2018 +0100

weld QueryString

Change-Id: I0caf5b563349bf8260f266b0f4658306c9ec72d9
Reviewed-on: https://gerrit.libreoffice.org/52771
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/uiconfig/ui/querydialog.ui b/vcl/uiconfig/ui/querydialog.ui
index 454c0cd67557..cc3278e9f73b 100644
--- a/vcl/uiconfig/ui/querydialog.ui
+++ b/vcl/uiconfig/ui/querydialog.ui
@@ -1,11 +1,14 @@
 
-
+
 
   
   
 False
 6
 New Data Type
+True
+0
+0
 normal
 
   
@@ -67,9 +70,9 @@
   
 True
 False
-0
 True
 entry
+0
   
   
 0
@@ -81,6 +84,7 @@
 True
 True
 True
+True
   
   
 0
@@ -100,5 +104,8 @@
   ok
   cancel
 
+
+  
+
   
 
diff --git a/vcl/unx/generic/print/genprnpsp.cxx 
b/vcl/unx/generic/print/genprnpsp.cxx
index 53f9576b6eac..b2d46d91d753 100644
--- a/vcl/unx/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -37,16 +37,13 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
-#include 
 #include 
-#include 
 #include 
 #include 
 #include 
+#include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -88,63 +85,55 @@ static OUString getPdfDir( const PrinterInfo& rInfo )
 
 namespace
 {
-class QueryString : public ModalDialog
+class QueryString : public weld::GenericDialogController
 {
 private:
-VclPtrm_pOKButton;
-VclPtr   m_pFixedText;
-VclPtrm_pEdit;
 OUString&   m_rReturnValue;
 
-DECL_LINK( ClickBtnHdl, Button*, void );
+std::unique_ptr m_xOKButton;
+std::unique_ptr m_xFixedText;
+std::unique_ptr m_xEdit;
+
+DECL_LINK( ClickBtnHdl, weld::Button&, void );
 
 public:
 // parent window, Query text, initial value
-QueryString(vcl::Window*, OUString const &, OUString &);
-virtual ~QueryString() override { disposeOnce(); }
-virtual void dispose() override
-{
-m_pOKButton.clear();
-m_pFixedText.clear();
-m_pEdit.clear();
-ModalDialog::dispose();
-}
+QueryString(weld::Window*, OUString const &, OUString &);
 };
 
 /*
  *  QueryString
  */
-QueryString::QueryString(vcl::Window* pParent, OUString const & rQuery, 
OUString& rRet)
-: ModalDialog(pParent, "QueryDialog",
-"vcl/ui/querydialog.ui" )
+QueryString::QueryString(weld::Window* pParent, OUString const & rQuery, 
OUString& rRet)
+: GenericDialogController(pParent, "vcl/ui/querydialog.ui", 
"QueryDialog")
 , m_rReturnValue( rRet )
+, m_xOKButton(m_xBuilder->weld_button("ok"))
+, m_xFixedText(m_xBuilder->weld_label("label"))
+, m_xEdit(m_xBuilder->weld_entry("entry"))
 {
-get(m_pOKButton, "ok");
-get(m_pFixedText, "label");
-get(m_pEdit, "entry");
-
-m_pOKButton->SetClickHdl(LINK(this, QueryString, ClickBtnHdl));
-m_pFixedText->SetText(rQuery);
-m_pEdit->SetText(m_rReturnValue);
-SetText(rQuery);
+m_xOKButton->connect_clicked(LINK(this, QueryString, ClickBtnHdl));
+m_xFixedText->set_label(rQuery);
+m_xEdit->set_text(m_rReturnValue);
+m_xDialog->set_title(rQuery);
 }
 
-IMPL_LINK( QueryString, ClickBtnHdl, Button*, pButton, void )
+IMPL_LINK(QueryString, ClickBtnHdl, weld::Button&, rButton, void)
 {
-if (pButton == m_pOKButton)
+if ( == m_xOKButton.get())
 {
-m_rReturnValue = m_pEdit->GetText();
-EndDialog( 1 );
+m_rReturnValue = m_xEdit->get_text();
+m_xDialog->response(RET_OK);
 }
 else
-EndDialog();
+m_xDialog->response(RET_CANCEL);
 }
 
 int QueryFaxNumber(OUString& rNumber)
 {
 OUString aTmpString(VclResId(SV_PRINT_QUERYFAXNUMBER_TXT));
-ScopedVclPtrInstance< QueryString > aQuery( nullptr, aTmpString, 
rNumber );
-return aQuery->Execute();
+vcl::Window* pWin = Application::GetDefDialogParent();
+QueryString aQuery(pWin ? pWin->GetFrameWeld() : nullptr, aTmpString, 
rNumber);
+return aQuery.run();
 }
 }
 
___
Libreoffice-commits mailing list

[Libreoffice-commits] core.git: vcl/uiconfig vcl/unx

[Katarina Behrens]

 vcl/uiconfig/ui/printerpaperpage.ui |   40 
 vcl/unx/generic/print/prtsetup.cxx  |   16 +-
 vcl/unx/generic/print/prtsetup.hxx  |3 ++
 3 files changed, 45 insertions(+), 14 deletions(-)

New commits:
commit 75fc4934c3aafcd83d9bbee63d8d24cbddae8ea0
Author: Katarina Behrens 
Date:   Fri Oct 27 18:02:35 2017 +0200

tdf#79077: copy 'paper from printer setup' toggle

into printer properties dialog, it is rather badly accessible
(almost invisible) in File > Print > Options tabpage

Change-Id: I18d538a20dc207c359ae1e7c2c914a68daf58f31
Reviewed-on: https://gerrit.libreoffice.org/43956
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

diff --git a/vcl/uiconfig/ui/printerpaperpage.ui 
b/vcl/uiconfig/ui/printerpaperpage.ui
index 90d72859708d..c8d834a1e1e5 100644
--- a/vcl/uiconfig/ui/printerpaperpage.ui
+++ b/vcl/uiconfig/ui/printerpaperpage.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -16,52 +16,52 @@
   
 True
 False
-1
 _Paper size:
 True
+1
   
   
 0
-0
+1
   
 
 
   
 True
 False
-1
 _Orientation:
 True
+1
   
   
 0
-1
+2
   
 
 
   
 True
 False
-1
 _Duplex:
 True
+1
   
   
 0
-2
+3
   
 
 
   
 True
 False
-1
 Paper tray:
 True
+1
   
   
 0
-3
+4
   
 
 
@@ -71,7 +71,7 @@
   
   
 1
-0
+1
   
 
 
@@ -85,7 +85,7 @@
   
   
 1
-1
+2
   
 
 
@@ -95,7 +95,7 @@
   
   
 1
-2
+3
   
 
 
@@ -105,7 +105,21 @@
   
   
 1
-3
+4
+  
+
+
+  
+Use only paper size from printer 
preferences
+True
+True
+False
+True
+  
+  
+0
+0
+2
   
 
   
diff --git a/vcl/unx/generic/print/prtsetup.cxx 
b/vcl/unx/generic/print/prtsetup.cxx
index 3faddbf3e7b8..dc667fbc9825 100644
--- a/vcl/unx/generic/print/prtsetup.cxx
+++ b/vcl/unx/generic/print/prtsetup.cxx
@@ -152,6 +152,7 @@ RTSPaperPage::RTSPaperPage(RTSDialog* pParent)
 : TabPage(pParent->m_pTabControl, "PrinterPaperPage", 
"vcl/ui/printerpaperpage.ui")
 , m_pParent( pParent )
 {
+get(m_pCbFromSetup, "papersizefromsetup");
 get(m_pPaperText, "paperft");
 get(m_pPaperBox, "paperlb");
 get(m_pOrientBox, "orientlb");
@@ -164,6 +165,8 @@ RTSPaperPage::RTSPaperPage(RTSDialog* pParent)
 m_pOrientBox->SetSelectHdl( LINK( this, RTSPaperPage, SelectHdl ) );
 m_pDuplexBox->SetSelectHdl( LINK( this, RTSPaperPage, SelectHdl ) );
 m_pSlotBox->SetSelectHdl( LINK( this, RTSPaperPage, SelectHdl ) );
+m_pCbFromSetup->SetToggleHdl( LINK( this, RTSPaperPage, CheckBoxHdl ) );
+
 
 sal_Int32 nPos = 0;
 
@@ -189,6 +192,7 @@ void RTSPaperPage::dispose()
 {
 m_pParent.clear();
 m_pPaperText.clear();
+m_pCbFromSetup.clear();
 m_pPaperBox.clear();
 m_pOrientBox.clear();
 m_pDuplexText.clear();
@@ -242,9 +246,11 @@ void RTSPaperPage::update()
 m_pSlotBox->Enable( false );
 }
 
+if ( m_pParent->m_aJobData.m_bPapersizeFromSetup )
+m_pCbFromSetup->Check( m_pParent->m_aJobData.m_bPapersizeFromSetup );
 // disable those, unless user wants to use papersize from printer prefs
 // as they have no influence on what's going to be printed anyway
-if (!m_pParent->m_aJobData.m_bPapersizeFromSetup)
+else
 {
 m_pPaperBox->Enable( false );
 m_pOrientBox->Enable( false );
@@ -283,6 +289,14 @@ IMPL_LINK( RTSPaperPage, SelectHdl, ListBox&, rBox, void )
 m_pParent->SetDataModified( true );
 }
 
+IMPL_LINK( RTSPaperPage, CheckBoxHdl, CheckBox&, /*cBox*/, void )
+{
+bool bFromSetup = m_pCbFromSetup->IsChecked();
+m_pParent->m_aJobData.m_bPapersizeFromSetup = bFromSetup;
+m_pPaperBox->Enable( bFromSetup );
+m_pOrientBox->Enable( bFromSetup );
+m_pParent->SetDataModified( true );
+}
 /*
  * RTSDevicePage
  */
diff --git a/vcl/unx/generic/print/prtsetup.hxx 
b/vcl/unx/generic/print/prtsetup.hxx
index ff4d3fb01df7..924d4c54b27f 100644
--- a/vcl/unx/generic/print/prtsetup.hxx
+++ b/vcl/unx/generic/print/prtsetup.hxx
@@ -78,6 +78,8 @@ class RTSPaperPage : public TabPage
 {
 VclPtr  m_pParent;
 
+VclPtr   m_pCbFromSetup;
+
 VclPtr  m_pPaperText;
 VclPtrm_pPaperBox;
 
@@ -90,6 +92,7 @@ class RTSPaperPage : public TabPage
 VclPtrm_pSlotBox;
 
 DECL_LINK( SelectHdl, ListBox&, void );
+DECL_LINK( CheckBoxHdl, CheckBox&, void );
 

[Libreoffice-commits] core.git: vcl/uiconfig vcl/unx

[Caolán McNamara]

 vcl/uiconfig/ui/printerpropertiesdialog.ui |   16 ++
 vcl/unx/generic/print/prtsetup.cxx |   32 ++---
 2 files changed, 19 insertions(+), 29 deletions(-)

New commits:
commit d1e19bd285dfcb60cc088344faa1dd63f095352c
Author: Caolán McNamara 
Date:   Wed Oct 25 10:53:28 2017 +0100

Resolves: tdf#113435 device tab missing from print dialog

Change-Id: I6119d1cbd5484ac2a26d60a7db4ac8fc11165561
Reviewed-on: https://gerrit.libreoffice.org/43818
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/uiconfig/ui/printerpropertiesdialog.ui 
b/vcl/uiconfig/ui/printerpropertiesdialog.ui
index c6fe076145a2..96662860f946 100644
--- a/vcl/uiconfig/ui/printerpropertiesdialog.ui
+++ b/vcl/uiconfig/ui/printerpropertiesdialog.ui
@@ -71,7 +71,15 @@
   
 
 
-  
+  
+True
+False
+Paper
+  
+  
+1
+False
+  
 
 
   
@@ -86,13 +94,13 @@
   
 
 
-  
+  
 True
 False
-Paper
+Device
   
   
-1
+2
 False
   
 
diff --git a/vcl/unx/generic/print/prtsetup.cxx 
b/vcl/unx/generic/print/prtsetup.cxx
index 0faee232cdd6..3faddbf3e7b8 100644
--- a/vcl/unx/generic/print/prtsetup.cxx
+++ b/vcl/unx/generic/print/prtsetup.cxx
@@ -83,12 +83,10 @@ RTSDialog::RTSDialog(const PrinterInfo& rJobData, 
vcl::Window* pParent)
 get(m_pCancelButton, "cancel");
 get(m_pTabControl, "notebook");
 
-sal_uInt16 nPageCount = m_pTabControl->GetPageCount();
-for (sal_uInt16 nPage = 0; nPage < nPageCount; ++nPage)
-{
-sal_uInt16 nPageId = m_pTabControl->GetPageId(nPage);
-m_pTabControl->SetTabPage(nPageId, nullptr);
-}
+m_pPaperPage = VclPtr::Create( this );
+m_pDevicePage = VclPtr::Create( this );
+m_pTabControl->SetTabPage(m_pTabControl->GetPageId("paper"), m_pPaperPage);
+m_pTabControl->SetTabPage(m_pTabControl->GetPageId("device"), 
m_pDevicePage);
 
 OUString aTitle(GetText());
 SetText(aTitle.replaceAll("%s", m_aJobData.m_aPrinterName));
@@ -114,28 +112,12 @@ void RTSDialog::dispose()
 TabDialog::dispose();
 }
 
-IMPL_LINK( RTSDialog, ActivatePage, TabControl*, pTabCtrl, void )
+IMPL_LINK_NOARG(RTSDialog, ActivatePage, TabControl*, void)
 {
-if( pTabCtrl != m_pTabControl )
-return;
-
 sal_uInt16 nId = m_pTabControl->GetCurPageId();
 OString sPage = m_pTabControl->GetPageName(nId);
-if ( ! m_pTabControl->GetTabPage( nId ) )
-{
-TabPage *pPage = nullptr;
-if (sPage == "paper")
-pPage = m_pPaperPage = VclPtr::Create( this );
-else if (sPage == "device")
-pPage = m_pDevicePage = VclPtr::Create( this );
-if( pPage )
-m_pTabControl->SetTabPage( nId, pPage );
-}
-else
-{
-if (sPage == "paper")
-m_pPaperPage->update();
-}
+if (sPage == "paper")
+m_pPaperPage->update();
 }
 
 IMPL_LINK( RTSDialog, ClickButton, Button*, pButton, void )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/uiconfig

[Adolfo Jayme Barrientos]

 vcl/uiconfig/ui/printdialog.ui |   83 +++--
 1 file changed, 7 insertions(+), 76 deletions(-)

New commits:
commit 4e6fd4f4b5e82f6d15d181934adbe7d23dde617a
Author: Adolfo Jayme Barrientos 
Date:   Wed Apr 27 13:48:34 2016 -0500

Print dialog: minor spacing tweaks

Change-Id: I58ea5ec681746b36d6eb1899b7fd9a42adb29dae

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 08e1173..50a86b5 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -1,8 +1,8 @@
 
-
+
 
   
-  
+  
   
 1
 16384
@@ -136,6 +136,7 @@
 False
 True
 0
+True
   
 
 
@@ -150,6 +151,7 @@
 False
 True
 1
+True
   
 
 
@@ -165,6 +167,7 @@
 True
 2
 True
+True
   
 
   
@@ -332,8 +335,6 @@
   
 0
 0
-1
-1
   
 
 
@@ -346,8 +347,6 @@
   
 0
 1
-1
-1
   
 
 
@@ -360,8 +359,6 @@
   
 0
 2
-1
-1
   
 
 
@@ -374,8 +371,6 @@
   
 1
 0
-1
-1
   
 
 
@@ -388,8 +383,6 @@
   
 1
 1
-1
-1
   
 
 
@@ -402,8 +395,6 @@
   
 1
 2
-1
-1
   
 
   
@@ -419,8 +410,6 @@
   
 0
 1
-1
-1
   
 
 
@@ -435,8 +424,6 @@
   
 1
 1
-1
-1
   
 
 
@@ -453,7 +440,6 @@
 0
 0
 2
-1
   
 
   
@@ -488,20 +474,7 @@
 True
 False
 6
-6
-
-  
-True
-False
-vertical
-  
-  
-1
-0
-1
-1
-  
-
+12
 
   
 True
@@ 

[Libreoffice-commits] core.git: vcl/uiconfig

[Samuel Mehrbrodt]

 vcl/uiconfig/ui/notebookbar.ui |  722 -
 1 file changed, 494 insertions(+), 228 deletions(-)

New commits:
commit 361b589e20b07e44f99ae2fb9b9c2a9e2796410f
Author: Samuel Mehrbrodt 
Date:   Tue Oct 20 11:12:07 2015 +0200

NotebookBar: Initial "Home" tab for Writer

Change-Id: I92faa8dfab7703b81ce96dafaac840cfb49ff3bb

diff --git a/vcl/uiconfig/ui/notebookbar.ui b/vcl/uiconfig/ui/notebookbar.ui
index 8177e7a..7997c54 100644
--- a/vcl/uiconfig/ui/notebookbar.ui
+++ b/vcl/uiconfig/ui/notebookbar.ui
@@ -1,38 +1,109 @@
 
+
 
-  
+  
+  
+  
   
 True
 False
 
-  
+  
 True
-False
+True
 True
 True
 
-  
+  
 True
-True
-True
-True
+False
+6
 
-  
+  
 True
 False
+vertical
 6
 
-  
+  
+True
+True
+True
+.uno:Open
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+True
+True
+.uno:Save
+  
+  
+False
+True
+1
+  
+
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+False
+vertical
+  
+  
+False
+True
+1
+  
+
+
+  
+True
+False
+
+  
+True
+True
+True
+.uno:Paste
+image1
+none
+top
+True
+  
+  
+False
+True
+0
+  
+
+
+  
 True
 False
 vertical
-6
 
-  
+  
 True
 True
 True
-.uno:Open
+.uno:Cut
+none
+0
+True
   
   
 False
@@ -41,10 +112,14 @@
   
 
 
-  
+  
 True
-False
-label
+True
+True
+.uno:Copy
+none
+0
+True
   
   
 False
@@ -52,127 +127,61 @@
 1
   
 
+
+  
+True
+True
+True
+.uno:FormatPaintbrush
+none
+0
+True
+  
+  
+False
+True
+2
+  
+
   
   
 False
 True
-0
+1
   
 
-
-  
-
-
-  
-
-
-  
-
   
+  
+False
+True
+2
+  
 
-
-  
+
+  
 True
 False
-File
-True
+vertical
   
   
-False
+False
+True
+3
   
 
 
-  
+  
 True
 False
-6
+vertical
 
-   

[Libreoffice-commits] core.git: vcl/uiconfig

[Adolfo Jayme Barrientos]

 vcl/uiconfig/ui/cupspassworddialog.ui   |   24 +--
 vcl/uiconfig/ui/errornocontentdialog.ui |5 
 vcl/uiconfig/ui/errornoprinterdialog.ui |5 
 vcl/uiconfig/ui/printerdevicepage.ui|  216 ++--
 vcl/uiconfig/ui/printerpaperpage.ui |   43 +-
 vcl/uiconfig/ui/querydialog.ui  |7 -
 6 files changed, 126 insertions(+), 174 deletions(-)

New commits:
commit 70d2919e2d9543ccad8ccf25c827c4f4873af750
Author: Adolfo Jayme Barrientos fit...@ubuntu.com
Date:   Sun Nov 16 11:32:58 2014 -0600

HIG fixes for vcl

Change-Id: I7ab2aa906073f0ea09ca4e3e4ae1d5346f6e7616
Reviewed-on: https://gerrit.libreoffice.org/12499
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/vcl/uiconfig/ui/cupspassworddialog.ui 
b/vcl/uiconfig/ui/cupspassworddialog.ui
index 81f80e8..f7c9802 100644
--- a/vcl/uiconfig/ui/cupspassworddialog.ui
+++ b/vcl/uiconfig/ui/cupspassworddialog.ui
@@ -1,11 +1,12 @@
 ?xml version=1.0 encoding=UTF-8?
-!-- Generated with glade 3.16.1 --
+!-- Generated with glade 3.18.3 --
 interface
   requires lib=gtk+ version=3.0/
   object class=GtkDialog id=CUPSPasswordDialog
 property name=can_focusFalse/property
 property name=border_width6/property
-property name=title translatable=yesAuthentication request/property
+property name=title translatable=yesAuthentication Request/property
+property name=resizableFalse/property
 property name=type_hintnormal/property
 child internal-child=vbox
   object class=GtkBox id=dialog-vbox1
@@ -66,32 +67,28 @@
   object class=GtkLabel id=label1
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=xalign0/property
-property name=label translatable=yes_User/property
+property name=xalign1/property
+property name=label translatable=yes_User:/property
 property name=use_underlineTrue/property
 property name=mnemonic_widgetuser/property
   /object
   packing
 property name=left_attach0/property
 property name=top_attach1/property
-property name=width1/property
-property name=height1/property
   /packing
 /child
 child
   object class=GtkLabel id=label2
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=xalign0/property
-property name=label translatable=yes_Password/property
+property name=xalign1/property
+property name=label translatable=yes_Password:/property
 property name=use_underlineTrue/property
 property name=mnemonic_widgetpass/property
   /object
   packing
 property name=left_attach0/property
 property name=top_attach2/property
-property name=width1/property
-property name=height1/property
   /packing
 /child
 child
@@ -99,7 +96,7 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=xalign0/property
-property name=label translatable=yesPlease enter your 
authentication data for server %s/property
+property name=label translatable=yesPlease enter your 
authentication data for server “%s”/property
 property name=use_underlineTrue/property
 property name=wrapTrue/property
 property name=max_width_chars56/property
@@ -108,7 +105,6 @@
 property name=left_attach0/property
 property name=top_attach0/property
 property name=width2/property
-property name=height1/property
   /packing
 /child
 child
@@ -120,8 +116,6 @@
   packing
 property name=left_attach1/property
 property name=top_attach1/property
-property name=width1/property
-property name=height1/property
   /packing
 /child
 child
@@ -134,8 +128,6 @@
   packing
 property name=left_attach1/property
 property name=top_attach2/property
-property name=width1/property
-property name=height1/property
   /packing
 /child
   /object
diff --git a/vcl/uiconfig/ui/errornocontentdialog.ui 
b/vcl/uiconfig/ui/errornocontentdialog.ui
index bf0b4e3..abe2be5 100644
--- a/vcl/uiconfig/ui/errornocontentdialog.ui
+++ b/vcl/uiconfig/ui/errornocontentdialog.ui
@@ -1,6 +1,7 @@
 ?xml version=1.0 encoding=UTF-8?

[Libreoffice-commits] core.git: vcl/uiconfig

[Caolán McNamara]

 vcl/uiconfig/ui/printerdevicepage.ui |   84 ++-
 1 file changed, 45 insertions(+), 39 deletions(-)

New commits:
commit 93657bdb7b0f20cb2d868bac024a0f042a9a90cb
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Mar 31 12:49:44 2014 +0100

add mnemonic widgets

Change-Id: I0646927ea73b4bb69bd912d3cc5dfbdafad53aa4

diff --git a/vcl/uiconfig/ui/printerdevicepage.ui 
b/vcl/uiconfig/ui/printerdevicepage.ui
index 45dc0958..2102d6d 100644
--- a/vcl/uiconfig/ui/printerdevicepage.ui
+++ b/vcl/uiconfig/ui/printerdevicepage.ui
@@ -1,6 +1,41 @@
 ?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/
+  object class=GtkListStore id=liststore1
+columns
+  !-- column-name gchararray1 --
+  column type=gchararray/
+  !-- column-name gint1 --
+  column type=gint/
+/columns
+data
+  row
+col id=0 translatable=yesAutomatic : %s/col
+col id=10/col
+  /row
+  row
+col id=0 translatable=yesPostScript (Level from driver)/col
+col id=11/col
+  /row
+  row
+col id=0 translatable=yesPostScript Level 1/col
+col id=12/col
+  /row
+  row
+col id=0 translatable=yesPostScript Level 2/col
+col id=13/col
+  /row
+  row
+col id=0 translatable=yesPostScript Level 3/col
+col id=14/col
+  /row
+  row
+col id=0 translatable=yesPDF/col
+col id=110/col
+  /row
+/data
+  /object
   object class=GtkGrid id=PrinterDevicePage
 property name=visibleTrue/property
 property name=can_focusFalse/property
@@ -17,6 +52,7 @@
 property name=xalign0/property
 property name=label translatable=yes_Option/property
 property name=use_underlineTrue/property
+property name=mnemonic_widgetoptions:border/property
 attributes
   attribute name=weight value=bold/
 /attributes
@@ -35,6 +71,7 @@
 property name=xalign0/property
 property name=label translatable=yesCurrent _value/property
 property name=use_underlineTrue/property
+property name=mnemonic_widgetvalues:border/property
 attributes
   attribute name=weight value=bold/
 /attributes
@@ -53,6 +90,7 @@
 property name=xalign0/property
 property name=label translatable=yesPrinter _Language 
type/property
 property name=use_underlineTrue/property
+property name=mnemonic_widgetlevel/property
   /object
   packing
 property name=left_attach0/property
@@ -68,6 +106,7 @@
 property name=xalign0/property
 property name=label translatable=yes_Color/property
 property name=use_underlineTrue/property
+property name=mnemonic_widgetcolorspace/property
   /object
   packing
 property name=left_attach0/property
@@ -83,6 +122,7 @@
 property name=xalign0/property
 property name=label translatable=yesColor _depth/property
 property name=use_underlineTrue/property
+property name=mnemonic_widgetcolordepth/property
   /object
   packing
 property name=left_attach0/property
@@ -95,8 +135,6 @@
   object class=GtkComboBoxText id=colorspace
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=entry_text_column0/property
-property name=id_column1/property
 items
   item translatable=yesFrom driver/item
   item translatable=yesColor/item
@@ -114,8 +152,6 @@
   object class=GtkComboBoxText id=colordepth
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=entry_text_column0/property
-property name=id_column1/property
 items
   item translatable=yes8 Bit/item
   item translatable=yes24 Bit/item
@@ -145,6 +181,8 @@
   object class=GtkTreeView id=options:border
 property name=visibleTrue/property
 property name=can_focusTrue/property
+property name=hexpandTrue/property
+property name=vexpandTrue/property
 child internal-child=selection
   object class=GtkTreeSelection id=treeview-selection1/
 /child
@@ -160,6 +198,8 @@
   object class=GtkTreeView id=values:border
 property name=visibleTrue/property
 property name=can_focusTrue/property
+property name=hexpandTrue/property
+property name=vexpandTrue/property
 child internal-child=selection
   object class=GtkTreeSelection id=treeview-selection2/
 /child
@@ -172,38 +212,4 @@
   /packing
 /child
   /object
-  object class=GtkListStore id=liststore1
-columns
-  !-- column-name gchararray1 --
-  column type=gchararray/
-  !-- column-name gint1 --
-  column type=gint/
-/columns
-

[Libreoffice-commits] core.git: vcl/uiconfig

[Caolán McNamara]

 vcl/uiconfig/ui/printdialog.ui |  189 +
 1 file changed, 98 insertions(+), 91 deletions(-)

New commits:
commit e764b46eea2aab37b7f62d6bf495d2b80080e3b2
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Mar 31 16:04:14 2014 +0100

Resolves: fdo#63228 Printers list does not increase height with Print Dialog

Change-Id: I731fe5159bead1dc0036ede8d4cd26c233e3b296

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 2aa464b..a23543c 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.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=adjustment1
 property name=lower1/property
@@ -21,6 +22,93 @@
 property name=step_increment1/property
 property name=page_increment10/property
   /object
+  object class=GtkImage id=image1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=stockgtk-media-previous/property
+property name=icon_size1/property
+  /object
+  object class=GtkImage id=image2
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=stockgtk-media-next/property
+property name=icon_size1/property
+  /object
+  object class=GtkListStore id=liststore1
+columns
+  !-- column-name gchararray1 --
+  column type=gchararray/
+  !-- column-name gint1 --
+  column type=gint/
+/columns
+data
+  row
+col id=0 translatable=yes1/col
+col id=11/col
+  /row
+  row
+col id=0 translatable=yes2/col
+col id=12/col
+  /row
+  row
+col id=0 translatable=yes4/col
+col id=14/col
+  /row
+  row
+col id=0 translatable=yes6/col
+col id=16/col
+  /row
+  row
+col id=0 translatable=yes9/col
+col id=19/col
+  /row
+  row
+col id=0 translatable=yes16/col
+col id=116/col
+  /row
+  row
+col id=0 translatable=yesCustom/col
+col id=165535/col
+  /row
+/data
+  /object
+  object class=GtkListStore id=liststore2
+columns
+  !-- column-name gchararray1 --
+  column type=gchararray/
+/columns
+data
+  row
+col id=0 translatable=yesleft to right, then down/col
+  /row
+  row
+col id=0 translatable=yestop to bottom, then right/col
+  /row
+  row
+col id=0 translatable=yestop to bottom, then left/col
+  /row
+  row
+col id=0 translatable=yesright to left, then down/col
+  /row
+/data
+  /object
+  object class=GtkListStore id=liststore3
+columns
+  !-- column-name gchararray1 --
+  column type=gchararray/
+/columns
+data
+  row
+col id=0 translatable=yesAutomatic/col
+  /row
+  row
+col id=0 translatable=yesPortrait/col
+  /row
+  row
+col id=0 translatable=yesLandscape/col
+  /row
+/data
+  /object
   object class=GtkDialog id=PrintDialog
 property name=can_focusFalse/property
 property name=border_width6/property
@@ -90,11 +178,15 @@
   object class=GtkBox id=box1
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=hexpandTrue/property
+property name=vexpandTrue/property
 property name=spacing6/property
 child
   object class=GtkBox id=box2
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=hexpandTrue/property
+property name=vexpandTrue/property
 property name=orientationvertical/property
 property name=spacing6/property
 child
@@ -188,10 +280,12 @@
   object class=GtkNotebook id=tabcontrol
 property name=visibleTrue/property
 property name=can_focusTrue/property
+property name=vexpandTrue/property
 child
   object class=GtkBox id=box3
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=vexpandTrue/property
 property name=border_width6/property
 property name=orientationvertical/property
 property name=spacing6/property
@@ -199,19 +293,20 @@
   object class=GtkFrame id=frame1
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=vexpandTrue/property
 property name=label_xalign0/property

[Libreoffice-commits] core.git: vcl/uiconfig

[Joren De Cuyper]

 vcl/uiconfig/ui/printdialog.ui |4 
 1 file changed, 4 insertions(+)

New commits:
commit 9b2c0cb728873c018ca18e5e5e9bd2d2b84530be
Author: Joren De Cuyper joren.libreoff...@telenet.be
Date:   Sat Feb 9 20:59:06 2013 +0100

add 6 width border to toplevel widgets of printdialog

Change-Id: I415769aeda335d65a4a5dc03be56e26a860046e3
Reviewed-on: https://gerrit.libreoffice.org/2067
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 227063e..a49737e 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -190,6 +190,7 @@
   object class=GtkBox id=box3
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=border_width6/property
 property name=orientationvertical/property
 child
   object class=GtkFrame id=frame1
@@ -910,6 +911,7 @@
   object class=GtkBox id=customcontents
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=border_width6/property
 property name=orientationvertical/property
 child
   placeholder/
@@ -934,6 +936,7 @@
   object class=GtkBox id=box9
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=border_width6/property
 property name=orientationvertical/property
 child
   object class=GtkFrame id=frame5
@@ -1368,6 +1371,7 @@
   object class=GtkFrame id=frame6
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=border_width6/property
 property name=label_xalign0/property
 property name=shadow_typenone/property
 child
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits