From 47d4b25bd0583b1fd65ae885950efd34c9df256b Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Thu, 28 Mar 2019 13:40:33 +0100 Subject: cmake: move around variant directories --- variant/default/CMakeLists.txt | 9 - variant/default/_variant.cmake | 1 + variant/default/lang/nl_NL.ts | 189 ----- variant/default/lang/ru_RU.ts | 193 ----- variant/default/lang/stub.ts | 189 ----- variant/default/lang/zh_CN.ts | 193 ----- variant/default/main-window.cpp | 920 ---------------------- variant/default/main-window.hpp | 145 ---- variant/default/main-window.ui | 1459 ----------------------------------- variant/default/main.cpp | 23 - variant/default/new_config.ui | 45 -- variant/default/new_file_dialog.cpp | 37 - variant/default/new_file_dialog.h | 25 - variant/default/opentrack.ico | Bin 67134 -> 0 bytes variant/default/resources.rc | 2 - 15 files changed, 1 insertion(+), 3429 deletions(-) delete mode 100644 variant/default/CMakeLists.txt delete mode 100644 variant/default/lang/nl_NL.ts delete mode 100644 variant/default/lang/ru_RU.ts delete mode 100644 variant/default/lang/stub.ts delete mode 100644 variant/default/lang/zh_CN.ts delete mode 100644 variant/default/main-window.cpp delete mode 100644 variant/default/main-window.hpp delete mode 100644 variant/default/main-window.ui delete mode 100644 variant/default/main.cpp delete mode 100644 variant/default/new_config.ui delete mode 100644 variant/default/new_file_dialog.cpp delete mode 100644 variant/default/new_file_dialog.h delete mode 100644 variant/default/opentrack.ico delete mode 100644 variant/default/resources.rc (limited to 'variant/default') diff --git a/variant/default/CMakeLists.txt b/variant/default/CMakeLists.txt deleted file mode 100644 index a8829aa5..00000000 --- a/variant/default/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -otr_module(executable EXECUTABLE BIN) - -set_target_properties(opentrack-executable PROPERTIES - SUFFIX "${opentrack-binary-suffix}" - OUTPUT_NAME "opentrack" - PREFIX "" -) - -target_link_libraries(${self} opentrack-user-interface opentrack-version) diff --git a/variant/default/_variant.cmake b/variant/default/_variant.cmake index 7501b0a4..7353b0f4 100644 --- a/variant/default/_variant.cmake +++ b/variant/default/_variant.cmake @@ -25,6 +25,7 @@ function(otr_init_variant) "main-window" "video" "video-*" + "opentrack" ) set_property(GLOBAL PROPERTY opentrack-subprojects "${subprojects}") diff --git a/variant/default/lang/nl_NL.ts b/variant/default/lang/nl_NL.ts deleted file mode 100644 index 7a465820..00000000 --- a/variant/default/lang/nl_NL.ts +++ /dev/null @@ -1,189 +0,0 @@ - - - - - UI_new_config - - Config filename - - - - New file name: - - - - - main_window - - Raw tracker data - - - - Z - - - - Pitch - - - - Y - - - - X - - - - Roll - - - - Yaw - - - - Game data - - - - Profile - - - - Options - - - - Mapping - - - - Tracking - - - - Start - - - - Stop - - - - Input - - - - 🔨 - - - - Output - - - - Filter - - - - Running as root is bad - - - - Do not run as root. Set correct device node permissions. - - - - Running as root is bad, seriously - - - - Do not run as root. I'll keep whining at every startup. - - - - Create new empty config - - - - Create new copied config - - - - Open configuration directory - - - - opentrack - - - - (debug) - - - - Show the Octopus - - - - Hide the Octopus - - - - Tracker settings - - - - Filter settings - - - - Protocol settings - - - - Mappings - - - - Exit - - - - The Octopus is sad - - - - Check permissions for your .ini directory: - -"%1"%2 - -Exiting now. - - - - :: - - - - Be annoyed, comprehensively. - - - - Don't run as root to remove these annoying messages. - - - - - new_file_dialog - - File exists - - - - This file already exists. Pick another name. - - - - diff --git a/variant/default/lang/ru_RU.ts b/variant/default/lang/ru_RU.ts deleted file mode 100644 index 684a8212..00000000 --- a/variant/default/lang/ru_RU.ts +++ /dev/null @@ -1,193 +0,0 @@ - - - - - UI_new_config - - Config filename - Создание профиля - - - New file name: - Новое имя профиля: - - - - main_window - - Create new empty config - Создать новый пустой профиль - - - Create new copied config - Создать новый профиль на основе текущего - - - Open configuration directory - Открыть каталог с профилями - - - opentrack - - - - (debug) - - - - Show the Octopus - Показать осьминожка - - - Hide the Octopus - Спрятать осьминожка - - - Tracker settings - Настройка источника данных - - - Filter settings - Настройка фильтрации/сглаживания - - - Protocol settings - Настройка выходного интерфейса - - - Mappings - Настройка кривых - - - Options - Настройки - - - Exit - Закрыть - - - The Octopus is sad - Осьминожек опечален - - - Check permissions for your .ini directory: - -"%1"%2 - -Exiting now. - Проверьте права доступа на Вашу .ini папку: - -"%1"%2 - -Закрытие программы. - - - :: - :: - - - Raw tracker data - Исходные данные - - - Z - Z - - - Pitch - Pitch - - - Y - Y - - - X - X - - - Roll - Roll - - - Yaw - Yaw - - - Game data - Игровые данные - - - Profile - Профиль - - - Mapping - Кривые - - - Tracking - Статус работы трекера - - - Start - Запустить - - - Stop - Остановить - - - Input - Источник данных - - - 🔨 - - - - Output - Выходной интерфейс - - - Filter - Фильтрация/сглаживание - - - Running as root is bad - - - - Do not run as root. Set correct device node permissions. - - - - Running as root is bad, seriously - - - - Do not run as root. I'll keep whining at every startup. - - - - Be annoyed, comprehensively. - - - - Don't run as root to remove these annoying messages. - - - - - new_file_dialog - - File exists - Файл создан - - - This file already exists. Pick another name. - Данный файл уже создан. Пожалуйста выберите другое имя. - - - diff --git a/variant/default/lang/stub.ts b/variant/default/lang/stub.ts deleted file mode 100644 index 04555dd0..00000000 --- a/variant/default/lang/stub.ts +++ /dev/null @@ -1,189 +0,0 @@ - - - - - UI_new_config - - Config filename - - - - New file name: - - - - - main_window - - Raw tracker data - - - - Z - - - - Pitch - - - - Y - - - - X - - - - Roll - - - - Yaw - - - - Game data - - - - Profile - - - - Options - - - - Mapping - - - - Tracking - - - - Start - - - - Stop - - - - Input - - - - 🔨 - - - - Output - - - - Filter - - - - Running as root is bad - - - - Do not run as root. Set correct device node permissions. - - - - Running as root is bad, seriously - - - - Do not run as root. I'll keep whining at every startup. - - - - Create new empty config - - - - Create new copied config - - - - Open configuration directory - - - - opentrack - - - - (debug) - - - - Show the Octopus - - - - Hide the Octopus - - - - Tracker settings - - - - Filter settings - - - - Protocol settings - - - - Mappings - - - - Exit - - - - The Octopus is sad - - - - Check permissions for your .ini directory: - -"%1"%2 - -Exiting now. - - - - :: - - - - Be annoyed, comprehensively. - - - - Don't run as root to remove these annoying messages. - - - - - new_file_dialog - - File exists - - - - This file already exists. Pick another name. - - - - diff --git a/variant/default/lang/zh_CN.ts b/variant/default/lang/zh_CN.ts deleted file mode 100644 index 15609d70..00000000 --- a/variant/default/lang/zh_CN.ts +++ /dev/null @@ -1,193 +0,0 @@ - - - - - UI_new_config - - Config filename - 配置文件名字： - - - New file name: - 新文件名字： - - - - main_window - - Raw tracker data - 跟踪器原始数据 - - - Z - - - - Pitch - 仰俯 - - - Y - - - - X - - - - Roll - 横滚 - - - Yaw - 偏航 - - - Game data - 游戏得到的数据 - - - Profile - 配置文件 - - - Options - 选项 - - - Mapping - 映射 - - - Tracking - 跟踪 - - - Start - 开始 - - - Stop - 停止 - - - Input - 输入 - - - 🔨 - - - - Output - 输出 - - - Filter - 过滤器 - - - Running as root is bad - 以管理员运行不是什么好主意 - - - Do not run as root. Set correct device node permissions. - 请不要以管理员运行。可以设置何时的设备访问权限来解决。 - - - Running as root is bad, seriously - 再说一遍，以管理员运行不是什么好主意 - - - Do not run as root. I'll keep whining at every startup. - 请不要以管理员运行。这话每次启动我都会强调一遍。 - - - Don't run as root to remove these annoying messages. - 以管理员运行真的非常不好 - - - Be annoyed, comprehensively. - 请不要以管理员运行。烦了吧？赶紧动作起来 - - - Create new empty config - 新建一个空的配置 - - - Create new copied config - 新建一个复制配置 - - - Open configuration directory - 打开配置目录 - - - opentrack - - - - (debug) - （调试） - - - Show the Octopus - 显示八爪鱼 - - - Hide the Octopus - 隐藏八爪鱼 - - - Tracker settings - 跟踪器设置 - - - Filter settings - 过滤器设置 - - - Protocol settings - 协议设置 - - - Mappings - 影射 - - - Exit - 退出 - - - The Octopus is sad - 八爪鱼不开心了 - - - Check permissions for your .ini directory: - -"%1"%2 - -Exiting now. - 检查一下你的 .ini 目录权限: - -"%1"%2 - -退出先. - - - :: - - - - - new_file_dialog - - File exists - 文件已经存在 - - - This file already exists. Pick another name. - 文件重名了，换个其他名字 - - - diff --git a/variant/default/main-window.cpp b/variant/default/main-window.cpp deleted file mode 100644 index b90aa3bd..00000000 --- a/variant/default/main-window.cpp +++ /dev/null @@ -1,920 +0,0 @@ -/* Copyright (c) 2013-2016, Stanislaw Halik - - * Permission to use, copy, modify, and/or distribute this - * software for any purpose with or without fee is hereby granted, - * provided that the above copyright notice and this permission - * notice appear in all copies. - */ - -#include "main-window.hpp" -#include "logic/pipeline.hpp" -#include "options/options.hpp" -#include "new_file_dialog.h" -#include "migration/migration.hpp" -#include "compat/check-visible.hpp" -#include "compat/sleep.hpp" -#include "compat/macros.hpp" -#include "compat/library-path.hpp" -#include "compat/math.hpp" -#include "compat/sysexits.hpp" - -#include -#include - -#include -#include -#include - -extern "C" const char* const opentrack_version; - -using namespace options::globals; -using namespace options; - -main_window::main_window() : State(OPENTRACK_BASE_PATH + OPENTRACK_LIBRARY_PATH) -{ - ui.setupUi(this); - -#if !defined _WIN32 && !defined __APPLE__ - annoy_if_root(); -#endif - - init_profiles(); - init_buttons(); - init_tray_menu(); - init_dylibs(); - init_shortcuts(); - - setWindowFlags(Qt::MSWindowsFixedSizeDialogHint | windowFlags()); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); - adjustSize(); - - if (!start_in_tray()) - { - setVisible(true); - show(); - } - else - setVisible(false); - - connect(&pose_update_timer, &QTimer::timeout, - this, &main_window::show_pose, Qt::DirectConnection); - connect(&det_timer, &QTimer::timeout, - this, &main_window::maybe_start_profile_from_executable); - det_timer.start(1000); -} - -void main_window::init_shortcuts() -{ - register_shortcuts(); - - // ctrl+q exits - connect(&kbd_quit, &QShortcut::activated, this, [this]() { main_window::exit(EXIT_SUCCESS); }, Qt::DirectConnection); - kbd_quit.setEnabled(true); -} - -void main_window::init_dylibs() -{ - using dylib_ptr = Modules::dylib_ptr; - using dylib_list = Modules::dylib_list; - - modules.filters().insert(modules.filters().begin(), - std::make_shared("", dylib_type::Filter)); - - for (dylib_ptr& x : modules.trackers()) - ui.iconcomboTrackerSource->addItem(x->icon, x->name, x->module_name); - - for (dylib_ptr& x : modules.protocols()) - ui.iconcomboProtocol->addItem(x->icon, x->name, x->module_name); - - for (dylib_ptr& x : modules.filters()) - ui.iconcomboFilter->addItem(x->icon, x->name, x->module_name); - - connect(ui.iconcomboTrackerSource, &QComboBox::currentTextChanged, - this, [&](const QString&) { pTrackerDialog = nullptr; }); - - connect(ui.iconcomboProtocol, &QComboBox::currentTextChanged, - this, [&](const QString&) { pProtocolDialog = nullptr; }); - - connect(ui.iconcomboFilter, &QComboBox::currentTextChanged, - this, [&](const QString&) { pFilterDialog = nullptr; }); - - connect(&m.tracker_dll, value_::value_changed(), - this, &main_window::save_modules, - Qt::DirectConnection); - - connect(&m.protocol_dll, value_::value_changed(), - this, &main_window::save_modules, - Qt::DirectConnection); - - connect(&m.filter_dll, value_::value_changed(), - this, &main_window::save_modules, - Qt::DirectConnection); - - { - struct list { - dylib_list& libs; - QComboBox* input; - value& place; - }; - - list types[] { - { modules.trackers(), ui.iconcomboTrackerSource, m.tracker_dll }, - { modules.protocols(), ui.iconcomboProtocol, m.protocol_dll }, - { modules.filters(), ui.iconcomboFilter, m.filter_dll }, - }; - - for (list& type : types) - { - list t = type; - tie_setting(t.place, t.input, - [t](const QString& name) { - auto [ptr, idx] = module_by_name(name, t.libs); - return idx; - }, - [t](int, const QVariant& userdata) { - auto [ptr, idx] = module_by_name(userdata.toString(), t.libs); - if (ptr) - return ptr->module_name; - else - return QString(); - }); - } - } -} - -void main_window::init_profiles() -{ - refresh_profile_list(); - // implicitly created by `ini_directory()' - if (ini_directory().isEmpty() || !QDir(ini_directory()).isReadable()) - die_on_profile_not_writable(); - - set_profile(ini_filename()); - - // profile menu - profile_menu.addAction(tr("Create new empty config"), this, &main_window::create_empty_profile); - profile_menu.addAction(tr("Create new copied config"), this, &main_window::create_copied_profile); - profile_menu.addAction(tr("Open configuration directory"), this, &main_window::open_profile_directory); - ui.profile_button->setMenu(&profile_menu); - - connect(&profile_list_timer, &QTimer::timeout, this, &main_window::refresh_profile_list); - profile_list_timer.start(1000 * 5); - - connect(ui.iconcomboProfile, &QComboBox::currentTextChanged, - this, [this](const QString& x) { main_window::set_profile(x); }); -} - -void main_window::init_tray_menu() -{ - tray_menu.clear(); - - QString display_name(opentrack_version); - if (display_name.startsWith("opentrack-")) - display_name = tr("opentrack") + " " + display_name.mid(sizeof("opentrack-") - 1); - if (display_name.endsWith("-DEBUG")) - display_name.replace(display_name.size() - int(sizeof("DEBUG")), display_name.size(), tr(" (debug)")); - - menu_action_header.setEnabled(false); - menu_action_header.setText(display_name); - menu_action_header.setIcon(QIcon(":/images/opentrack.png")); - tray_menu.addAction(&menu_action_header); - - menu_action_show.setIconVisibleInMenu(true); - menu_action_show.setText(isHidden() ? tr("Show the Octopus") : tr("Hide the Octopus")); - menu_action_show.setIcon(QIcon(":/images/opentrack.png")); - QObject::connect(&menu_action_show, &QAction::triggered, this, [&] { toggle_restore_from_tray(QSystemTrayIcon::Trigger); }); - tray_menu.addAction(&menu_action_show); - - tray_menu.addSeparator(); - - menu_action_tracker.setText(tr("Tracker settings")); - menu_action_tracker.setIcon(QIcon(":/images/tools.png")); - QObject::connect(&menu_action_tracker, &QAction::triggered, this, &main_window::show_tracker_settings); - tray_menu.addAction(&menu_action_tracker); - - menu_action_filter.setText(tr("Filter settings")); - menu_action_filter.setIcon(QIcon(":/images/filter-16.png")); - QObject::connect(&menu_action_filter, &QAction::triggered, this, &main_window::show_filter_settings); - tray_menu.addAction(&menu_action_filter); - - menu_action_proto.setText(tr("Protocol settings")); - menu_action_proto.setIcon(QIcon(":/images/settings16.png")); - QObject::connect(&menu_action_proto, &QAction::triggered, this, &main_window::show_proto_settings); - tray_menu.addAction(&menu_action_proto); - - tray_menu.addSeparator(); - - menu_action_mappings.setIcon(QIcon(":/images/curves.png")); - menu_action_mappings.setText(tr("Mappings")); - QObject::connect(&menu_action_mappings, &QAction::triggered, this, &main_window::show_mapping_window); - tray_menu.addAction(&menu_action_mappings); - - menu_action_options.setIcon(QIcon(":/images/tools.png")); - menu_action_options.setText(tr("Options")); - QObject::connect(&menu_action_options, &QAction::triggered, this, &main_window::show_options_dialog); - tray_menu.addAction(&menu_action_options); - - tray_menu.addSeparator(); - - menu_action_exit.setText(tr("Exit")); - QObject::connect(&menu_action_exit, &QAction::triggered, this, &main_window::exit); - tray_menu.addAction(&menu_action_exit); - - connect(&s.tray_enabled, value_::value_changed(), - this, &main_window::ensure_tray); - - ensure_tray(); -} - -void main_window::init_buttons() -{ - update_button_state(false, false); - connect(ui.btnEditCurves, &QPushButton::clicked, this, &main_window::show_mapping_window); - connect(ui.btnShortcuts, &QPushButton::clicked, this, &main_window::show_options_dialog); - connect(ui.btnShowEngineControls, &QPushButton::clicked, this, &main_window::show_tracker_settings); - connect(ui.btnShowServerControls, &QPushButton::clicked, this, &main_window::show_proto_settings); - connect(ui.btnShowFilterControls, &QPushButton::clicked, this, &main_window::show_filter_settings); - connect(ui.btnStartTracker, &QPushButton::clicked, this, &main_window::start_tracker_); - connect(ui.btnStopTracker, &QPushButton::clicked, this, &main_window::stop_tracker_); -} - -void main_window::register_shortcuts() -{ - global_shortcuts.reload({ - { s.key_start_tracking1, [this](bool) { start_tracker(); }, true }, - { s.key_start_tracking2, [this](bool) { start_tracker(); }, true }, - - { s.key_stop_tracking1, [this](bool) { stop_tracker(); }, true }, - { s.key_stop_tracking2, [this](bool) { stop_tracker(); }, true }, - - { s.key_toggle_tracking1, [this](bool) { toggle_tracker(); }, true }, - { s.key_toggle_tracking2, [this](bool) { toggle_tracker(); }, true }, - - { s.key_restart_tracking1, [this](bool) { restart_tracker(); }, true }, - { s.key_restart_tracking2, [this](bool) { restart_tracker(); }, true }, - }); - - if (work) - work->reload_shortcuts(); -} - -void main_window::die_on_profile_not_writable() -{ - stop_tracker_(); - - static const QString pad(16, QChar(' ')); - - QMessageBox::critical(this, - tr("The Octopus is sad"), - tr("Check permissions for your .ini directory:\n\n\"%1\"%2\n\nExiting now.").arg(ini_directory(), pad), - QMessageBox::Close, QMessageBox::NoButton); - - exit(EX_OSFILE); -} - -bool main_window::profile_name_from_dialog(QString& ret) -{ - new_file_dialog dlg; - dlg.exec(); - return dlg.is_ok(ret); -} - -main_window::~main_window() -{ - // stupid ps3 eye has LED issues - if (work && ui.video_frame->layout()) - { - hide(); - stop_tracker_(); - close(); - - constexpr int inc = 25, max = 1000; - - for (int k = 0; k < max; k += inc) - { - QEventLoop ev; - ev.processEvents(); - portable::sleep(inc); - } - } - - exit(); -} - -void main_window::save_modules() -{ - m.b->save(); -} - -void main_window::create_empty_profile() -{ - QString name; - if (profile_name_from_dialog(name)) - { - QFile(ini_combine(name)).open(QFile::ReadWrite); - refresh_profile_list(); - - if (profile_list.contains(name)) - { - QSignalBlocker q(ui.iconcomboProfile); - - set_profile(name, false); - mark_profile_as_not_needing_migration(); - } - } -} - -void main_window::create_copied_profile() -{ - const QString cur = ini_pathname(); - QString name; - if (!cur.isEmpty() && profile_name_from_dialog(name)) - { - const QString new_name = ini_combine(name); - (void) QFile::remove(new_name); - QFile::copy(cur, new_name); - - refresh_profile_list(); - - if (profile_list.contains(name)) - { - QSignalBlocker q(ui.iconcomboProfile); - - set_profile(name, false); - mark_profile_as_not_needing_migration(); - } - } - -} - -void main_window::open_profile_directory() -{ - QDesktopServices::openUrl("file:///" + QDir::toNativeSeparators(ini_directory())); -} - -void main_window::refresh_profile_list() -{ - if (work) - return; - - QStringList list = ini_list(); - QString current = ini_filename(); - - if (list == profile_list) - return; - - if (!list.contains(current)) - current = OPENTRACK_DEFAULT_PROFILE; - - profile_list = list; - - static const QIcon icon(":/images/settings16.png"); - - QSignalBlocker l(ui.iconcomboProfile); - - ui.iconcomboProfile->clear(); - ui.iconcomboProfile->addItems(list); - - for (int i = 0; i < list.size(); i++) - ui.iconcomboProfile->setItemIcon(i, icon); - - ui.iconcomboProfile->setCurrentText(current); -} - - - -void main_window::update_button_state(bool running, bool inertialp) -{ - bool not_running = !running; - ui.iconcomboProfile->setEnabled(not_running); - ui.btnStartTracker->setEnabled(not_running); - ui.btnStopTracker->setEnabled(running); - ui.iconcomboProtocol->setEnabled(not_running); - ui.iconcomboFilter->setEnabled(not_running); - ui.iconcomboTrackerSource->setEnabled(not_running); - ui.profile_button->setEnabled(not_running); - ui.video_frame_label->setVisible(not_running || inertialp); - if(not_running) - { - ui.video_frame_label->setPixmap(QPixmap(":/images/tracking-not-started.png")); - } - else { - ui.video_frame_label->setPixmap(QPixmap(":/images/no-feed.png")); - } -} - -void main_window::start_tracker_() -{ - if (work) - return; - - work = std::make_shared(pose, ev, ui.video_frame, current_tracker(), current_protocol(), current_filter()); - - if (!work->is_ok()) - { - work = nullptr; - return; - } - - { - double p[6] = {0,0,0, 0,0,0}; - show_pose_(p, p); - } - - if (pTrackerDialog) - pTrackerDialog->register_tracker(work->libs.pTracker.get()); - - if (pFilterDialog) - pFilterDialog->register_filter(work->libs.pFilter.get()); - - if (pProtocolDialog) - pProtocolDialog->register_protocol(work->libs.pProtocol.get()); - - pose_update_timer.start(50); - - // NB check valid since SelectedLibraries ctor called - // trackers take care of layout state updates - const bool is_inertial = ui.video_frame->layout() == nullptr; - update_button_state(true, is_inertial); - - ui.btnStopTracker->setFocus(); -} - -void main_window::stop_tracker_() -{ - if (!work) - return; - - force_is_visible(true); - with_tracker_teardown sentinel; - - pose_update_timer.stop(); - ui.pose_display->present(0,0,0, 0,0,0); - - if (pTrackerDialog) - pTrackerDialog->unregister_tracker(); - - if (pProtocolDialog) - pProtocolDialog->unregister_protocol(); - - if (pFilterDialog) - pFilterDialog->unregister_filter(); - - work = nullptr; - - { - double p[6] {}; - show_pose_(p, p); - } - - update_button_state(false, false); - set_title(); - ui.btnStartTracker->setFocus(); -} - -void main_window::show_pose_(const double* mapped, const double* raw) -{ - ui.pose_display->present(mapped[Yaw], mapped[Pitch], -mapped[Roll], - mapped[TX], mapped[TY], mapped[TZ]); - - QLCDNumber* raw_[] = { - ui.raw_x, ui.raw_y, ui.raw_z, - ui.raw_yaw, ui.raw_pitch, ui.raw_roll, - }; - - QLCDNumber* mapped_[] = { - ui.pose_x, ui.pose_y, ui.pose_z, - ui.pose_yaw, ui.pose_pitch, ui.pose_roll, - }; - - for (int k = 0; k < 6; k++) - { - raw_[k]->display(iround(raw[k])); - mapped_[k]->display(iround(mapped[k])); - } - - QString game_title; - if (work && work->libs.pProtocol) - game_title = work->libs.pProtocol->game_name(); - set_title(game_title); -} - -void main_window::set_title(const QString& game_title) -{ - static const QString version{opentrack_version}; - static const QString sep { tr(" :: ") }; - static const QString pat1{ version + sep + "%1" + sep + "%2" }; - static const QString pat2{ version + sep + "%1" }; - - const QString current = ini_filename(); - - if (game_title.isEmpty()) - setWindowTitle(pat2.arg(current)); - else - setWindowTitle(pat1.arg(current, game_title)); -} - -void main_window::show_pose() -{ - set_is_visible(*this); - - if (mapping_widget) - mapping_widget->refresh_tab(); - - if (!check_is_visible()) - return; - - double mapped[6], raw[6]; - - work->pipeline_.raw_and_mapped_pose(mapped, raw); - - show_pose_(mapped, raw); -} - -static void show_window(QWidget& d, bool fresh) -{ - if (fresh) - { - d.setWindowFlags(Qt::MSWindowsFixedSizeDialogHint | d.windowFlags()); - d.setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); - - d.show(); - d.adjustSize(); - d.raise(); - } - else - { - d.show(); - d.raise(); - } -} - -template -static bool mk_window_common(std::unique_ptr& d, F&& fun) -{ - bool fresh = false; - - if (!d) - d = fun(), fresh = !!d; - - if (d) - show_window(*d, fresh); - - return fresh; -} - -template -static bool mk_window(std::unique_ptr& place, Args&&... params) -{ - return mk_window_common(place, [&] { - return std::make_unique(params...); - }); -} - -template -static bool mk_dialog(std::unique_ptr& place, const std::shared_ptr& lib) -{ - using u = std::unique_ptr; - - return mk_window_common(place, [&] { - if (lib && lib->Dialog) - return u{ (t*)lib->Dialog() }; - else - return u{}; - }); -} - -void main_window::show_tracker_settings() -{ - if (mk_dialog(pTrackerDialog, current_tracker()) && work && work->libs.pTracker) - pTrackerDialog->register_tracker(work->libs.pTracker.get()); - if (pTrackerDialog) - QObject::connect(pTrackerDialog.get(), &ITrackerDialog::closing, - this, [this] { pTrackerDialog = nullptr; }); -} - -void main_window::show_proto_settings() -{ - if (mk_dialog(pProtocolDialog, current_protocol()) && work && work->libs.pProtocol) - pProtocolDialog->register_protocol(work->libs.pProtocol.get()); - if (pProtocolDialog) - QObject::connect(pProtocolDialog.get(), &IProtocolDialog::closing, - this, [this] { pProtocolDialog = nullptr; }); -} - -void main_window::show_filter_settings() -{ - if (mk_dialog(pFilterDialog, current_filter()) && work && work->libs.pFilter) - pFilterDialog->register_filter(work->libs.pFilter.get()); - if (pFilterDialog) - QObject::connect(pFilterDialog.get(), &IFilterDialog::closing, - this, [this] { pFilterDialog = nullptr; }); -} - -void main_window::show_options_dialog() -{ - if (mk_window(options_widget, [&](bool flag) { set_keys_enabled(!flag); })) - { - // XXX this should logically connect to a bundle - // also doesn't work when switching profiles with options dialog open - // move shortcuts to a separate bundle and add a migration -sh 20180218 - connect(options_widget.get(), &options_dialog::closing, - this, &main_window::register_shortcuts); - } -} - -void main_window::show_mapping_window() -{ - mk_window(mapping_widget, pose); -} - -void main_window::exit(int status) -{ - // don't use std::call_once here, leads to freeze in Microsoft's CRT - // this function never needs reentrancy anyway - - // this is probably harmless, but better safe than sorry - if (exiting_already) - return; - exiting_already = true; - - qDebug() << "opentrack: exiting"; - - if (tray) - tray->hide(); - tray = nullptr; - - //close(); - QApplication::setQuitOnLastWindowClosed(true); - QApplication::exit(status); -} - -void main_window::set_profile(const QString& new_name_, bool migrate) -{ - QSignalBlocker b(ui.iconcomboProfile); - - QString new_name = new_name_; - - if (!profile_list.contains(new_name)) - { - new_name = OPENTRACK_DEFAULT_PROFILE; - if (!profile_list.contains(new_name)) - migrate = false; - } - - const bool status = new_name != ini_filename(); - - if (status) - set_profile_in_registry(new_name); - - using bundler = options::detail::bundler; - - bundler::reload_no_notify(); - - if (migrate) - // migrations are for config layout changes and other user-visible - // incompatibilities in future versions - run_migrations(); - else - mark_profile_as_not_needing_migration(); - - bundler::notify(); - - set_title(); - - if (status) - ui.iconcomboProfile->setCurrentText(new_name); -} - -void main_window::ensure_tray() -{ - if (!QSystemTrayIcon::isSystemTrayAvailable()) - { - QApplication::setQuitOnLastWindowClosed(true); - return; - } - - if (s.tray_enabled) - { - if (!tray) - { - tray = std::make_unique(this); - tray->setIcon(QIcon(":/images/opentrack.png")); - tray->setContextMenu(&tray_menu); - tray->show(); - - connect(tray.get(), - &QSystemTrayIcon::activated, - this, - &main_window::toggle_restore_from_tray); - } - - QApplication::setQuitOnLastWindowClosed(false); - } - else - { - if (!isVisible()) - { - show(); - setVisible(true); - - raise(); // for OSX - activateWindow(); // for Windows - } - - if (tray) - tray->hide(); - tray = nullptr; - - QApplication::setQuitOnLastWindowClosed(true); - } -} - -void main_window::toggle_restore_from_tray(QSystemTrayIcon::ActivationReason e) -{ - switch (e) - { - // if we enable double click also then it causes - // toggle back to the original state - //case QSystemTrayIcon::DoubleClick: - case QSystemTrayIcon::Trigger: // single click - break; - default: - return; - } - - ensure_tray(); - - const bool is_minimized = isHidden() || !tray_enabled(); - - menu_action_show.setText(!isHidden() ? tr("Show the Octopus") : tr("Hide the Octopus")); - - setVisible(is_minimized); - setHidden(!is_minimized); - - setWindowState(is_minimized ? windowState() & ~Qt::WindowMinimized : Qt::WindowNoState); - - if (is_minimized) - { - raise(); // for OSX - activateWindow(); // for Windows - } - else - { - lower(); - clearFocus(); - } -} - -bool main_window::maybe_hide_to_tray(QEvent* e) -{ - if (e->type() == QEvent::WindowStateChange && - (windowState() & Qt::WindowMinimized) && - tray_enabled()) - { - e->accept(); - ensure_tray(); - hide(); - - return true; - } - - return false; -} - -void main_window::closeEvent(QCloseEvent*) -{ - exit(); -} - -void main_window::maybe_start_profile_from_executable() -{ - if (!work) - { - QString profile; - if (det.profile_to_start(profile) && profile_list.contains(profile)) - { - set_profile(profile); - start_tracker_(); - } - } - else - { - if (det.should_stop()) - stop_tracker_(); - } -} - -void main_window::set_keys_enabled(bool flag) -{ - if (!flag) - { - if (work) - work->sc.reload({}); - global_shortcuts.reload({}); - } - else - register_shortcuts(); -} - -void main_window::changeEvent(QEvent* e) -{ - if (!maybe_hide_to_tray(e)) - e->ignore(); -} - -bool main_window::event(QEvent* event) -{ - using t = QEvent::Type; - - if (work) - { - switch (event->type()) - { - case t::Hide: - case t::WindowActivate: - case t::WindowDeactivate: - case t::WindowStateChange: - case t::FocusIn: - set_is_visible(*this, true); - break; - default: - break; - } - } - return QMainWindow::event(event); -} - -bool main_window::tray_enabled() -{ - return s.tray_enabled && QSystemTrayIcon::isSystemTrayAvailable(); -} - -bool main_window::start_in_tray() -{ - return tray_enabled() && s.tray_start; -} - -void main_window::set_profile_in_registry(const QString &profile) -{ - with_global_settings_object([&](QSettings& s) { - s.setValue(OPENTRACK_PROFILE_FILENAME_KEY, profile); - }); -} - -void main_window::restart_tracker_() -{ - qDebug() << "restart tracker"; - - stop_tracker_(); - start_tracker_(); -} - -void main_window::toggle_tracker_() -{ - qDebug() << "toggle tracker"; - - if (work) - stop_tracker_(); - else - start_tracker_(); -} - -#if !defined _WIN32 -# include -void main_window::annoy_if_root() -{ - if (geteuid() == 0) - { - struct lst { - QString caption; - QString msg; - int sleep_ms; - }; - - const lst list[] = { - { - tr("Running as root is bad"), - tr("Do not run as root. Set correct device node permissions."), - 1000, - }, - { - tr("Running as root is bad, seriously"), - tr("Do not run as root. I'll keep whining at every startup."), - 3000, - }, - { - tr("Be annoyed, comprehensively."), - tr("Don't run as root to remove these annoying messages."), - 0 - } - }; - - for (const auto& x : list) - { - QMessageBox::critical(this, x.caption, x.msg, QMessageBox::Ok); - portable::sleep(x.sleep_ms); - } - } -} -#endif diff --git a/variant/default/main-window.hpp b/variant/default/main-window.hpp deleted file mode 100644 index 9ffb7019..00000000 --- a/variant/default/main-window.hpp +++ /dev/null @@ -1,145 +0,0 @@ -/* Copyright (c) 2013-2016, Stanislaw Halik - - * Permission to use, copy, modify, and/or distribute this - * software for any purpose with or without fee is hereby granted, - * provided that the above copyright notice and this permission - * notice appear in all copies. - */ - -#pragma once - -#include "api/plugin-support.hpp" -#include "gui/mapping-dialog.hpp" -#include "gui/settings.hpp" -#include "gui/process_detector.h" -#include "logic/main-settings.hpp" -#include "logic/pipeline.hpp" -#include "logic/shortcuts.h" -#include "logic/work.hpp" -#include "logic/state.hpp" -#include "options/options.hpp" -#include "compat/qt-signal.hpp" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include "ui_main-window.h" - -class main_window final : public QMainWindow, private State -{ - Q_DECLARE_TR_FUNCTIONS(main_window) - - Ui::main_window ui; - - std::unique_ptr tray; - QMenu tray_menu { this }; - - QTimer pose_update_timer { this }; - QTimer det_timer; - QTimer profile_list_timer; - - Shortcuts global_shortcuts; - QShortcut kbd_quit { QKeySequence("Ctrl+Q"), this }; - - std::unique_ptr options_widget; - std::unique_ptr mapping_widget; - - std::unique_ptr pFilterDialog; - std::unique_ptr pProtocolDialog; - std::unique_ptr pTrackerDialog; - - process_detector_worker det; - QMenu profile_menu; - - QList profile_list; - - QAction menu_action_header { &tray_menu }, - menu_action_show { &tray_menu }, - menu_action_exit { &tray_menu }, - menu_action_tracker { &tray_menu }, - menu_action_filter { &tray_menu }, - menu_action_proto { &tray_menu }, - menu_action_options { &tray_menu }, - menu_action_mappings { &tray_menu }; - - bool exiting_already { false }; - - qt_sig::nullary start_tracker { this, &main_window::start_tracker_, Qt::QueuedConnection }; - qt_sig::nullary stop_tracker { this, &main_window::stop_tracker_, Qt::QueuedConnection }; - qt_sig::nullary toggle_tracker { this, &main_window::toggle_tracker_, Qt::QueuedConnection }; - qt_sig::nullary restart_tracker { this, &main_window::restart_tracker_, Qt::QueuedConnection }; - - void init_dylibs(); - void init_tray_menu(); - void init_profiles(); - void init_buttons(); - - void init_shortcuts(); - void register_shortcuts(); - void set_keys_enabled(bool flag); - - void update_button_state(bool running, bool inertialp); - -#if !defined _WIN32 - void annoy_if_root(); -#endif - - void changeEvent(QEvent* e) override; - bool maybe_hide_to_tray(QEvent* e); - void closeEvent(QCloseEvent *event) override; - bool event(QEvent *event) override; - - void show_tracker_settings(); - void show_proto_settings(); - void show_filter_settings(); - - void show_options_dialog(); - void show_mapping_window(); - - void show_pose(); - void show_pose_(const double* mapped, const double* raw); - void set_title(const QString& game_title = QString()); - - void start_tracker_(); - void stop_tracker_(); - void restart_tracker_(); - void toggle_tracker_(); - - void set_profile(const QString& new_name, bool migrate = true); - void set_profile_in_registry(const QString& profile); - void refresh_profile_list(); - void die_on_profile_not_writable(); - void maybe_start_profile_from_executable(); - [[nodiscard]] static bool profile_name_from_dialog(QString& ret); - - void create_empty_profile(); - void create_copied_profile(); - void open_profile_directory(); - - void ensure_tray(); - void toggle_restore_from_tray(QSystemTrayIcon::ActivationReason e); - bool tray_enabled(); - bool start_in_tray(); - - void save_modules(); - - void exit(int status = EXIT_SUCCESS); - -public: - main_window(); - ~main_window() override; -}; diff --git a/variant/default/main-window.ui b/variant/default/main-window.ui deleted file mode 100644 index 7aab90e8..00000000 --- a/variant/default/main-window.ui +++ /dev/null @@ -1,1459 +0,0 @@ - - - Lovecraftian Octopus - main_window - - - - 0 - 0 - 646 - 517 - - - - - :/images/opentrack.png:/images/opentrack.png - - - #video_feed { border: 0; } - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - 0 - - - 6 - - - 6 - - - - - QFrame::NoFrame - - - QFrame::Raised - - - 0 - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 4 - - - - - - 0 - 0 - - - - - 320 - 240 - - - - - 320 - 240 - - - - 0 - - - - - 0 - 0 - 320 - 240 - - - - - 0 - 0 - - - - - 320 - 240 - - - - - 320 - 240 - - - - - - 0 - 0 - 320 - 240 - - - - - 0 - 0 - - - - - 320 - 240 - - - - - 320 - 240 - - - - - Candara - 37 - 50 - false - true - - - - - - - :/images/tracking-not-started.png - - - false - - - Qt::AlignCenter - - - true - - - - - - - - - - 0 - 0 - - - - - 320 - 240 - - - - - 320 - 240 - - - - - - - - - - - - 0 - 0 - - - - QFrame::NoFrame - - - 0 - - - - 6 - - - 5 - - - 0 - - - 0 - - - 6 - - - - - - 0 - 0 - - - - Raw tracker data - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - true - - - - 0 - 0 - - - - - NoAntialias - false - - - - QFrame::NoFrame - - - QFrame::Plain - - - 1 - - - true - - - 4 - - - QLCDNumber::Outline - - - - - - - true - - - - 0 - 0 - - - - false - - - QFrame::Raised - - - Z - - - - - - - - 0 - 0 - - - - QFrame::Raised - - - Pitch - - - - - - - true - - - - 0 - 0 - - - - - NoAntialias - false - - - - QFrame::NoFrame - - - QFrame::Plain - - - 1 - - - true - - - 4 - - - QLCDNumber::Outline - - - - - - - true - - - - 0 - 0 - - - - false - - - QFrame::Raised - - - Y - - - - - - - - 0 - 0 - - - - QFrame::Raised - - - X - - - - - - - true - - - - 0 - 0 - - - - - NoAntialias - false - - - - QFrame::NoFrame - - - QFrame::Plain - - - 1 - - - true - - - 4 - - - QLCDNumber::Outline - - - - - - - - 0 - 0 - - - - QFrame::Raised - - - Roll - - - - - - - - 0 - 0 - - - - QFrame::Raised - - - Yaw - - - - - - - true - - - - 0 - 0 - - - - - NoAntialias - false - - - - QFrame::NoFrame - - - QFrame::Plain - - - 1 - - - true - - - 4 - - - QLCDNumber::Outline - - - - - - - true - - - - 0 - 0 - - - - - NoAntialias - false - - - - QFrame::NoFrame - - - QFrame::Plain - - - 1 - - - true - - - 4 - - - QLCDNumber::Outline - - - - - - - true - - - - 0 - 0 - - - - - NoAntialias - false - - - - QFrame::NoFrame - - - QFrame::Plain - - - 1 - - - true - - - 4 - - - QLCDNumber::Outline - - - - - - - - - - - 0 - 0 - - - - Game data - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - true - - - - 0 - 0 - - - - - NoAntialias - false - - - - QFrame::NoFrame - - - true - - - 4 - - - QLCDNumber::Flat - - - - - - - true - - - - 0 - 0 - - - - - NoAntialias - false - - - - QFrame::NoFrame - - - true - - - 4 - - - QLCDNumber::Flat - - - - - - - true - - - - 0 - 0 - - - - - NoAntialias - false - - - - QFrame::NoFrame - - - true - - - 4 - - - QLCDNumber::Flat - - - - - - - - 0 - 0 - - - - QFrame::Raised - - - X - - - - - - - true - - - - 0 - 0 - - - - false - - - QFrame::Raised - - - Y - - - - - - - true - - - - 0 - 0 - - - - - NoAntialias - false - - - - QFrame::NoFrame - - - true - - - 4 - - - QLCDNumber::Flat - - - - - - - - 0 - 0 - - - - QFrame::Raised - - - Pitch - - - - - - - - 0 - 0 - - - - QFrame::Raised - - - Roll - - - - - - - - 0 - 0 - - - - QFrame::Raised - - - Yaw - - - - - - - true - - - - 0 - 0 - - - - false - - - QFrame::Raised - - - Z - - - - - - - true - - - - 0 - 0 - - - - - NoAntialias - false - - - - QFrame::NoFrame - - - true - - - 4 - - - QLCDNumber::Flat - - - - - - - true - - - - 0 - 0 - - - - - NoAntialias - false - - - - QFrame::NoFrame - - - true - - - 4 - - - QLCDNumber::Flat - - - - - - - - - - - - - - 0 - 0 - - - - - 6 - - - 0 - - - 0 - - - 0 - - - 6 - - - - - - 4 - 0 - - - - 0 - - - - 3 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - true - - - - 0 - 0 - - - - Qt::StrongFocus - - - Profile - - - QToolButton::InstantPopup - - - Qt::ToolButtonTextBesideIcon - - - true - - - Qt::DownArrow - - - - - - - - 0 - 0 - - - - Qt::StrongFocus - - - 20 - - - - - - - - - - - 0 - 0 - - - - Options - - - - :/images/tools.png:/images/tools.png - - - - 80 - 24 - - - - - - - - - 0 - 0 - - - - Mapping - - - - :/images/curves.png:/images/curves.png - - - - 80 - 24 - - - - - - - - - 3 - 0 - - - - Tracking - - - true - - - - 8 - - - 0 - - - 6 - - - 0 - - - 6 - - - - - - 0 - 0 - - - - - 75 - true - - - - Start - - - - - - - false - - - - 0 - 0 - - - - - 75 - true - - - - Stop - - - - - - - - - - - - - - 4 - 0 - - - - QFrame::NoFrame - - - QFrame::Raised - - - - 2 - - - 3 - - - 2 - - - 3 - - - 8 - - - - - Input - - - - 4 - - - 0 - - - 0 - - - 0 - - - 3 - - - 0 - - - - - - 0 - 0 - - - - Qt::TabFocus - - - - - - - true - - - - 0 - 0 - - - - - DejaVu Sans - PreferAntialias - false - - - - Qt::ClickFocus - - - 🔨 - - - false - - - - - - - - - - Output - - - - 4 - - - 0 - - - 0 - - - 0 - - - 3 - - - 0 - - - - - - 0 - 0 - - - - Qt::TabFocus - - - - - - - true - - - - 0 - 0 - - - - - DejaVu Sans - PreferAntialias - false - - - - Qt::ClickFocus - - - 🔨 - - - false - - - - - - - - - - Filter - - - - 4 - - - 0 - - - 0 - - - 0 - - - 3 - - - 0 - - - - - - 0 - 0 - - - - Qt::TabFocus - - - - - - - true - - - - 0 - 0 - - - - - DejaVu Sans - PreferAntialias - false - - - - Qt::ClickFocus - - - 🔨 - - - false - - - - - - - - - - - - - - - - - - - - - pose_widget - QWidget -
pose-widget/pose-widget.hpp
- - - - btnStartTracker - btnStopTracker - profile_button - iconcomboProfile - btnShortcuts - btnEditCurves - - - - - - diff --git a/variant/default/main.cpp b/variant/default/main.cpp deleted file mode 100644 index 2c1dc607..00000000 --- a/variant/default/main.cpp +++ /dev/null @@ -1,23 +0,0 @@ -#include "gui/init.hpp" -#include "main-window.hpp" - -#if defined _WIN32 -# include -#endif - -#ifdef __clang__ -# pragma GCC diagnostic ignored "-Wmain" -#endif - -int main(int argc, char** argv) -{ - return run_application(argc, argv, [] { return std::make_unique(); }); -} - -#if defined _MSC_VER - -int CALLBACK WinMain(HINSTANCE, HINSTANCE, LPSTR, int /* nCmdShow */) -{ - return main(__argc, __argv); -} -#endif diff --git a/variant/default/new_config.ui b/variant/default/new_config.ui deleted file mode 100644 index a262e725..00000000 --- a/variant/default/new_config.ui +++ /dev/null @@ -1,45 +0,0 @@ - - - UI_new_config - - - Qt::ApplicationModal - - - - 0 - 0 - 269 - 67 - - - - Config filename - - - - images/opentrack.pngimages/opentrack.png - - - - - - New file name: - - - - - - - - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - diff --git a/variant/default/new_file_dialog.cpp b/variant/default/new_file_dialog.cpp deleted file mode 100644 index 70816c5d..00000000 --- a/variant/default/new_file_dialog.cpp +++ /dev/null @@ -1,37 +0,0 @@ -#include "new_file_dialog.h" - -new_file_dialog::new_file_dialog(QWidget* parent) : QDialog(parent) -{ - ui.setupUi(this); - connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(ok_clicked())); - connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(cancel_clicked())); - setFixedSize(size()); -} - -bool new_file_dialog::is_ok(QString& name_) -{ - name_ = name; - return ok; -} - -void new_file_dialog::cancel_clicked() { close(); } - -void new_file_dialog::ok_clicked() -{ - QString text = ui.lineEdit->text(); - text = text.replace('/', ""); - text = text.replace('\\', ""); - if (text != "" && !text.endsWith(".ini")) - text += ".ini"; - if (text == "" || text == ".ini" || QFile(options::globals::ini_directory() + "/" + text).exists()) - { - QMessageBox::warning(this, - tr("File exists"), - tr("This file already exists. Pick another name."), - QMessageBox::Ok, QMessageBox::NoButton); - return; - } - ok = true; - close(); - name = text; -} diff --git a/variant/default/new_file_dialog.h b/variant/default/new_file_dialog.h deleted file mode 100644 index 7244e524..00000000 --- a/variant/default/new_file_dialog.h +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once - -#include "ui_new_config.h" -#include "options/options.hpp" -#include -#include -#include -#include - -class new_file_dialog : public QDialog -{ - Q_OBJECT -public: - new_file_dialog(QWidget* parent = nullptr); - bool is_ok(QString& name_); - -private: - Ui::UI_new_config ui; - bool ok = false; - QString name; - -private slots: - void cancel_clicked(); - void ok_clicked(); -}; diff --git a/variant/default/opentrack.ico b/variant/default/opentrack.ico deleted file mode 100644 index 5cac8da1..00000000 Binary files a/variant/default/opentrack.ico and /dev/null differ diff --git a/variant/default/resources.rc b/variant/default/resources.rc deleted file mode 100644 index 6fd0253b..00000000 --- a/variant/default/resources.rc +++ /dev/null @@ -1,2 +0,0 @@ -#include -IDI_ICON1 ICON "opentrack.ico" -- cgit v1.2.3