fixed check box

mkirby528 · Aug 6, 2018 · 81f504e · 81f504e
1 parent 1d8c3bc
commit 81f504e
Show file tree

Hide file tree

Showing 8 changed files with 3,649 additions and 3,553 deletions.
diff --git a/delegate_view.ui b/delegate_view.ui
@@ -133,6 +133,9 @@
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="styleSheet">
+      <string notr="true">background-color: transparent</string>
+     </property>
      <property name="text">
       <string/>
      </property>

diff --git a/motion_options.ui b/motion_options.ui
@@ -41,7 +41,9 @@
 	color:white;
 	font: 87 14pt &quot;Arial Black&quot;;
 }
-
+QCheckBox::indicator{
+	color:red;
+}
 #delegates_combo_box, #delegates_combo_box:item{
 color:white;
 	background-color: #767676;
@@ -55,7 +57,7 @@ color:white;
 }
 
 #start_motion_button{
-	background-color: transparent
+	background-color: #969696;
 }
 
 #topic_line_edit, #doubleSpinBox, #spinBox{
@@ -64,6 +66,13 @@ color:white;
 	border-color: transparent;
 	font: 87 16pt &quot;Arial Black&quot;;
 }
+QCheckBox::indicator:checked:pressed {
+    image: url(:/img/resources/checkmark-xxl.png);
+
+}QCheckBox::indicator:checked {
+       image: url(:/img/resources/checkmark-xxl.png);
+}
+
 
 </string>
   </property>
@@ -87,12 +96,21 @@ color:white;
    </item>
    <item row="3" column="1">
     <widget class="QCheckBox" name="unmod_check_box">
+     <property name="autoFillBackground">
+      <bool>false</bool>
+     </property>
+     <property name="styleSheet">
+      <string notr="true"/>
+     </property>
      <property name="text">
       <string>Unmod</string>
      </property>
      <property name="autoExclusive">
       <bool>true</bool>
      </property>
+     <property name="tristate">
+      <bool>false</bool>
+     </property>
     </widget>
    </item>
    <item row="1" column="3">
@@ -323,22 +341,40 @@ color:white;
    </item>
    <item row="4" column="1">
     <widget class="QCheckBox" name="other_check_box">
+     <property name="autoFillBackground">
+      <bool>false</bool>
+     </property>
+     <property name="styleSheet">
+      <string notr="true"/>
+     </property>
      <property name="text">
       <string>Other</string>
      </property>
      <property name="autoExclusive">
       <bool>true</bool>
      </property>
+     <property name="tristate">
+      <bool>false</bool>
+     </property>
     </widget>
    </item>
    <item row="1" column="1">
     <widget class="QCheckBox" name="mod_check_box">
+     <property name="autoFillBackground">
+      <bool>false</bool>
+     </property>
+     <property name="styleSheet">
+      <string notr="true"/>
+     </property>
      <property name="text">
       <string>Mod</string>
      </property>
      <property name="autoExclusive">
       <bool>true</bool>
      </property>
+     <property name="tristate">
+      <bool>false</bool>
+     </property>
     </widget>
    </item>
    <item row="3" column="4">
@@ -356,6 +392,9 @@ color:white;
    </item>
    <item row="3" column="7">
     <widget class="QPushButton" name="start_motion_button">
+     <property name="styleSheet">
+      <string notr="true">background-color: transparent</string>
+     </property>
      <property name="text">
       <string/>
      </property>

diff --git a/mun_app.py b/mun_app.py
@@ -605,6 +605,7 @@ def resource_path(relative_path):
 
 if __name__ == '__main__':
     app = QtWidgets.QApplication(sys.argv)
+    # app.setStyle(QtWidgets.QStyleFactory.create('fusion'))
 
     json = resource_path('config.json')
 

diff --git a/mun_app_ui.ui b/mun_app_ui.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>1383</width>
-    <height>871</height>
+    <height>844</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -51,7 +51,7 @@ QLabel#app_title{
 }
 #home_button,#delegates_button,#points_motions_button,#settings_button, #moderated_caucus_button,#unmod_button, #stats_button {
 		background-color: transparent;
-		border-color: transparent;
+		border-color: white;
 		color:white;	
 		width: 100%;
 		margin: 0px;		
@@ -265,7 +265,15 @@ background-color: #767676;
 #home_delegates_button:hover, #home_pm_button:hover,#home_mod_button:hover,#home_unmod_button:hover,#home_stats_button:hover,#home_settings_button:hover{
 	background-color:#13294b;
 	color:white;
-}</string>
+}
+QCheckBox::indicator:checked:pressed {
+    image: url(:/img/resources/checkmark-xxl.png);
+
+}QCheckBox::indicator:checked {
+       image: url(:/img/resources/checkmark-xxl.png);
+}
+
+</string>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout_5" stretch="2,19">
    <property name="spacing">
@@ -630,7 +638,7 @@ background-color: #767676;
       <number>0</number>
      </property>
      <property name="currentIndex">
-      <number>5</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="home_page">
       <property name="sizePolicy">
@@ -1136,7 +1144,7 @@ background-color: #767676;
             <x>0</x>
             <y>0</y>
             <width>1114</width>
-            <height>693</height>
+            <height>666</height>
            </rect>
           </property>
           <property name="sizePolicy">
@@ -1337,7 +1345,7 @@ background-color: #767676;
             <x>0</x>
             <y>0</y>
             <width>1120</width>
-            <height>746</height>
+            <height>719</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_7">
@@ -1473,8 +1481,8 @@ background-color: #767676;
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>380</width>
-            <height>558</height>
+            <width>376</width>
+            <height>539</height>
            </rect>
           </property>
           <property name="sizePolicy">
@@ -1551,6 +1559,9 @@ background-color: #767676;
              <property name="text">
               <string>Last</string>
              </property>
+             <property name="autoExclusive">
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="0" column="0" rowspan="2">
@@ -1571,12 +1582,15 @@ background-color: #767676;
              <property name="text">
               <string>First</string>
              </property>
+             <property name="autoExclusive">
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="0" column="4" rowspan="2">
             <widget class="QPushButton" name="cancel_add_ext">
              <property name="styleSheet">
-              <string notr="true">background-color:transparent;</string>
+              <string notr="true">background-color: transparent</string>
              </property>
              <property name="text">
               <string/>
@@ -1606,7 +1620,7 @@ background-color: #767676;
            <item row="2" column="4">
             <widget class="QPushButton" name="confirm_add_ext">
              <property name="styleSheet">
-              <string notr="true">background-color:transparent;</string>
+              <string notr="true">background-color: transparent</string>
              </property>
              <property name="text">
               <string/>
@@ -1995,6 +2009,9 @@ background-color: #767676;
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
+             <property name="styleSheet">
+              <string notr="true">background-color: transparent</string>
+             </property>
              <property name="text">
               <string/>
              </property>
@@ -2018,6 +2035,9 @@ background-color: #767676;
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
+             <property name="styleSheet">
+              <string notr="true">background-color: transparent</string>
+             </property>
              <property name="text">
               <string/>
              </property>

diff --git a/res.qrc b/res.qrc
@@ -1,5 +1,6 @@
 <RCC>
   <qresource prefix="img">
+    <file>resources/checkmark-xxl.png</file>
     <file>resources/home.png</file>
     <file>resources/settings.png</file>
     <file>resources/bar-chart.png</file>