comment out bunch of qt things
This commit is contained in:
@@ -1,14 +1,8 @@
|
||||
#pragma once
|
||||
#include <JSONUtils.hpp>
|
||||
#include <QLabel>
|
||||
#include <QPushButton>
|
||||
#include <QWidget>
|
||||
#include <QKeyEvent>
|
||||
#include <QVBoxLayout>
|
||||
#include <QComboBox>
|
||||
#include <QTimer>
|
||||
#include <unordered_map>
|
||||
|
||||
class InputSettings final : public QWidget {
|
||||
class InputSettings final {
|
||||
bool grabbing = false;
|
||||
int whichGrabbing = -1;
|
||||
|
||||
@@ -17,29 +11,26 @@ class InputSettings final : public QWidget {
|
||||
|
||||
std::unordered_map<u32, std::string> gamepadIndexes{};
|
||||
|
||||
std::unique_ptr<QHBoxLayout> AB = std::make_unique<QHBoxLayout>();
|
||||
std::unique_ptr<QHBoxLayout> ZStart = std::make_unique<QHBoxLayout>();
|
||||
std::unique_ptr<QHBoxLayout> LR = std::make_unique<QHBoxLayout>();
|
||||
std::unique_ptr<QHBoxLayout> DupDdown = std::make_unique<QHBoxLayout>();
|
||||
std::unique_ptr<QHBoxLayout> DleftDright = std::make_unique<QHBoxLayout>();
|
||||
std::unique_ptr<QHBoxLayout> CupCdown = std::make_unique<QHBoxLayout>();
|
||||
std::unique_ptr<QHBoxLayout> CleftCright = std::make_unique<QHBoxLayout>();
|
||||
std::unique_ptr<QHBoxLayout> AupAdown = std::make_unique<QHBoxLayout>();
|
||||
std::unique_ptr<QHBoxLayout> AleftAright = std::make_unique<QHBoxLayout>();
|
||||
std::unique_ptr<QVBoxLayout> mainLayout = std::make_unique<QVBoxLayout>();
|
||||
std::array<std::unique_ptr<QPushButton>, 18> kbButtons;
|
||||
std::array<std::unique_ptr<QLabel>, 18> buttonLabels;
|
||||
std::unique_ptr<QHBoxLayout> deviceComboBoxLayout = std::make_unique<QHBoxLayout>();
|
||||
QTimer refresh, pollGamepad;
|
||||
std::unique_ptr<QLabel> devicesLabel = std::make_unique<QLabel>("Device:");
|
||||
std::unique_ptr<QComboBox> devices = std::make_unique<QComboBox>();
|
||||
Q_OBJECT
|
||||
//std::unique_ptr<QHBoxLayout> AB = std::make_unique<QHBoxLayout>();
|
||||
//std::unique_ptr<QHBoxLayout> ZStart = std::make_unique<QHBoxLayout>();
|
||||
//std::unique_ptr<QHBoxLayout> LR = std::make_unique<QHBoxLayout>();
|
||||
//std::unique_ptr<QHBoxLayout> DupDdown = std::make_unique<QHBoxLayout>();
|
||||
//std::unique_ptr<QHBoxLayout> DleftDright = std::make_unique<QHBoxLayout>();
|
||||
//std::unique_ptr<QHBoxLayout> CupCdown = std::make_unique<QHBoxLayout>();
|
||||
//std::unique_ptr<QHBoxLayout> CleftCright = std::make_unique<QHBoxLayout>();
|
||||
//std::unique_ptr<QHBoxLayout> AupAdown = std::make_unique<QHBoxLayout>();
|
||||
//std::unique_ptr<QHBoxLayout> AleftAright = std::make_unique<QHBoxLayout>();
|
||||
//std::unique_ptr<QVBoxLayout> mainLayout = std::make_unique<QVBoxLayout>();
|
||||
//std::array<std::unique_ptr<QPushButton>, 18> kbButtons;
|
||||
//std::array<std::unique_ptr<QLabel>, 18> buttonLabels;
|
||||
//std::unique_ptr<QHBoxLayout> deviceComboBoxLayout = std::make_unique<QHBoxLayout>();
|
||||
//QTimer refresh, pollGamepad;
|
||||
//std::unique_ptr<QLabel> devicesLabel = std::make_unique<QLabel>("Device:");
|
||||
//std::unique_ptr<QComboBox> devices = std::make_unique<QComboBox>();
|
||||
//Q_OBJECT
|
||||
public:
|
||||
bool selectedDeviceIsNotKeyboard = false;
|
||||
explicit InputSettings(nlohmann::json &);
|
||||
nlohmann::json &settings;
|
||||
void keyPressEvent(QKeyEvent *) override;
|
||||
std::array<Qt::Key, 18> GetMappedKeys() const;
|
||||
Q_SIGNALS:
|
||||
void modified();
|
||||
//std::array<Qt::Key, 18> GetMappedKeys() const;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user