Merge pull request #735 from cpuwolf/wii2

tracker/wii: change setting UI & reorg wiiyourself

16 files changed, 9 insertions, 5 deletions

diff --git a/tracker-pt/CMakeLists.txt b/tracker-pt/CMakeLists.txt
index 2e8446d5..e588e567 100644
--- a/tracker-pt/CMakeLists.txt
+++ b/tracker-pt/CMakeLists.txt
@@ -6,6 +6,5 @@ if(OpenCV_FOUND)
     target_link_libraries(opentrack-tracker-pt-base opentrack-cv ${modules})
 endif()
 add_subdirectory(module)
-add_subdirectory(wiiyourself)
 add_subdirectory(tracker-wii)
 
diff --git a/tracker-pt/tracker-wii/CMakeLists.txt b/tracker-pt/tracker-wii/CMakeLists.txt
index a22121ef..cab5b6a1 100644
--- a/tracker-pt/tracker-wii/CMakeLists.txt
+++ b/tracker-pt/tracker-wii/CMakeLists.txt
@@ -1,6 +1,6 @@
 find_package(OpenCV 3.0 QUIET)
 if(OpenCV_FOUND)
     otr_module(tracker-wii)
-    target_link_libraries(opentrack-tracker-wii opentrack-tracker-pt-base opentrack-tracker-wii-pt-wiiyourself)
+    target_link_libraries(opentrack-tracker-wii opentrack-tracker-pt-base opentrack-wiiyourself)
 	target_include_directories(opentrack-tracker-wii PRIVATE "${CMAKE_SOURCE_DIR}/tracker-pt")
 endif()
\ No newline at end of file
diff --git a/tracker-pt/tracker-wii/wii_module.cpp b/tracker-pt/tracker-wii/wii_module.cpp
index aa8a5c99..40131f69 100644
--- a/tracker-pt/tracker-wii/wii_module.cpp
+++ b/tracker-pt/tracker-wii/wii_module.cpp
@@ -74,6 +74,10 @@ using namespace pt_module;
 
 
 
-wii_dialog_pt::wii_dialog_pt() : TrackerDialog_PT(module_name) {}
+wii_dialog_pt::wii_dialog_pt() : TrackerDialog_PT(module_name)
+{
+	ui.camera_settings_groupbox->hide();
+	ui.groupBox_2->hide();
+}
 
 OPENTRACK_DECLARE_TRACKER(wii_tracker_pt, wii_dialog_pt, wii_metadata_pt)
diff --git a/tracker-pt/wiiyourself/CMakeLists.txt b/tracker-pt/wiiyourself/CMakeLists.txt
deleted file mode 100644
index e16787c7..00000000
--- a/tracker-pt/wiiyourself/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-otr_module(tracker-wii-pt-wiiyourself STATIC)
diff --git a/variant/default/_variant.cmake b/variant/default/_variant.cmake
index cdf9da56..6143dd97 100644
--- a/variant/default/_variant.cmake
+++ b/variant/default/_variant.cmake
@@ -21,7 +21,8 @@ function(otr_init_variant)
         "qxt-mini"
         "macosx"
         "cv"
-        "migration")
+        "migration"
+        "wiiyourself")
 
     set_property(GLOBAL PROPERTY opentrack-subprojects "${subprojects}")
 endfunction()
diff --git a/wiiyourself/CMakeLists.txt b/wiiyourself/CMakeLists.txt
new file mode 100644
index 00000000..6a32fde4
--- /dev/null
+++ b/wiiyourself/CMakeLists.txt
@@ -0,0 +1 @@
+otr_module(wiiyourself STATIC)
diff --git a/tracker-pt/wiiyourself/History.txt b/wiiyourself/History.txt
index 6601dc97..6601dc97 100644
--- a/tracker-pt/wiiyourself/History.txt
+++ b/wiiyourself/History.txt
diff --git a/tracker-pt/wiiyourself/License.txt b/wiiyourself/License.txt
index fc41a9a0..fc41a9a0 100644
--- a/tracker-pt/wiiyourself/License.txt
+++ b/wiiyourself/License.txt
diff --git a/tracker-pt/wiiyourself/ReadMe.txt b/wiiyourself/ReadMe.txt
index 85ca0034..85ca0034 100644
--- a/tracker-pt/wiiyourself/ReadMe.txt
+++ b/wiiyourself/ReadMe.txt
diff --git a/tracker-pt/wiiyourself/lang/nl_NL.ts b/wiiyourself/lang/nl_NL.ts
index 9e739505..9e739505 100644
--- a/tracker-pt/wiiyourself/lang/nl_NL.ts
+++ b/wiiyourself/lang/nl_NL.ts
diff --git a/tracker-pt/wiiyourself/lang/ru_RU.ts b/wiiyourself/lang/ru_RU.ts
index f62cf2e1..f62cf2e1 100644
--- a/tracker-pt/wiiyourself/lang/ru_RU.ts
+++ b/wiiyourself/lang/ru_RU.ts
diff --git a/tracker-pt/wiiyourself/lang/stub.ts b/wiiyourself/lang/stub.ts
index 6401616d..6401616d 100644
--- a/tracker-pt/wiiyourself/lang/stub.ts
+++ b/wiiyourself/lang/stub.ts
diff --git a/tracker-pt/wiiyourself/wiimote.cpp b/wiiyourself/wiimote.cpp
index 46130cca..46130cca 100644
--- a/tracker-pt/wiiyourself/wiimote.cpp
+++ b/wiiyourself/wiimote.cpp
diff --git a/tracker-pt/wiiyourself/wiimote.h b/wiiyourself/wiimote.h
index 1db2c098..1db2c098 100644
--- a/tracker-pt/wiiyourself/wiimote.h
+++ b/wiiyourself/wiimote.h
diff --git a/tracker-pt/wiiyourself/wiimote_common.h b/wiiyourself/wiimote_common.h
index c0fd01e1..c0fd01e1 100644
--- a/tracker-pt/wiiyourself/wiimote_common.h
+++ b/wiiyourself/wiimote_common.h
diff --git a/tracker-pt/wiiyourself/wiimote_state.h b/wiiyourself/wiimote_state.h
index 1bf167a2..1bf167a2 100644
--- a/tracker-pt/wiiyourself/wiimote_state.h
+++ b/wiiyourself/wiimote_state.h