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
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 @@
-
-
-
-
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 @@
-
-
-
-
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 @@
-
-
-
-
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 @@
-
-
-
-
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 @@
-
-
-
-
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 @@
-
-
-
-
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 @@
-
-
-
-
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 @@
-
-
-
-
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 e1b3fd4..b0c4de6 100644
--- a/src/GUI/IntelliPhotoGui.cpp
+++ b/src/GUI/IntelliPhotoGui.cpp
@@ -7,6 +7,8 @@
#include
#include
#include
+#include
+#include
// IntelliPhotoGui constructor
IntelliPhotoGui::IntelliPhotoGui(){
@@ -330,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);
@@ -689,6 +692,11 @@ void IntelliPhotoGui::createGui(){
paintingArea = new PaintingArea(1280, 720);
paintingArea->guiReference = this;
+ QScreen *screen = QGuiApplication::primaryScreen();
+ QRect screenGeometry = screen->geometry();
+ Buttonsize.setWidth(screenGeometry.width()/20);
+ Buttonsize.setHeight(screenGeometry.height()/20);
+
preview = QPixmap(":/Icons/Buttons/icons/circle-tool.svg");
CircleButton = new QPushButton();
CircleButton->setFixedSize(Buttonsize);
@@ -703,12 +711,12 @@ void IntelliPhotoGui::createGui(){
FloodFillButton->setIconSize(Buttonsize);
FloodFillButton->setCheckable(true);
- preview = QPixmap(":/Icons/Buttons/icons/icon.png");
- GradientButton = new QPushButton();
- GradientButton->setFixedSize(Buttonsize);
- GradientButton->setIcon(preview);
- GradientButton->setIconSize(Buttonsize);
- GradientButton->setCheckable(true);
+ preview = QPixmap(":/Icons/Buttons/icons/gradient-tool.svg");
+ GradientButton = new QPushButton();
+ GradientButton->setFixedSize(Buttonsize);
+ GradientButton->setIcon(preview);
+ GradientButton->setIconSize(Buttonsize);
+ GradientButton->setCheckable(true);
preview = QPixmap(":/Icons/Buttons/icons/line-tool.svg");
LineButton = new QPushButton();
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;
diff --git a/docs/Icons/line-tool.svg b/src/icons/gradient-tool.svg
similarity index 62%
rename from docs/Icons/line-tool.svg
rename to src/icons/gradient-tool.svg
index 6ff03e8..8953735 100644
--- a/docs/Icons/line-tool.svg
+++ b/src/icons/gradient-tool.svg
@@ -15,10 +15,34 @@
viewBox="0 0 67.733332 67.733335"
version="1.1"
id="svg8"
- sodipodi:docname="line-tool.svg"
- inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+ sodipodi:docname="gradient-tool.svg"
+ inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
+
+
+
+
+
+
+
@@ -40,6 +64,15 @@
x2="-13.131983"
y2="106.49742"
gradientUnits="userSpaceOnUse" />
+
+ inkscape:window-width="1853"
+ inkscape:window-height="1025"
+ inkscape:window-x="67"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
+ inkscape:snap-page="true" />
@@ -78,17 +112,19 @@
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-229.26665)">
+
-