Added new button style

bugraonal · Apr 5, 2021 · dd10ad5 · dd10ad5
1 parent 78a23d7
commit dd10ad5
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 2 deletions.
diff --git a/forms/mainwindow.ui b/forms/mainwindow.ui
@@ -31,6 +31,12 @@
     </item>
     <item row="1" column="0">
      <widget class="QGroupBox" name="switchGroup">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
       <property name="title">
        <string/>
       </property>
@@ -133,6 +139,12 @@
     </item>
     <item row="1" column="1">
      <widget class="QGroupBox" name="buttonGroup">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
       <property name="title">
        <string/>
       </property>

diff --git a/include/indexedbutton.h b/include/indexedbutton.h
@@ -12,8 +12,16 @@ class IndexedButton : public QPushButton
         : QPushButton(parent)
         , index(index)
     {
+        //this->setFixedWidth(20);
         connect(this, &QPushButton::pressed, this, &IndexedButton::handleClick);
         connect(this, &QPushButton::released, this, &IndexedButton::handleClick);
+        setStyleSheet("QPushButton {"
+                      "    min-width: 30px;"
+                      "    max-width: 30px;"
+                      "    height: 50px;"
+                      "}"
+                      "QPushButton {border-image: url(:/images/images/button_unpressed.png);}"
+                      "QPushButton:pressed {border-image: url(:/images/images/button_pressed.png);}");
     };
 ;
 

diff --git a/include/indexedswitch.h b/include/indexedswitch.h
@@ -14,7 +14,7 @@ class IndexedSwitch : public QCheckBox
     {
         connect(this, &QCheckBox::clicked, this, &IndexedSwitch::handleClick);
         setStyleSheet("QCheckBox::indicator {"
-                      "    width: 20px;"
+                      "    width: 30px;"
                       "    height: 60px;"
                       "}"
                      "QCheckBox::indicator:checked {image: url(:/images/images/switch_on.png);}"

diff --git a/include/version.h b/include/version.h
@@ -2,6 +2,6 @@
 #define VERSION_H
 
 
-#define VERSION "1.1.3"
+#define VERSION "1.1.4"
 
 #endif // VERSION_H
diff --git a/resources/images/button_pressed.png b/resources/images/button_pressed.png
diff --git a/resources/images/button_unpressed.png b/resources/images/button_unpressed.png
diff --git a/resources/resources.qrc b/resources/resources.qrc
@@ -2,6 +2,8 @@
     <qresource prefix="/images">
         <file>images/switch_on.png</file>
         <file>images/switch_off.png</file>
+        <file>images/button_pressed.png</file>
+        <file>images/button_unpressed.png</file>
     </qresource>
     <qresource prefix="/projectFiles">
         <file>projectFiles/CMakeLists.txt</file>