diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2018-01-16 10:11:35 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2018-01-16 10:11:35 +0100 |
| commit | 68ee756355d082f5970440985aef6757f674f969 (patch) | |
| tree | cfa82d6da29bbe3e1578613353c79114535cdae5 /variant | |
| parent | 6cf93c06abad63721bf66f695587a98377b6178d (diff) | |
main-window: fix linux compile error
Diffstat (limited to 'variant')
| -rw-r--r-- | variant/default/main-window.cpp | 2 | ||||
| -rw-r--r-- | variant/default/main-window.ui | 18 |
2 files changed, 13 insertions, 7 deletions
diff --git a/variant/default/main-window.cpp b/variant/default/main-window.cpp index 9d27afdc..30efb138 100644 --- a/variant/default/main-window.cpp +++ b/variant/default/main-window.cpp @@ -39,7 +39,7 @@ extern "C" const char* const opentrack_version; #if !defined _WIN32 && !defined __APPLE__ # include <unistd.h> -void MainWindow::annoy_if_root() +void main_window::annoy_if_root() { if (geteuid() == 0) { diff --git a/variant/default/main-window.ui b/variant/default/main-window.ui index ce8e161f..bd377c1c 100644 --- a/variant/default/main-window.ui +++ b/variant/default/main-window.ui @@ -12,7 +12,7 @@ </rect> </property> <property name="windowIcon"> - <iconset resource="opentrack-res.qrc"> + <iconset resource="../../gui/opentrack-res.qrc"> <normaloff>:/images/facetracknoir.png</normaloff>:/images/facetracknoir.png</iconset> </property> <property name="styleSheet"> @@ -183,7 +183,7 @@ <string/> </property> <property name="pixmap"> - <pixmap resource="opentrack-res.qrc">:/images/tracking-not-started.png</pixmap> + <pixmap resource="../../gui/opentrack-res.qrc">:/images/tracking-not-started.png</pixmap> </property> <property name="scaledContents"> <bool>false</bool> @@ -201,7 +201,7 @@ <item> <widget class="pose_widget" name="pose_display" native="true"> <property name="sizePolicy"> - <sizepolicy hsizetype="Maximum" vsizetype="Maximum"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -212,6 +212,12 @@ <height>240</height> </size> </property> + <property name="maximumSize"> + <size> + <width>320</width> + <height>240</height> + </size> + </property> </widget> </item> </layout> @@ -1071,7 +1077,7 @@ <string>Options</string> </property> <property name="icon"> - <iconset resource="opentrack-res.qrc"> + <iconset resource="../../gui/opentrack-res.qrc"> <normaloff>:/images/tools.png</normaloff>:/images/tools.png</iconset> </property> <property name="iconSize"> @@ -1094,7 +1100,7 @@ <string>Mapping</string> </property> <property name="icon"> - <iconset resource="opentrack-res.qrc"> + <iconset resource="../../gui/opentrack-res.qrc"> <normaloff>:/images/curves.png</normaloff>:/images/curves.png</iconset> </property> <property name="iconSize"> @@ -1447,7 +1453,7 @@ <tabstop>btnEditCurves</tabstop> </tabstops> <resources> - <include location="opentrack-res.qrc"/> + <include location="../../gui/opentrack-res.qrc"/> </resources> <connections/> </ui> |