From cc3a10f7117b11b4b3f2644224ae728e395a9e9b Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 5 Jan 2014 12:14:21 +0100 Subject: change icons, remove self-references --- FTNoIR_Tracker_PT/FTNoIR_PT_Controls.ui | 2 +- FTNoIR_Tracker_PT/Resources/icon.ico | Bin 4286 -> 0 bytes FTNoIR_Tracker_PT/ftnoir_tracker_pt.qrc | 19 ++++---- facetracknoir/facetracknoir.cpp | 2 +- facetracknoir/facetracknoir.ui | 48 ++++++++++----------- facetracknoir/ftnoir_keyboardshortcuts.ui | 2 +- .../uielements/logo_facetracknoir_32px.jpg | Bin 1082 -> 0 bytes .../uielements/logo_facetracknoir_32px.png | Bin 2822 -> 0 bytes facetracknoir/uielements/logo_noir.png | Bin 26173 -> 0 bytes facetracknoir/uielements/logo_noir_small.png | Bin 6384 -> 0 bytes .../uielements/logo_noir_small_target.png | Bin 5971 -> 0 bytes .../uielements/logo_noir_small_target90px.png | Bin 5582 -> 0 bytes facetracknoir/uielements/logofacetracknoir.png | Bin 5437 -> 0 bytes facetracknoir/uielements/logofacetracknoir60px.png | Bin 3369 -> 0 bytes .../ftnoir_accela_filtercontrols.ui | 14 +++--- ftnoir_filter_ewma2/ftnoir_ewma_filtercontrols.ui | 16 +++---- .../ftnoir_kalman_filtercontrols.ui | 12 +++--- ftnoir_protocol_fg/ftnoir_fgcontrols.ui | 12 +++--- ftnoir_protocol_ft/ftnoir_ftcontrols.ui | 12 +++--- ftnoir_protocol_ftn/ftn-protocol.qrc | 5 --- ftnoir_protocol_ftn/ftnoir_ftncontrols.ui | 8 ++-- ftnoir_protocol_ftn/images/facetracknoir.png | Bin 634 -> 0 bytes ftnoir_protocol_mouse/ftnoir_mousecontrols.ui | 14 +++--- .../ftnoir_tracker_joystick_controls.ui | 4 +- ftnoir_tracker_udp/ftnoir_ftnclientcontrols.ui | 2 +- 25 files changed, 87 insertions(+), 85 deletions(-) delete mode 100644 FTNoIR_Tracker_PT/Resources/icon.ico delete mode 100644 facetracknoir/uielements/logo_facetracknoir_32px.jpg delete mode 100644 facetracknoir/uielements/logo_facetracknoir_32px.png delete mode 100644 facetracknoir/uielements/logo_noir.png delete mode 100644 facetracknoir/uielements/logo_noir_small.png delete mode 100644 facetracknoir/uielements/logo_noir_small_target.png delete mode 100644 facetracknoir/uielements/logo_noir_small_target90px.png delete mode 100644 facetracknoir/uielements/logofacetracknoir.png delete mode 100644 facetracknoir/uielements/logofacetracknoir60px.png delete mode 100644 ftnoir_protocol_ftn/ftn-protocol.qrc delete mode 100644 ftnoir_protocol_ftn/images/facetracknoir.png diff --git a/FTNoIR_Tracker_PT/FTNoIR_PT_Controls.ui b/FTNoIR_Tracker_PT/FTNoIR_PT_Controls.ui index ce708849..9f00cf29 100644 --- a/FTNoIR_Tracker_PT/FTNoIR_PT_Controls.ui +++ b/FTNoIR_Tracker_PT/FTNoIR_PT_Controls.ui @@ -24,7 +24,7 @@ - :/Resources/icon.ico:/Resources/icon.ico + :/Resources/Logo_IR.png:/Resources/Logo_IR.png Qt::LeftToRight diff --git a/FTNoIR_Tracker_PT/Resources/icon.ico b/FTNoIR_Tracker_PT/Resources/icon.ico deleted file mode 100644 index c4b2aedc..00000000 Binary files a/FTNoIR_Tracker_PT/Resources/icon.ico and /dev/null differ diff --git a/FTNoIR_Tracker_PT/ftnoir_tracker_pt.qrc b/FTNoIR_Tracker_PT/ftnoir_tracker_pt.qrc index 9b510981..a8f9a1af 100644 --- a/FTNoIR_Tracker_PT/ftnoir_tracker_pt.qrc +++ b/FTNoIR_Tracker_PT/ftnoir_tracker_pt.qrc @@ -1,10 +1,9 @@ - - - Resources/icon.ico - Resources/cap_front.png - Resources/cap_side.png - Resources/clip_front.png - Resources/clip_side.png - Resources/Logo_IR.png - - + + + Resources/cap_front.png + Resources/cap_side.png + Resources/clip_front.png + Resources/clip_side.png + Resources/Logo_IR.png + + diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp index de5b491f..f2767587 100644 --- a/facetracknoir/facetracknoir.cpp +++ b/facetracknoir/facetracknoir.cpp @@ -246,7 +246,7 @@ void FaceTrackNoIR::open() { QString fileName = dialog.getOpenFileName( this, - tr("Select one FTNoir settings file"), + tr("Open the settings file"), QCoreApplication::applicationDirPath() + "/settings/", tr("Settings file (*.ini);;All Files (*)"), NULL); diff --git a/facetracknoir/facetracknoir.ui b/facetracknoir/facetracknoir.ui index c25ee0db..d5300b0f 100644 --- a/facetracknoir/facetracknoir.ui +++ b/facetracknoir/facetracknoir.ui @@ -10,8 +10,8 @@ 0 0 - 788 - 554 + 790 + 500 @@ -82,8 +82,8 @@ - 5 - 170 + 10 + 130 320 240 @@ -113,7 +113,7 @@ 0 - -10 + 0 320 240 @@ -141,8 +141,8 @@ - 110 - 50 + 100 + 10 229 121 @@ -516,8 +516,8 @@ - 20 - 50 + 10 + 20 81 100 @@ -545,7 +545,7 @@ 350 - 370 + 270 191 91 @@ -631,7 +631,7 @@ 580 - 460 + 390 171 38 @@ -677,9 +677,9 @@ - 130 - 30 - 651 + 370 + 40 + 411 20 @@ -702,9 +702,9 @@ - 350 - 270 - 191 + 550 + 210 + 231 91 @@ -868,9 +868,9 @@ - 130 - 0 - 651 + 370 + 10 + 411 25 @@ -980,7 +980,7 @@ 350 - 470 + 400 190 65 @@ -1060,7 +1060,7 @@ 580 - 410 + 340 171 38 @@ -1228,7 +1228,7 @@ 10 - 420 + 380 141 106 @@ -1468,7 +1468,7 @@ 160 - 420 + 380 161 111 diff --git a/facetracknoir/ftnoir_keyboardshortcuts.ui b/facetracknoir/ftnoir_keyboardshortcuts.ui index 0d4e9142..94d11734 100644 --- a/facetracknoir/ftnoir_keyboardshortcuts.ui +++ b/facetracknoir/ftnoir_keyboardshortcuts.ui @@ -21,7 +21,7 @@ - images/FaceTrackNoIR.pngimages/FaceTrackNoIR.png + images/facetracknoir.pngimages/facetracknoir.png Qt::LeftToRight diff --git a/facetracknoir/uielements/logo_facetracknoir_32px.jpg b/facetracknoir/uielements/logo_facetracknoir_32px.jpg deleted file mode 100644 index 73ead853..00000000 Binary files a/facetracknoir/uielements/logo_facetracknoir_32px.jpg and /dev/null differ diff --git a/facetracknoir/uielements/logo_facetracknoir_32px.png b/facetracknoir/uielements/logo_facetracknoir_32px.png deleted file mode 100644 index c4e63c76..00000000 Binary files a/facetracknoir/uielements/logo_facetracknoir_32px.png and /dev/null differ diff --git a/facetracknoir/uielements/logo_noir.png b/facetracknoir/uielements/logo_noir.png deleted file mode 100644 index bb654a07..00000000 Binary files a/facetracknoir/uielements/logo_noir.png and /dev/null differ diff --git a/facetracknoir/uielements/logo_noir_small.png b/facetracknoir/uielements/logo_noir_small.png deleted file mode 100644 index 5d49e0b1..00000000 Binary files a/facetracknoir/uielements/logo_noir_small.png and /dev/null differ diff --git a/facetracknoir/uielements/logo_noir_small_target.png b/facetracknoir/uielements/logo_noir_small_target.png deleted file mode 100644 index 4bbaf41f..00000000 Binary files a/facetracknoir/uielements/logo_noir_small_target.png and /dev/null differ diff --git a/facetracknoir/uielements/logo_noir_small_target90px.png b/facetracknoir/uielements/logo_noir_small_target90px.png deleted file mode 100644 index ecaa4e12..00000000 Binary files a/facetracknoir/uielements/logo_noir_small_target90px.png and /dev/null differ diff --git a/facetracknoir/uielements/logofacetracknoir.png b/facetracknoir/uielements/logofacetracknoir.png deleted file mode 100644 index a1a3407b..00000000 Binary files a/facetracknoir/uielements/logofacetracknoir.png and /dev/null differ diff --git a/facetracknoir/uielements/logofacetracknoir60px.png b/facetracknoir/uielements/logofacetracknoir60px.png deleted file mode 100644 index f01f6024..00000000 Binary files a/facetracknoir/uielements/logofacetracknoir60px.png and /dev/null differ diff --git a/ftnoir_filter_accela/ftnoir_accela_filtercontrols.ui b/ftnoir_filter_accela/ftnoir_accela_filtercontrols.ui index 4ea78c9f..ba750cd6 100644 --- a/ftnoir_filter_accela/ftnoir_accela_filtercontrols.ui +++ b/ftnoir_filter_accela/ftnoir_accela_filtercontrols.ui @@ -9,8 +9,8 @@ 0 0 - 202 - 241 + 215 + 285 @@ -32,11 +32,11 @@ - Filter settings + Accela filter settings - - images/FaceTrackNoIR.pngimages/FaceTrackNoIR.png + + :/images/filter-16.png:/images/filter-16.png Qt::LeftToRight @@ -346,7 +346,9 @@ background:none; - + + + startEngineClicked() diff --git a/ftnoir_filter_ewma2/ftnoir_ewma_filtercontrols.ui b/ftnoir_filter_ewma2/ftnoir_ewma_filtercontrols.ui index 8a0e485a..a1083265 100644 --- a/ftnoir_filter_ewma2/ftnoir_ewma_filtercontrols.ui +++ b/ftnoir_filter_ewma2/ftnoir_ewma_filtercontrols.ui @@ -9,7 +9,7 @@ 0 0 - 374 + 477 380 @@ -20,15 +20,11 @@ - EWMA2 Filter settings FaceTrackNoIR + EWMA2 filter settings - - - images/facetracknoir.png - - images/facetracknoir.png - + + :/images/filter-16.png:/images/filter-16.png Qt::LeftToRight @@ -486,7 +482,9 @@ p, li { white-space: pre-wrap; } btnOK btnCancel - + + + minSmooth diff --git a/ftnoir_filter_kalman/ftnoir_kalman_filtercontrols.ui b/ftnoir_filter_kalman/ftnoir_kalman_filtercontrols.ui index d1cff81e..a9fdec6e 100644 --- a/ftnoir_filter_kalman/ftnoir_kalman_filtercontrols.ui +++ b/ftnoir_filter_kalman/ftnoir_kalman_filtercontrols.ui @@ -20,13 +20,11 @@ - Filter settings + Kalman settings - - - images/facetracknoir.png - images/facetracknoir.png + + :/images/filter-16.png:/images/filter-16.png Qt::LeftToRight @@ -64,7 +62,9 @@ - + + + diff --git a/ftnoir_protocol_fg/ftnoir_fgcontrols.ui b/ftnoir_protocol_fg/ftnoir_fgcontrols.ui index f3b54486..e351647b 100644 --- a/ftnoir_protocol_fg/ftnoir_fgcontrols.ui +++ b/ftnoir_protocol_fg/ftnoir_fgcontrols.ui @@ -9,16 +9,16 @@ 0 0 - 404 + 415 112 - FlightGear settings FaceTrackNoIR + FlightGear protocol settings - - images/FaceTrackNoIR.pngimages/FaceTrackNoIR.png + + :/images/filter-16.png:/images/filter-16.png Qt::LeftToRight @@ -131,7 +131,9 @@ spinIPFourthNibble spinPortNumber - + + + startEngineClicked() diff --git a/ftnoir_protocol_ft/ftnoir_ftcontrols.ui b/ftnoir_protocol_ft/ftnoir_ftcontrols.ui index f4d94ee8..39787d90 100644 --- a/ftnoir_protocol_ft/ftnoir_ftcontrols.ui +++ b/ftnoir_protocol_ft/ftnoir_ftcontrols.ui @@ -13,7 +13,7 @@ 0 0 407 - 347 + 414 @@ -29,11 +29,11 @@ - FreeTrack 2.0 settings FaceTrackNoIR + freetrack protocol settings - - images/FaceTrackNoIR.icoimages/FaceTrackNoIR.ico + + :/images/freetrack.png:/images/freetrack.png Qt::LeftToRight @@ -214,7 +214,9 @@ - + + + startEngineClicked() diff --git a/ftnoir_protocol_ftn/ftn-protocol.qrc b/ftnoir_protocol_ftn/ftn-protocol.qrc deleted file mode 100644 index 18ae0aae..00000000 --- a/ftnoir_protocol_ftn/ftn-protocol.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - images/facetracknoir.png - - diff --git a/ftnoir_protocol_ftn/ftnoir_ftncontrols.ui b/ftnoir_protocol_ftn/ftnoir_ftncontrols.ui index ac6988d7..429e7046 100644 --- a/ftnoir_protocol_ftn/ftnoir_ftncontrols.ui +++ b/ftnoir_protocol_ftn/ftnoir_ftncontrols.ui @@ -17,8 +17,8 @@ UDP protocol settings - - images/FaceTrackNoIR.pngimages/FaceTrackNoIR.png + + :/images/facetracknoir.png:/images/facetracknoir.png Qt::LeftToRight @@ -254,7 +254,9 @@ btnOK btnCancel - + + + startEngineClicked() diff --git a/ftnoir_protocol_ftn/images/facetracknoir.png b/ftnoir_protocol_ftn/images/facetracknoir.png deleted file mode 100644 index b69a13ef..00000000 Binary files a/ftnoir_protocol_ftn/images/facetracknoir.png and /dev/null differ diff --git a/ftnoir_protocol_mouse/ftnoir_mousecontrols.ui b/ftnoir_protocol_mouse/ftnoir_mousecontrols.ui index ee15ded2..540e4f0d 100644 --- a/ftnoir_protocol_mouse/ftnoir_mousecontrols.ui +++ b/ftnoir_protocol_mouse/ftnoir_mousecontrols.ui @@ -9,16 +9,16 @@ 0 0 - 250 - 112 + 257 + 114 - MouseLook settings FaceTrackNoIR + Mouse protocol settings - - :/images/Mouse.png:/images/Mouse.png + + :/images/mouse.png:/images/mouse.png Qt::LeftToRight @@ -193,7 +193,9 @@ - + + + startEngineClicked() diff --git a/ftnoir_tracker_joystick/ftnoir_tracker_joystick_controls.ui b/ftnoir_tracker_joystick/ftnoir_tracker_joystick_controls.ui index e1f1d28c..a0fa43d3 100644 --- a/ftnoir_tracker_joystick/ftnoir_tracker_joystick_controls.ui +++ b/ftnoir_tracker_joystick/ftnoir_tracker_joystick_controls.ui @@ -20,11 +20,11 @@ - Joystick protcool settings + Joystick protocol settings - images/FaceTrackNoIR.pngimages/FaceTrackNoIR.png + ../facetracknoir/images/facetracknoir.png../facetracknoir/images/facetracknoir.png Qt::LeftToRight diff --git a/ftnoir_tracker_udp/ftnoir_ftnclientcontrols.ui b/ftnoir_tracker_udp/ftnoir_ftnclientcontrols.ui index 6c71b50b..fc614477 100644 --- a/ftnoir_tracker_udp/ftnoir_ftnclientcontrols.ui +++ b/ftnoir_tracker_udp/ftnoir_ftnclientcontrols.ui @@ -18,7 +18,7 @@ - images/FaceTrackNoIR.pngimages/FaceTrackNoIR.png + ../facetracknoir/images/facetracknoir.png../facetracknoir/images/facetracknoir.png Qt::LeftToRight -- cgit v1.2.3