Merge branch 'dev' into UnitTesting

src/GUI/IntelliPhotoGui.h

@@ -10,6 +10,7 @@
 #include <QTextEdit>
 #include <QLabel>
 #include <QLineEdit>
+#include "IntelliInputDialog.h"
 
 //for unit testing
 class UnitTest;
@@ -22,7 +23,7 @@ class IntelliTool;
 class IntelliColorPicker;
 
 /*!
- * \brief The IntelliPhotoGui class handles the graphical user interface for the intelliPhoto program
+ * \brief The IntelliPhotoGui base class handles the graphical user interface and events for the intelliPhoto program
  */
 class IntelliPhotoGui : public QMainWindow {
 friend UnitTest;
@@ -38,12 +39,15 @@ IntelliPhotoGui();
 
 void UpdateGui();
 
+void setToolWidth(int value);
+
 protected:
-// Function used to close an event
+/*!
+ * \brief The closeEvent function handles closing events
+ */
 void closeEvent(QCloseEvent*event) override;
 
 private slots:
-// meta slots here (need further )
 void slotOpen();
 void slotSave();
 
@@ -61,16 +65,13 @@ void slotPositionMoveRight();
 void slotMoveLayerUp();
 void slotMoveLayerDown();
 
-//Rendersetting slots here
 void slotUpdateRenderSettingsOn();
 void slotUpdateRenderSettingsOff();
 
-// color Picker slots here
 void slotSetFirstColor();
 void slotSetSecondColor();
 void slotSwapColor();
 
-// tool slots here
 void slotCreatePenTool();
 void slotCreatePlainTool();
 void slotCreateLineTool();
@@ -79,7 +80,6 @@ void slotCreateCircleTool();
 void slotCreatePolygonTool();
 void slotCreateFloodFillTool();
 
-// slots for dialogs
 void slotAboutDialog();
 
 void slotEnterPressed();
@@ -90,12 +90,10 @@ void slotSetInnerAlpha();
 void slotResetTools();
 
 private:
-// Will tie user actions to functions
 void createActions();
 void createMenus();
-// setup GUI elements
 void createGui();
-// set style of the GUI
+// Set the style of the GUI
 void setIntelliStyle();
 
 // Will check if changes have occurred since last save
@@ -108,7 +106,7 @@ void setDefaultToolValue();
 // What we'll draw on
 PaintingArea* paintingArea;
 
-const QSize Buttonsize = QSize(70,70);
+const QSize Buttonsize = QSize(35,35);
 QPixmap preview;
 QPushButton* CircleButton;
 QPushButton* FloodFillButton;
@@ -129,9 +127,7 @@ QPushButton* SecondColorButton;
 QPushButton* SwitchColorButton;
 
 QLabel* ActiveLayerLine;
-QLabel* ActiveLayerImageLine;
-
-QPalette Palette;
+QLabel* ActiveLayerImageLabel;
 
 // The menu widgets
 QMenu*saveAsMenu;