From 1a77ab96501324a7417c970bec753e1304931267 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Wed, 16 Oct 2013 23:28:42 +0200 Subject: remove custom styles. use default Qt styles. This is a major user-facing change. Signed-off-by: Stanislaw Halik --- facetracknoir/facetracknoir.ui | 590 ++++++++++++++---------------- facetracknoir/ftnoir_keyboardshortcuts.ui | 37 -- 2 files changed, 274 insertions(+), 353 deletions(-) diff --git a/facetracknoir/facetracknoir.ui b/facetracknoir/facetracknoir.ui index 2f35e29b..e17fa30b 100644 --- a/facetracknoir/facetracknoir.ui +++ b/facetracknoir/facetracknoir.ui @@ -39,96 +39,12 @@ FaceTrackNoIR - + :/images/facetracknoir.png:/images/facetracknoir.png - - /* Customize any plain widget that is a child of a QMainWindow. */ -QMainWindow > .QWidget { - background-color: rgb(100, 100, 100); -} - -/* Set the selection colors for all widgets. */ -QWidget { - selection-color: black; - selection-background-color: Silver; - color: black; -} - -/* Specials for individual widget(s) */ -QWidget#widget { -/* background-color: #484848;*/ - background-color: #595959; - border-left: 1px solid #000; -} - -/* Specials for individual widget(s) */ -QWidget#widget4logo { - background-color: #000000; -} - -/* Specials for individual widget(s) */ -QWidget#headPoseWidget { - background-color: #595959; -} - -QWidget#widget4video { -/* background-color: #595959;*/ -} - -QWidget#Leftwidget { - background-color: ; -} - -QWidget#widgetTop { - background-color: #595959; - border-bottom: 1px solid #000; -} - -/* Make text in message boxes selectable. */ -QMessageBox { - /* LinksAccessibleByMouse | TextSelectableByMouse */ - messagebox-text-interaction-flags: 5; -} - -/* Make the entire row selected in item views. */ -QAbstractItemView { - show-decoration-selected: 1; -} - -/* Nice WindowsXP-style password character for password line edits. */ -QLineEdit[echoMode="2"] { - lineedit-password-character: 9679; -} - -/* Customize tooltips. */ -QToolTip { - background-color: rgb(170, 255, 127); - opacity: 200; -} - -/* Customize push buttons and comboboxes. Our read-only combobox - is very similar to a push button, so they share the same border image. */ - -QPushButton { - min-width: 4em; -} - -QCheckBox { - background:none; -} - -QPushButton:disabled { - color: rgb(128, 128, 128); -} - -QGroupBox { - color: rgb(255, 255, 255); -} - @@ -211,10 +127,6 @@ QGroupBox { 30 - - color:#ccc; -background:none; - @@ -234,6 +146,12 @@ background:none; Qt::AlignCenter + + false + + + false + @@ -258,10 +176,6 @@ background:none; Qt::RightToLeft - - color:#ccc; -background:none; - X @@ -290,10 +204,6 @@ background:none; Qt::RightToLeft - - color:#ccc; -background:none; - Pitch @@ -338,10 +248,6 @@ background:none; Qt::RightToLeft - - color:#ccc; -background:none; - Y @@ -370,10 +276,6 @@ background:none; Qt::RightToLeft - - color:#ccc; -background:none; - Z @@ -466,10 +368,6 @@ background:none; Qt::RightToLeft - - color:#ccc; -background:none; - Yaw @@ -514,10 +412,6 @@ background:none; Qt::RightToLeft - - color:#ccc; -background:none; - Roll @@ -548,7 +442,7 @@ background:none; Profile - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignCenter @@ -642,10 +536,6 @@ background:none; 16 - - color:#ccc; -background:none; - Not connected @@ -747,7 +637,7 @@ background:none; - Tracker Source + Main tracker Qt::AlignCenter @@ -888,7 +778,7 @@ background:none; - Tracker Source #2 + Auxiliary tracker Qt::AlignCenter @@ -1209,12 +1099,6 @@ background:none; 0 - - * { - color: white; -} - - Raw data @@ -1222,14 +1106,20 @@ background:none; true + + true + - 150 + 160 60 - 71 + 81 21 + + false + QFrame::NoFrame @@ -1240,24 +1130,33 @@ background:none; 0 - true + false + + + 7 - 2 + 7 QLCDNumber::Flat + + true + - 150 + 160 20 - 71 + 81 21 + + false + QFrame::NoFrame @@ -1268,10 +1167,13 @@ background:none; 0 - true + false + + + 7 - 2 + 7 QLCDNumber::Flat @@ -1286,10 +1188,6 @@ background:none; 16 - - border:none; -color:white - X @@ -1303,23 +1201,25 @@ color:white 16 - - border:none; -color:white; - Y + + true + - 30 + 40 60 - 61 + 71 21 + + false + QFrame::NoFrame @@ -1330,10 +1230,13 @@ color:white; 0 - true + false + + + 7 - 2 + 7 QLCDNumber::Flat @@ -1348,23 +1251,25 @@ color:white; 16 - - color:white; -border:none; - Z + + true + - 30 + 40 40 - 61 + 71 21 + + false + QFrame::NoFrame @@ -1375,10 +1280,13 @@ border:none; 0 - true + false + + + 7 - 2 + 7 QLCDNumber::Flat @@ -1387,16 +1295,12 @@ border:none; - 108 + 120 58 31 20 - - border:none; -color:white; - roll @@ -1404,16 +1308,12 @@ color:white; - 109 + 121 38 31 20 - - color:white; -border:none; - pitch @@ -1421,29 +1321,31 @@ border:none; - 108 + 120 18 31 20 - - border:none; -color:white; - yaw + + true + - 150 + 160 40 - 71 + 81 21 + + false + QFrame::NoFrame @@ -1454,26 +1356,32 @@ color:white; 0 - true + false + + + 7 - 2 + 7 QLCDNumber::Flat + + true + - 30 + 40 20 - 61 + 71 21 - - color: white; + + false QFrame::NoFrame @@ -1485,10 +1393,13 @@ color:white; 0 - true + false + + + 7 - 2 + 7 QLCDNumber::Flat @@ -1517,110 +1428,162 @@ color:white; 90 - + + + true + - 101 - 19 - 50 + 21 + 21 + 51 21 false - - color: rgb(0, 255, 0); - QFrame::NoFrame - QFrame::Raised + QFrame::Plain - + 1 + + false + + + 5 + + + 5 + QLCDNumber::Flat - + - 101 - 37 - 50 - 21 + 5 + 21 + 31 + 16 - - false - - - color: rgb(0, 255, 0); + + X - - QFrame::NoFrame + + + + true - - QFrame::Raised + + + 5 + 41 + 31 + 16 + - - 1 + + false - - QLCDNumber::Flat + + Y - + + + true + - 101 - 55 - 50 - 21 + 5 + 61 + 31 + 16 false - - color: rgb(0, 255, 0); + + Z - - QFrame::NoFrame + + + + + 69 + 61 + 51 + 16 + - - QFrame::Raised + + roll - - 1 + + + + + 71 + 21 + 51 + 16 + - - QLCDNumber::Flat + + yaw - + - 17 - 19 - 50 + 69 + 41 + 51 + 16 + + + + pitch + + + + + true + + + + 21 + 41 + 51 21 false - - color: rgb(0, 255, 0); - QFrame::NoFrame - QFrame::Raised + QFrame::Plain + + + 1 + + + false + + + 5 5 @@ -1629,26 +1592,35 @@ color:white; QLCDNumber::Flat - + + + true + - 17 - 37 - 50 + 21 + 61 + 51 21 false - - color: rgb(0, 255, 0); - QFrame::NoFrame - QFrame::Raised + QFrame::Plain + + + 1 + + + false + + + 5 5 @@ -1657,26 +1629,35 @@ color:white; QLCDNumber::Flat - + + + true + - 17 - 55 - 50 + 102 + 61 + 61 21 false - - color: rgb(0, 255, 0); - QFrame::NoFrame - QFrame::Raised + QFrame::Plain + + + 1 + + + false + + + 5 5 @@ -1685,100 +1666,78 @@ color:white; QLCDNumber::Flat - + + + true + - 9 - 20 - 31 - 16 + 102 + 21 + 61 + 21 - - color: rgb(0, 255, 0); + + false - - X + + QFrame::NoFrame - - - - - 10 - 40 - 31 - 16 - + + QFrame::Plain - - color: rgb(0, 255, 0); + + 1 - - Y + + false - - - - - 10 - 59 - 31 - 16 - + + 5 - - color: rgb(0, 255, 0); + + 5 - - Z + + QLCDNumber::Flat - + + + true + - 69 - 60 - 51 - 16 + 102 + 41 + 61 + 21 - - color: rgb(0, 255, 0); + + false - - roll + + QFrame::NoFrame - - - - - 71 - 21 - 51 - 16 - + + QFrame::Plain - - color: rgb(0, 255, 0); + + 1 - - yaw + + false - - - - - 69 - 41 - 51 - 16 - + + 5 - - color: rgb(0, 255, 0); + + 5 - - pitch + + QLCDNumber::Flat @@ -1822,7 +1781,6 @@ color:white; iconcomboProtocol - diff --git a/facetracknoir/ftnoir_keyboardshortcuts.ui b/facetracknoir/ftnoir_keyboardshortcuts.ui index 0bbd42ff..a189b680 100644 --- a/facetracknoir/ftnoir_keyboardshortcuts.ui +++ b/facetracknoir/ftnoir_keyboardshortcuts.ui @@ -16,43 +16,6 @@ 0 - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 141 - 143 - 145 - - - - - - FaceTrackNoIR Keyboard and Mouse shortcuts -- cgit v1.2.3