From faec9a7f5eb771ce7a010a3540e5562b66312905 Mon Sep 17 00:00:00 2001 From: Paul Norberger Date: Tue, 28 Jan 2020 21:51:38 +0100 Subject: [PATCH 1/6] Add gradient tool icon --- src/icons/gradient-tool.svg | 135 ++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) create mode 100644 src/icons/gradient-tool.svg diff --git a/src/icons/gradient-tool.svg b/src/icons/gradient-tool.svg new file mode 100644 index 0000000..8953735 --- /dev/null +++ b/src/icons/gradient-tool.svg @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + From 7bf881225078d35bbcdabfdf0a6f8fdea16f606a Mon Sep 17 00:00:00 2001 From: Paul Norberger Date: Tue, 28 Jan 2020 21:52:03 +0100 Subject: [PATCH 2/6] Remove icon folder in docs folder --- docs/Icons/circle-tool.svg | 94 ---------------- docs/Icons/eraser-tool.svg | 109 ------------------ docs/Icons/flood-fill-tool.svg | 194 --------------------------------- docs/Icons/line-tool.svg | 99 ----------------- docs/Icons/magic-wand-tool.svg | 169 ---------------------------- docs/Icons/pen-tool.svg | 105 ------------------ docs/Icons/plain-tool.svg | 125 --------------------- docs/Icons/polygon-tool.svg | 117 -------------------- docs/Icons/rectangle-tool.svg | 101 ----------------- 9 files changed, 1113 deletions(-) delete mode 100644 docs/Icons/circle-tool.svg delete mode 100644 docs/Icons/eraser-tool.svg delete mode 100644 docs/Icons/flood-fill-tool.svg delete mode 100644 docs/Icons/line-tool.svg delete mode 100644 docs/Icons/magic-wand-tool.svg delete mode 100644 docs/Icons/pen-tool.svg delete mode 100644 docs/Icons/plain-tool.svg delete mode 100644 docs/Icons/polygon-tool.svg delete mode 100644 docs/Icons/rectangle-tool.svg diff --git a/docs/Icons/circle-tool.svg b/docs/Icons/circle-tool.svg deleted file mode 100644 index a6cc0e4..0000000 --- a/docs/Icons/circle-tool.svg +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - diff --git a/docs/Icons/eraser-tool.svg b/docs/Icons/eraser-tool.svg deleted file mode 100644 index cdc518d..0000000 --- a/docs/Icons/eraser-tool.svg +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/docs/Icons/flood-fill-tool.svg b/docs/Icons/flood-fill-tool.svg deleted file mode 100644 index 980bb7a..0000000 --- a/docs/Icons/flood-fill-tool.svg +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - diff --git a/docs/Icons/line-tool.svg b/docs/Icons/line-tool.svg deleted file mode 100644 index 6ff03e8..0000000 --- a/docs/Icons/line-tool.svg +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/docs/Icons/magic-wand-tool.svg b/docs/Icons/magic-wand-tool.svg deleted file mode 100644 index 71f019d..0000000 --- a/docs/Icons/magic-wand-tool.svg +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff --git a/docs/Icons/pen-tool.svg b/docs/Icons/pen-tool.svg deleted file mode 100644 index 5dd9782..0000000 --- a/docs/Icons/pen-tool.svg +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/docs/Icons/plain-tool.svg b/docs/Icons/plain-tool.svg deleted file mode 100644 index 6dee885..0000000 --- a/docs/Icons/plain-tool.svg +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - diff --git a/docs/Icons/polygon-tool.svg b/docs/Icons/polygon-tool.svg deleted file mode 100644 index 7602729..0000000 --- a/docs/Icons/polygon-tool.svg +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff --git a/docs/Icons/rectangle-tool.svg b/docs/Icons/rectangle-tool.svg deleted file mode 100644 index 3056a02..0000000 --- a/docs/Icons/rectangle-tool.svg +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - From fd1849475586c5fd83816897a0f0bcd75dcb0ecf Mon Sep 17 00:00:00 2001 From: Conrad Date: Wed, 29 Jan 2020 10:28:25 +0100 Subject: [PATCH 3/6] Bumped Version --- conf/intelliphoto_dox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/intelliphoto_dox b/conf/intelliphoto_dox index 8c10cda..c1d0642 100644 --- a/conf/intelliphoto_dox +++ b/conf/intelliphoto_dox @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = IntelliPhoto -PROJECT_NUMBER = 0.6 +PROJECT_NUMBER = 0.7 PROJECT_BRIEF = PROJECT_LOGO = OUTPUT_DIRECTORY = docs From 2b553f5f4159b35db500197d634864a932d2426a Mon Sep 17 00:00:00 2001 From: AshBastian Date: Wed, 29 Jan 2020 13:21:34 +0100 Subject: [PATCH 4/6] =?UTF-8?q?Icon=20Gradient=20eingef=C3=BCgt=20in=20GUI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Bilder.qrc | 1 + src/GUI/IntelliPhotoGui.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Bilder.qrc b/src/Bilder.qrc index 01e8468..f2c6dfa 100644 --- a/src/Bilder.qrc +++ b/src/Bilder.qrc @@ -10,5 +10,6 @@ icons/line-tool.svg icons/flood-fill-tool.svg icons/plain-tool.svg + icons/gradient-tool.svg diff --git a/src/GUI/IntelliPhotoGui.cpp b/src/GUI/IntelliPhotoGui.cpp index d3ab832..cd15dcf 100644 --- a/src/GUI/IntelliPhotoGui.cpp +++ b/src/GUI/IntelliPhotoGui.cpp @@ -705,7 +705,7 @@ void IntelliPhotoGui::createGui(){ FloodFillButton->setIconSize(Buttonsize); FloodFillButton->setCheckable(true); - preview = QPixmap(":/Icons/Buttons/icons/icon.png"); + preview = QPixmap(":/Icons/Buttons/icons/gradient-tool.svg"); GradientButton = new QPushButton(); GradientButton->setFixedSize(Buttonsize); GradientButton->setIcon(preview); From a9435e6d5664f78f81797fa325be1ccaeb8ce2b4 Mon Sep 17 00:00:00 2001 From: AshBastian Date: Wed, 29 Jan 2020 13:35:54 +0100 Subject: [PATCH 5/6] First Change Buttonsize --- src/GUI/IntelliPhotoGui.cpp | 7 +++++++ src/GUI/IntelliPhotoGui.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/GUI/IntelliPhotoGui.cpp b/src/GUI/IntelliPhotoGui.cpp index e1b3fd4..787c9a8 100644 --- a/src/GUI/IntelliPhotoGui.cpp +++ b/src/GUI/IntelliPhotoGui.cpp @@ -7,6 +7,8 @@ #include #include #include +#include +#include // IntelliPhotoGui constructor IntelliPhotoGui::IntelliPhotoGui(){ @@ -689,6 +691,11 @@ void IntelliPhotoGui::createGui(){ paintingArea = new PaintingArea(1280, 720); paintingArea->guiReference = this; + QScreen *screen = QGuiApplication::primaryScreen(); + QRect screenGeometry = screen->geometry(); + Buttonsize.setWidth(screenGeometry.width()/10); + Buttonsize.setHeight(screenGeometry.height()/10); + preview = QPixmap(":/Icons/Buttons/icons/circle-tool.svg"); CircleButton = new QPushButton(); CircleButton->setFixedSize(Buttonsize); diff --git a/src/GUI/IntelliPhotoGui.h b/src/GUI/IntelliPhotoGui.h index 25f6145..aeb2ede 100644 --- a/src/GUI/IntelliPhotoGui.h +++ b/src/GUI/IntelliPhotoGui.h @@ -124,7 +124,7 @@ PaintingArea* paintingArea; QPixmap preview; //size of all buttons -const QSize Buttonsize = QSize(35,35); +QSize Buttonsize; //buttons used for gui QPushButton* CircleButton; From fe9f4263f98ac5cabc058ab13c511320a9fe48e9 Mon Sep 17 00:00:00 2001 From: AshBastian Date: Wed, 29 Jan 2020 13:47:52 +0100 Subject: [PATCH 6/6] =?UTF-8?q?Button=20Size=20an=20Destopaufl=C3=B6sung?= =?UTF-8?q?=20gekoppelt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/GUI/IntelliPhotoGui.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/GUI/IntelliPhotoGui.cpp b/src/GUI/IntelliPhotoGui.cpp index b0e9137..b0c4de6 100644 --- a/src/GUI/IntelliPhotoGui.cpp +++ b/src/GUI/IntelliPhotoGui.cpp @@ -332,6 +332,7 @@ void IntelliPhotoGui::slotEnterPressed(){ void IntelliPhotoGui::slotResetTools(){ CircleButton->setChecked(false); FloodFillButton->setChecked(false); + GradientButton->setChecked(false); LineButton->setChecked(false); PenButton->setChecked(false); PlainButton->setChecked(false); @@ -693,8 +694,8 @@ void IntelliPhotoGui::createGui(){ QScreen *screen = QGuiApplication::primaryScreen(); QRect screenGeometry = screen->geometry(); - Buttonsize.setWidth(screenGeometry.width()/10); - Buttonsize.setHeight(screenGeometry.height()/10); + Buttonsize.setWidth(screenGeometry.width()/20); + Buttonsize.setHeight(screenGeometry.height()/20); preview = QPixmap(":/Icons/Buttons/icons/circle-tool.svg"); CircleButton = new QPushButton();