diff --git a/ico/22x22/titleblock-bottom.png b/ico/22x22/titleblock-bottom.png new file mode 100644 index 000000000..15eef6898 Binary files /dev/null and b/ico/22x22/titleblock-bottom.png differ diff --git a/ico/22x22/titleblock-right.png b/ico/22x22/titleblock-right.png new file mode 100644 index 000000000..60dfdd648 Binary files /dev/null and b/ico/22x22/titleblock-right.png differ 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