stijn

piket_client/gui.py

@@ -79,7 +79,7 @@ class NameButton(QPushButton):
     @property
     def current_label(self) -> str:
         """ Return the label to show on the button. """
-        return f"{self.person.name}\n({self.current_count})"
+        return f"{self.person.name}\n{self.current_count}"
 
     def process_click(self) -> None:
         """ Process a click on this button. """
@@ -184,9 +184,6 @@ class PiketMainWindow(QMainWindow):
         self.toolbar.addAction(
             self.load_icon("add_person.svg"), "+ Naam", self.add_person
         )
-        self.toolbar.addAction(
-            self.load_icon("add_consumption_type.svg"), "+ Lijst",
-            self.add_consumption_type)
         self.undo_action = self.toolbar.addAction(
             self.load_icon("undo.svg"), "Oeps", self.do_undo
         )
@@ -199,6 +196,9 @@ class PiketMainWindow(QMainWindow):
         self.toolbar.addWidget(self.create_spacer())
 
         # Right
+        self.toolbar.addAction(
+            self.load_icon("add_consumption_type.svg"), "Nieuw",
+            self.add_consumption_type)
         self.ct_ag = QActionGroup(self.toolbar)
         self.ct_ag.setExclusive(True)
 
@@ -385,7 +385,7 @@ def main() -> None:
     app.setStyleSheet(qdarkstyle.load_stylesheet_pyside2())
     font = app.font()
     size = font.pointSize()
-    font.setPointSize(size * 1.75)
+    font.setPointSize(size * 1.65)
     app.setFont(font)
 
     main_window = PiketMainWindow()

piket_client/icons/white_add_consumption_type.svg

@@ -5,14 +5,18 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 384 512"
-   role="img"
-   class="svg-inline--fa fa-file-medical fa-w-12"
-   data-icon="file-medical"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   aria-hidden="true"
    data-prefix="fas"
-   aria-hidden="true">
+   data-icon="plus"
+   class="svg-inline--fa fa-plus fa-w-14"
+   role="img"
+   viewBox="0 0 448 512"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="white_add_consumption_type.svg"
+   inkscape:version="0.92.2 2405546, 2018-03-11">
   <metadata
      id="metadata10">
     <rdf:RDF>
@@ -21,15 +25,34 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <defs
      id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1596"
+     inkscape:window-height="861"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="0.4609375"
+     inkscape:cx="-222.91525"
+     inkscape:cy="256"
+     inkscape:window-x="1280"
+     inkscape:window-y="18"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4" />
   <path
-     style="fill:#ffffff;fill-opacity:1"
+     fill="white"
+     d="M416 208H272V64c0-17.67-14.33-32-32-32h-32c-17.67 0-32 14.33-32 32v144H32c-17.67 0-32 14.33-32 32v32c0 17.67 14.33 32 32 32h144v144c0 17.67 14.33 32 32 32h32c17.67 0 32-14.33 32-32V304h144c17.67 0 32-14.33 32-32v-32c0-17.67-14.33-32-32-32z"
      id="path2"
-     d="M377 105L279.1 7c-4.5-4.5-10.6-7-17-7H256v128h128v-6.1c0-6.3-2.5-12.4-7-16.9zm-153 31V0H24C10.7 0 0 10.7 0 24v464c0 13.3 10.7 24 24 24h336c13.3 0 24-10.7 24-24V160H248c-13.2 0-24-10.8-24-24zm64 160v48c0 4.4-3.6 8-8 8h-56v56c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8v-56h-56c-4.4 0-8-3.6-8-8v-48c0-4.4 3.6-8 8-8h56v-56c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v56h56c4.4 0 8 3.6 8 8z"
-     fill="white" />
+     style="fill:#ffffff;fill-opacity:1" />
 </svg>