Layout fixes

This commit is contained in:
stojce 2014-09-04 00:55:36 +02:00
parent e5e2960826
commit f12f45adec
2 changed files with 59 additions and 193 deletions

View file

@ -16,6 +16,8 @@
#include "PreferencesDialog.h"
#include "UserActivityLogger.h"
const int PREFERENCES_HEIGHT_PADDING = 20;
PreferencesDialog::PreferencesDialog() :
QDialog(Application::getInstance()->getWindow()) {
@ -31,8 +33,8 @@ PreferencesDialog::PreferencesDialog() :
connect(ui.buttonReloadDefaultScripts, &QPushButton::clicked,
Application::getInstance(), &Application::loadDefaultScripts);
// move dialog to left side
move(0, 0);
setWindowState(Qt::WindowMaximized);
move(parentWidget()->geometry().topLeft());
setFixedHeight(parentWidget()->size().height() - PREFERENCES_HEIGHT_PADDING);
}
void PreferencesDialog::accept() {

View file

@ -33,8 +33,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>501</width>
<height>491</height>
<width>500</width>
<height>481</height>
</rect>
</property>
<property name="sizePolicy">
@ -60,8 +60,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>501</width>
<height>1435</height>
<width>500</width>
<height>1347</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
@ -97,7 +97,7 @@
<property name="font">
<font>
<family>Arial</family>
<pointsize>20</pointsize>
<pointsize>18</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@ -133,7 +133,7 @@
<property name="font">
<font>
<family>Arial</family>
<pointsize>16</pointsize>
<pointsize>14</pointsize>
</font>
</property>
<property name="text">
@ -188,13 +188,13 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
<height>28</height>
</size>
</property>
<property name="font">
<font>
<family>Arial</family>
<pointsize>16</pointsize>
<pointsize>14</pointsize>
</font>
</property>
<property name="text">
@ -244,7 +244,6 @@
<property name="font">
<font>
<family>Arial</family>
<pointsize>14</pointsize>
</font>
</property>
<property name="text">
@ -271,13 +270,13 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
<height>28</height>
</size>
</property>
<property name="font">
<font>
<family>Arial</family>
<pointsize>16</pointsize>
<pointsize>14</pointsize>
</font>
</property>
<property name="text">
@ -324,7 +323,6 @@
<property name="font">
<font>
<family>Arial</family>
<pointsize>14</pointsize>
</font>
</property>
<property name="text">
@ -357,7 +355,7 @@
<property name="font">
<font>
<family>Arial</family>
<pointsize>20</pointsize>
<pointsize>18</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@ -384,13 +382,13 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
<height>22</height>
</size>
</property>
<property name="font">
<font>
<family>Arial</family>
<pointsize>16</pointsize>
<pointsize>13</pointsize>
</font>
</property>
<property name="text">
@ -445,7 +443,6 @@
<property name="font">
<font>
<family>Arial</family>
<pointsize>14</pointsize>
</font>
</property>
<property name="text">
@ -478,7 +475,7 @@
<property name="font">
<font>
<family>Arial</family>
<pointsize>20</pointsize>
<pointsize>18</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@ -505,13 +502,13 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
<height>22</height>
</size>
</property>
<property name="font">
<font>
<family>Arial</family>
<pointsize>16</pointsize>
<pointsize>13</pointsize>
</font>
</property>
<property name="text">
@ -566,7 +563,6 @@
<property name="font">
<font>
<family>Arial</family>
<pointsize>14</pointsize>
</font>
</property>
<property name="text">
@ -605,7 +601,6 @@
<property name="font">
<font>
<family>Arial</family>
<pointsize>14</pointsize>
</font>
</property>
<property name="text">
@ -630,7 +625,7 @@
<property name="font">
<font>
<family>Arial</family>
<pointsize>20</pointsize>
<pointsize>18</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@ -663,7 +658,7 @@
<property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
<height>28</height>
</size>
</property>
<property name="baseSize">
@ -675,7 +670,6 @@
<property name="font">
<font>
<family>Arial</family>
<pointsize>13</pointsize>
</font>
</property>
<property name="text">
@ -713,13 +707,13 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>40</height>
<height>35</height>
</size>
</property>
<property name="font">
<font>
<family>Arial</family>
<pointsize>20</pointsize>
<pointsize>18</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@ -741,13 +735,13 @@
<number>0</number>
</property>
<property name="topMargin">
<number>8</number>
<number>7</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>8</number>
<number>7</number>
</property>
<item>
<widget class="QLabel" name="label_9">
@ -823,13 +817,13 @@
<number>0</number>
</property>
<property name="topMargin">
<number>8</number>
<number>7</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>8</number>
<number>7</number>
</property>
<item>
<widget class="QLabel" name="label_2">
@ -941,9 +935,6 @@
<family>Arial</family>
</font>
</property>
<property name="styleSheet">
<string notr="true">color: rgb(51, 51, 51)</string>
</property>
<property name="text">
<string>Lean scale (applies to Faceshift users)</string>
</property>
@ -1005,13 +996,13 @@
<number>0</number>
</property>
<property name="topMargin">
<number>8</number>
<number>7</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>8</number>
<number>7</number>
</property>
<item>
<widget class="QLabel" name="label_3">
@ -1020,9 +1011,6 @@
<family>Arial</family>
</font>
</property>
<property name="styleSheet">
<string notr="true">color: rgb(51, 51, 51)</string>
</property>
<property name="text">
<string>Avatar scale &lt;span style=&quot; color:#909090;&quot;&gt;(default is 1.0)&lt;/span&gt;</string>
</property>
@ -1081,13 +1069,13 @@
<number>0</number>
</property>
<property name="topMargin">
<number>8</number>
<number>7</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>8</number>
<number>7</number>
</property>
<item alignment="Qt::AlignLeft">
<widget class="QLabel" name="label_4">
@ -1096,9 +1084,6 @@
<family>Arial</family>
</font>
</property>
<property name="styleSheet">
<string notr="true">color: rgb(51, 51, 51)</string>
</property>
<property name="text">
<string>Pupil dillation</string>
</property>
@ -1177,7 +1162,6 @@
<property name="font">
<font>
<family>Arial</family>
<pointsize>13</pointsize>
</font>
</property>
<property name="text">
@ -1191,13 +1175,13 @@
<number>0</number>
</property>
<property name="topMargin">
<number>8</number>
<number>7</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>8</number>
<number>7</number>
</property>
<item alignment="Qt::AlignLeft">
<widget class="QLabel" name="label_6">
@ -1206,9 +1190,6 @@
<family>Arial</family>
</font>
</property>
<property name="styleSheet">
<string notr="true">color: rgb(51, 51, 51)</string>
</property>
<property name="text">
<string>Static Jitter Buffer Frames</string>
</property>
@ -1276,13 +1257,13 @@
<number>0</number>
</property>
<property name="topMargin">
<number>8</number>
<number>7</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>8</number>
<number>7</number>
</property>
<item alignment="Qt::AlignLeft">
<widget class="QLabel" name="label_10">
@ -1291,9 +1272,6 @@
<family>Arial</family>
</font>
</property>
<property name="styleSheet">
<string notr="true">color: rgb(51, 51, 51)</string>
</property>
<property name="text">
<string>Max Frames Over Desired</string>
</property>
@ -1349,97 +1327,6 @@
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_13">
<property name="spacing">
<number>0</number>
</property>
<property name="topMargin">
<number>8</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>8</number>
</property>
<item alignment="Qt::AlignLeft">
<widget class="QLabel" name="label_10">
<property name="font">
<font>
<family>Arial</family>
</font>
</property>
<property name="styleSheet">
<string notr="true">color: rgb(51, 51, 51)</string>
</property>
<property name="text">
<string>Max Frames Over Desired</string>
</property>
<property name="indent">
<number>0</number>
</property>
<property name="buddy">
<cstring>maxFramesOverDesiredSpin</cstring>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_20">
<property name="font">
<font>
<family>Arial</family>
</font>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QSpinBox" name="maxFramesOverDesiredSpin">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>70</width>
<height>16777215</height>
</size>
</property>
<property name="font">
<font>
<family>Arial</family>
</font>
</property>
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>10000</number>
</property>
<property name="value">
<number>1</number>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QCheckBox" name="useStdevForJitterCalcCheckBox">
<property name="sizePolicy">
@ -1482,13 +1369,13 @@
<number>0</number>
</property>
<property name="topMargin">
<number>8</number>
<number>7</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>8</number>
<number>7</number>
</property>
<item alignment="Qt::AlignLeft">
<widget class="QLabel" name="label_17">
@ -1497,9 +1384,6 @@
<family>Arial</family>
</font>
</property>
<property name="styleSheet">
<string notr="true">color: rgb(51, 51, 51)</string>
</property>
<property name="text">
<string>Window A Starve Threshold</string>
</property>
@ -1573,13 +1457,13 @@
<number>0</number>
</property>
<property name="topMargin">
<number>8</number>
<number>7</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>8</number>
<number>7</number>
</property>
<item alignment="Qt::AlignLeft">
<widget class="QLabel" name="label_18">
@ -1588,9 +1472,6 @@
<family>Arial</family>
</font>
</property>
<property name="styleSheet">
<string notr="true">color: rgb(51, 51, 51)</string>
</property>
<property name="text">
<string>Window A (raise desired on N starves) Seconds</string>
</property>
@ -1664,13 +1545,13 @@
<number>0</number>
</property>
<property name="topMargin">
<number>8</number>
<number>7</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>8</number>
<number>7</number>
</property>
<item alignment="Qt::AlignLeft">
<widget class="QLabel" name="label_19">
@ -1679,9 +1560,6 @@
<family>Arial</family>
</font>
</property>
<property name="styleSheet">
<string notr="true">color: rgb(51, 51, 51)</string>
</property>
<property name="text">
<string>Window B (desired ceiling) Seconds</string>
</property>
@ -1791,13 +1669,13 @@
<number>0</number>
</property>
<property name="topMargin">
<number>8</number>
<number>7</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>8</number>
<number>7</number>
</property>
<item>
<widget class="QLabel" name="label_5">
@ -1806,9 +1684,6 @@
<family>Arial</family>
</font>
</property>
<property name="styleSheet">
<string notr="true">color: rgb(51, 51, 51)</string>
</property>
<property name="text">
<string>Faceshift eye detection</string>
</property>
@ -1875,13 +1750,13 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>35</height>
<height>33</height>
</size>
</property>
<property name="font">
<font>
<family>Arial</family>
<pointsize>20</pointsize>
<pointsize>18</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
@ -1903,13 +1778,13 @@
<number>0</number>
</property>
<property name="topMargin">
<number>8</number>
<number>7</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>8</number>
<number>7</number>
</property>
<item>
<widget class="QLabel" name="label_7">
@ -1918,9 +1793,6 @@
<family>Arial</family>
</font>
</property>
<property name="styleSheet">
<string notr="true">color: rgb(51, 51, 51)</string>
</property>
<property name="text">
<string>Maximum voxels</string>
</property>
@ -1979,13 +1851,13 @@
<number>0</number>
</property>
<property name="topMargin">
<number>8</number>
<number>7</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>8</number>
<number>7</number>
</property>
<item>
<widget class="QLabel" name="label_8">
@ -2060,13 +1932,13 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>35</height>
<height>33</height>
</size>
</property>
<property name="font">
<font>
<family>Arial</family>
<pointsize>20</pointsize>
<pointsize>18</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
@ -2088,13 +1960,13 @@
<number>0</number>
</property>
<property name="topMargin">
<number>8</number>
<number>7</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>8</number>
<number>7</number>
</property>
<item>
<widget class="QLabel" name="label_12">
@ -2103,9 +1975,6 @@
<family>Arial</family>
</font>
</property>
<property name="styleSheet">
<string notr="true">color: rgb(51, 51, 51)</string>
</property>
<property name="text">
<string>User Interface Angular Size</string>
</property>
@ -2175,13 +2044,13 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>35</height>
<height>33</height>
</size>
</property>
<property name="font">
<font>
<family>Arial</family>
<pointsize>20</pointsize>
<pointsize>18</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
@ -2202,7 +2071,7 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>40</height>
<height>35</height>
</size>
</property>
<property name="baseSize">
@ -2233,13 +2102,13 @@
<number>0</number>
</property>
<property name="topMargin">
<number>8</number>
<number>7</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>8</number>
<number>7</number>
</property>
<item>
<widget class="QLabel" name="label_13">
@ -2248,9 +2117,6 @@
<family>Arial</family>
</font>
</property>
<property name="styleSheet">
<string notr="true">color: rgb(51, 51, 51)</string>
</property>
<property name="text">
<string>Reticle Movement Speed</string>
</property>
@ -2352,7 +2218,6 @@
<property name="font">
<font>
<family>Arial</family>
<pointsize>14</pointsize>
</font>
</property>
<property name="text">
@ -2368,7 +2233,6 @@
<property name="font">
<font>
<family>Arial</family>
<pointsize>14</pointsize>
</font>
</property>
<property name="text">