From 79b578dcf774771306469426f33fb6fc21891445 Mon Sep 17 00:00:00 2001 From: nuri Date: Sun, 26 Nov 2017 08:03:26 +0000 Subject: [PATCH] icon theme: add new icons for titleblock placement (bottom or right) git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5114 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- ico/22x22/titleblock-bottom.png | Bin 0 -> 339 bytes ico/22x22/titleblock-right.png | Bin 0 -> 350 bytes ico/copyright | 2 + qelectrotech.qrc | 2 + sources/qeticons.cpp | 4 ++ sources/qeticons.h | 2 + sources/ui/titleblockpropertieswidget.ui | 50 +++++++++++++++++++++-- 7 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 ico/22x22/titleblock-bottom.png create mode 100644 ico/22x22/titleblock-right.png diff --git a/ico/22x22/titleblock-bottom.png b/ico/22x22/titleblock-bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..15eef6898cb6075db69fe1069aa3a952b08fe84b GIT binary patch literal 339 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fEX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4XCddHJi##HQC&SMTQRIoqUn^V+p-tkaL( zUZ;3$$CK5oR@F@S>GLDTgHys(g3mySU%Ddb)`PQ3DnBMRHa0%2OzwaDKYoA2(x}yC z4=+1U>0UZ(^|t>zO2cP@WUoI~zZBG)x|{Q*;;95RzHRkEXG2%t6nUEOS$=JOT0)}Y zjKBb+j<>s}yFAy)c~CIH;*L#^ft`rPHIC%lYwJV%&$zR_C@Om$e^vSPWu4FqIvQ?_ bZy6cd_B$N8Yn7k`^c#bxtDnm{r-UW|u5X5$ literal 0 HcmV?d00001 diff --git a/ico/22x22/titleblock-right.png b/ico/22x22/titleblock-right.png new file mode 100644 index 0000000000000000000000000000000000000000..60dfdd648abe43e6a940369729bdac3c4c3889c7 GIT binary patch literal 350 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fEX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR43jIYoDL6=;w;e#)tK6Y-$q!3np0Hu@Ngdnwy&&-C=s8?yvS?=f^3deEq=>QapR!%uM_F_mrvW z$z7Lvd6r9d6|Pja)TrBErK@4SINxw~&k^&QR~~+%MzLRSPxu+)E&AdC!`2{Hs~_L_ lw?;HD&YCK^xZxWE!(wHZjl$o4X#l;+;OXk;vd$@?2>@KMhj#z~ literal 0 HcmV?d00001 diff --git a/ico/copyright b/ico/copyright index ce728a379..8a0a10c44 100644 --- a/ico/copyright +++ b/ico/copyright @@ -198,6 +198,8 @@ Clarification: ico/22x22/single_page.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) ico/22x22/terminal.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) ico/22x22/terminalstrip.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) + ico/22x22/titleblock-bottom.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) + ico/22x22/titleblock-right.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) ico/22x22/two_pages.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) ico/32x32/qt.png from http://brand.qt.io/downloads/ ico/32x32/simplifyrichtext.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) diff --git a/qelectrotech.qrc b/qelectrotech.qrc index b679a80f9..55da7e923 100644 --- a/qelectrotech.qrc +++ b/qelectrotech.qrc @@ -563,5 +563,7 @@ ico/16x16/select.png ico/16x16/grid.png ico/16x16/move.png + ico/22x22/titleblock-bottom.png + ico/22x22/titleblock-right.png diff --git a/sources/qeticons.cpp b/sources/qeticons.cpp index e00b89360..56cba11ce 100644 --- a/sources/qeticons.cpp +++ b/sources/qeticons.cpp @@ -152,6 +152,8 @@ namespace QET { QIcon TableOfContent; QIcon Terminal; QIcon TitleBlock; + QIcon TitleBlockBottom; + QIcon TitleBlockRight; QIcon UserInformations; QIcon ViewFitWidth; QIcon ViewFitWindow; @@ -426,6 +428,8 @@ void QET::Icons::initIcons() { TerminalStrip .addFile(":/ico/22x22/terminalstrip.png"); TitleBlock .addFile(":/ico/16x16/label.png"); TitleBlock .addFile(":/ico/22x22/label.png"); + TitleBlockBottom .addFile(":/ico/22x22/titleblock-bottom.png"); + TitleBlockRight .addFile(":/ico/22x22/titleblock-right.png"); UserInformations .addFile(":/ico/16x16/preferences-desktop-user.png"); UserInformations .addFile(":/ico/22x22/preferences-desktop-user.png"); ViewFitWidth .addFile(":/ico/22x22/view_fit_width.png"); diff --git a/sources/qeticons.h b/sources/qeticons.h index 5f0b38c7b..88cfedda5 100644 --- a/sources/qeticons.h +++ b/sources/qeticons.h @@ -161,6 +161,8 @@ namespace QET { extern QIcon TableOfContent; extern QIcon Terminal; extern QIcon TitleBlock; + extern QIcon TitleBlockBottom; + extern QIcon TitleBlockRight; extern QIcon UserInformations; extern QIcon ViewFitWidth; extern QIcon ViewFitWindow; diff --git a/sources/ui/titleblockpropertieswidget.ui b/sources/ui/titleblockpropertieswidget.ui index 5b660bb28..c37347704 100644 --- a/sources/ui/titleblockpropertieswidget.ui +++ b/sources/ui/titleblockpropertieswidget.ui @@ -55,29 +55,73 @@ + + + 0 + 0 + + + + + 40 + 0 + + + + + 16777215 + 16777215 + + <html><head/><body><p>Affiche le cartouche en bas (horizontalement) ou à droite (verticalement) du folio.</p></body></html> + + + 22 + 22 + + - en bas + + + + + :/ico/22x22/titleblock-bottom.png:/ico/22x22/titleblock-bottom.png - à droite + + + + + :/ico/22x22/titleblock-right.png:/ico/22x22/titleblock-right.png + + + 0 + 0 + + - :/ico/16x16/label.png:/ico/16x16/label.png + :/ico/22x22/edit-rename.png:/ico/22x22/edit-rename.png + + + + 22 + 22 + false