variant/trackmouse: flush

2 files changed, 76 insertions, 37 deletions

diff --git a/.gitattributes b/.gitattributes
index 50771f57..9be84023 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -9,3 +9,4 @@
 *.cc text=auto eol=lf
 *.md text=auto eol=lf
 *.csv text=auto eol=lf
+* text=auto eol=lf
diff --git a/variant/trackmouse/window.ui b/variant/trackmouse/window.ui
index c8ad4e22..9501c5c2 100644
--- a/variant/trackmouse/window.ui
+++ b/variant/trackmouse/window.ui
@@ -6,23 +6,53 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>763</width>
-    <height>258</height>
+    <width>755</width>
+    <height>240</height>
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
+  <property name="maximumSize">
+   <size>
+    <width>16777215</width>
+    <height>240</height>
+   </size>
+  </property>
   <property name="windowTitle">
    <string>trackmouse prototype</string>
   </property>
   <widget class="QWidget" name="frame">
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="maximumSize">
+    <size>
+     <width>16777215</width>
+     <height>240</height>
+    </size>
+   </property>
    <layout class="QHBoxLayout" name="horizontalLayout_3">
     <property name="spacing">
-     <number>9</number>
+     <number>6</number>
+    </property>
+    <property name="leftMargin">
+     <number>6</number>
+    </property>
+    <property name="topMargin">
+     <number>0</number>
+    </property>
+    <property name="rightMargin">
+     <number>12</number>
+    </property>
+    <property name="bottomMargin">
+     <number>0</number>
     </property>
     <item>
      <widget class="QFrame" name="video_feed">
@@ -128,12 +158,18 @@
     </item>
     <item>
      <widget class="QWidget" name="widget_3" native="true">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
       <layout class="QVBoxLayout" name="verticalLayout_2">
        <property name="spacing">
-        <number>1</number>
+        <number>12</number>
        </property>
        <property name="leftMargin">
-        <number>13</number>
+        <number>8</number>
        </property>
        <property name="topMargin">
         <number>12</number>
@@ -146,33 +182,27 @@
        </property>
        <item>
         <widget class="QGroupBox" name="groupBox_3">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
          <property name="title">
           <string>Keyboard shortcuts</string>
          </property>
          <layout class="QGridLayout" name="gridLayout">
           <property name="leftMargin">
-           <number>40</number>
+           <number>12</number>
           </property>
           <property name="topMargin">
-           <number>0</number>
+           <number>6</number>
           </property>
           <property name="rightMargin">
            <number>40</number>
           </property>
           <property name="bottomMargin">
-           <number>4</number>
+           <number>6</number>
           </property>
           <property name="horizontalSpacing">
            <number>30</number>
           </property>
           <property name="verticalSpacing">
-           <number>10</number>
+           <number>6</number>
           </property>
           <item row="0" column="0">
            <widget class="QLabel" name="label_2">
@@ -184,8 +214,11 @@
             </property>
             <property name="font">
              <font>
-              <pointsize>10</pointsize>
+              <pointsize>12</pointsize>
+              <weight>75</weight>
+              <bold>true</bold>
               <stylestrategy>PreferAntialias</stylestrategy>
+              <kerning>false</kerning>
              </font>
             </property>
             <property name="text">
@@ -203,8 +236,11 @@
             </property>
             <property name="font">
              <font>
-              <pointsize>10</pointsize>
+              <pointsize>12</pointsize>
+              <weight>75</weight>
+              <bold>true</bold>
               <stylestrategy>PreferAntialias</stylestrategy>
+              <kerning>false</kerning>
              </font>
             </property>
             <property name="text">
@@ -222,8 +258,11 @@
             </property>
             <property name="font">
              <font>
-              <pointsize>10</pointsize>
+              <pointsize>12</pointsize>
+              <weight>75</weight>
+              <bold>true</bold>
               <stylestrategy>PreferAntialias</stylestrategy>
+              <kerning>false</kerning>
              </font>
             </property>
             <property name="text">
@@ -241,8 +280,11 @@
             </property>
             <property name="font">
              <font>
-              <pointsize>10</pointsize>
+              <pointsize>12</pointsize>
+              <weight>75</weight>
+              <bold>true</bold>
               <stylestrategy>PreferAntialias</stylestrategy>
+              <kerning>false</kerning>
              </font>
             </property>
             <property name="text">
@@ -254,21 +296,17 @@
         </widget>
        </item>
        <item>
-        <widget class="QWidget" name="widget_2" native="true">
-         <layout class="QHBoxLayout" name="horizontalLayout_2">
-          <item>
-           <widget class="QLabel" name="label">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-              <horstretch>3</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string>Sensitivity</string>
-            </property>
-           </widget>
-          </item>
+        <widget class="QGroupBox" name="groupBox_2">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="title">
+          <string>Sensitivity</string>
+         </property>
+         <layout class="QHBoxLayout">
           <item>
            <widget class="QSlider" name="sensitivity_slider">
             <property name="sizePolicy">
@@ -313,7 +351,7 @@
        <item>
         <widget class="QWidget" name="widget" native="true">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+          <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -375,8 +413,8 @@
   </widget>
  </widget>
  <resources>
-  <include location="../../gui/opentrack-res.qrc"/>
   <include location="trackmouse-res.qrc"/>
+  <include location="../../gui/opentrack-res.qrc"/>
  </resources>
  <connections/>
 </ui>