OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-25 14:50:15 +00:00
Code Issues Projects Releases Wiki Activity

Input-GUI: Fix most PR issues

Browse Source
This commit is contained in:
Steven Cherry 2016-06-11 23:14:57 -05:00 committed by Anon
parent 523ca1841f
commit 3740f03ef9
5 changed files with 1469 additions and 1443 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/citra_qt/config.cpp
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <QSettings>
#include "citra_qt/config.h" #include "citra_qt/config.h"
#include "citra_qt/ui_settings.h" #include "citra_qt/ui_settings.h"

5
src/citra_qt/config.h
View File

@ -4,11 +4,8 @@
#pragma once #pragma once
#include <string>
#include "core/settings.h" #include "core/settings.h"
#include <QSettings> #include <QVariant>
#include <QString>
#include <QStringList>
class QSettings; class QSettings;

73
src/citra_qt/configure_input.cpp
View File

@ -37,10 +37,10 @@ ConfigureInput::ConfigureInput(QWidget *parent) :
}; };
// Attach handle click method to each button click. // Attach handle click method to each button click.
for (auto &ent1 : input_mapping) { for (const auto& entry : input_mapping) {
connect(ent1.second, &QPushButton::released, this, &ConfigureInput::HandleClick); connect(entry.second, SIGNAL(released()), this, SLOT(handleClick()));
} }
connect(ui->btnRestoreDefaults, &QPushButton::released, this, &ConfigureInput::RestoreDefaults); connect(ui->btnRestoreDefaults, SIGNAL(released()), this, SLOT(restoreDefaults()));
setFocusPolicy(Qt::ClickFocus); setFocusPolicy(Qt::ClickFocus);
this->setConfiguration(); this->setConfiguration();
} }
@ -50,21 +50,21 @@ ConfigureInput::~ConfigureInput()
} }
/// Event handler for all button released() event. /// Event handler for all button released() event.
void ConfigureInput::HandleClick() void ConfigureInput::handleClick()
{ {
QPushButton* sender = qobject_cast<QPushButton*>(QObject::sender()); QPushButton* sender = qobject_cast<QPushButton*>(QObject::sender());
sender->setText("[waiting]"); sender->setText(tr("[waiting]"));
sender->setFocus(); sender->setFocus();
grabKeyboard(); grabKeyboard();
grabMouse(); grabMouse();
changingButton = sender; changing_button = sender;
} }
/// Save all button configurations to settings file /// Save all button configurations to settings file
void ConfigureInput::applyConfiguration() void ConfigureInput::applyConfiguration()
{ {
for (int i = 0; i < Settings::NativeInput::NUM_INPUTS - 1; ++i) { for (int i = 0; i < Settings::NativeInput::NUM_INPUTS - 1; ++i) {
int value = GetKeyValue(input_mapping[Settings::NativeInput::Values(i)]->text()); int value = getKeyValue(input_mapping[Settings::NativeInput::Values(i)]->text());
Settings::values.input_mappings[Settings::NativeInput::All[i]] = value; Settings::values.input_mappings[Settings::NativeInput::All[i]] = value;
} }
Settings::Apply(); Settings::Apply();
@ -74,7 +74,7 @@ void ConfigureInput::applyConfiguration()
void ConfigureInput::setConfiguration() void ConfigureInput::setConfiguration()
{ {
for (int i = 0; i < Settings::NativeInput::NUM_INPUTS - 1; ++i) { for (int i = 0; i < Settings::NativeInput::NUM_INPUTS - 1; ++i) {
QString keyValue = GetKeyName(Settings::values.input_mappings[i]); QString keyValue = getKeyName(Settings::values.input_mappings[i]);
input_mapping[Settings::NativeInput::Values(i)]->setText(keyValue); input_mapping[Settings::NativeInput::Values(i)]->setText(keyValue);
} }
} }
@ -82,9 +82,9 @@ void ConfigureInput::setConfiguration()
/// Handle key press event for input tab when a button is 'waiting'. /// Handle key press event for input tab when a button is 'waiting'.
void ConfigureInput::keyPressEvent(QKeyEvent* event) void ConfigureInput::keyPressEvent(QKeyEvent* event)
{ {
if (changingButton != nullptr && event->key() > 0) if (changing_button != nullptr && event->key() != Qt::Key_unknown)
{ {
keysPressed.push_back(event->key()); keys_pressed.push_back(event->key());
// Can't save Modifier + Keys yet as input. Will re-enable after settings refactor // Can't save Modifier + Keys yet as input. Will re-enable after settings refactor
/*if (event->key() == Qt::Key_Shift) /*if (event->key() == Qt::Key_Shift)
@ -99,68 +99,68 @@ void ConfigureInput::keyPressEvent(QKeyEvent *event)
else if (event->key() == Qt::Key_Meta) else if (event->key() == Qt::Key_Meta)
return; return;
else*/ else*/
SetKey(); setKey();
} }
} }
/// Set button text to name of key pressed. /// Set button text to name of key pressed.
void ConfigureInput::SetKey() void ConfigureInput::setKey()
{ {
QString keyValue = ""; QString key_value = "";
for (int i : keysPressed) // Will only contain one key until settings refactor for (int i : keys_pressed) // Will only contain one key until settings refactor
{ {
keyValue += GetKeyName(i); key_value += getKeyName(i);
} }
// RemoveDuplicates(keyValue); // RemoveDuplicates(keyValue);
changingButton->setText(keyValue); changing_button->setText(key_value);
keysPressed.clear(); keys_pressed.clear();
releaseKeyboard(); releaseKeyboard();
releaseMouse(); releaseMouse();
changingButton = nullptr; changing_button = nullptr;
} }
/// Convert key ASCII value to its' letter/name /// Convert key ASCII value to its' letter/name
QString ConfigureInput::GetKeyName(int key_code) QString ConfigureInput::getKeyName(int key_code) const
{ {
if (key_code == Qt::Key_Shift) if (key_code == Qt::Key_Shift)
return tr("Shift"); return tr("Shift");
else if (key_code == Qt::Key_Control) if (key_code == Qt::Key_Control)
return tr("Ctrl"); return tr("Ctrl");
else if (key_code == Qt::Key_Alt) if (key_code == Qt::Key_Alt)
return tr("Alt"); return tr("Alt");
else if (key_code == Qt::Key_Meta) if (key_code == Qt::Key_Meta)
return ""; return "";
else if (key_code == -1) if (key_code == -1)
return ""; return "";
return QKeySequence(key_code).toString(); return QKeySequence(key_code).toString();
} }
/// Convert letter/name of key to its ASCII value. /// Convert letter/name of key to its ASCII value.
int ConfigureInput::GetKeyValue(QString text) Qt::Key ConfigureInput::getKeyValue(const QString& text) const
{ {
if (text == "Shift") if (text == "Shift")
return Qt::Key_Shift; return Qt::Key_Shift;
else if (text == "Ctrl") if (text == "Ctrl")
return Qt::Key_Control; return Qt::Key_Control;
else if (text == "Alt") if (text == "Alt")
return Qt::Key_Alt; return Qt::Key_Alt;
else if (text == "Meta") if (text == "Meta")
return -1; return Qt::Key_unknown;
else if (text == "") if (text == "")
return -1; return Qt::Key_unknown;
return QKeySequence(text)[0]; return Qt::Key(QKeySequence(text)[0]);
} }
/// Check all inputs for duplicate keys. Clears out any other button with same key as new button. /// Check all inputs for duplicate keys. Clears out any other button with same key as new button.
void ConfigureInput::RemoveDuplicates(QString newValue) void ConfigureInput::removeDuplicates(const QString& newValue)
{ {
for (int i = 0; i < Settings::NativeInput::NUM_INPUTS - 1; ++i) { for (int i = 0; i < Settings::NativeInput::NUM_INPUTS - 1; ++i) {
if (changingButton != input_mapping[Settings::NativeInput::Values(i)]) { if (changing_button != input_mapping[Settings::NativeInput::Values(i)]) {
QString oldValue = input_mapping[Settings::NativeInput::Values(i)]->text(); QString oldValue = input_mapping[Settings::NativeInput::Values(i)]->text();
if (newValue == oldValue) if (newValue == oldValue)
input_mapping[Settings::NativeInput::Values(i)]->setText(""); input_mapping[Settings::NativeInput::Values(i)]->setText("");
@ -169,10 +169,9 @@ void ConfigureInput::RemoveDuplicates(QString newValue)
} }
/// Restore all buttons to their default values. /// Restore all buttons to their default values.
void ConfigureInput::RestoreDefaults() { void ConfigureInput::restoreDefaults() {
for (int i = 0; i < Settings::NativeInput::NUM_INPUTS - 1; ++i) for (int i = 0; i < Settings::NativeInput::NUM_INPUTS - 1; ++i) {
{ QString keyValue = getKeyName(defaults[i].toInt());
QString keyValue = GetKeyName(defaults[i].toInt());
input_mapping[Settings::NativeInput::Values(i)]->setText(keyValue); input_mapping[Settings::NativeInput::Values(i)]->setText(keyValue);
} }
} }

33
src/citra_qt/configure_input.h
View File

@ -1,20 +1,20 @@
// Copyright 2016 Citra Emulator Project // Copyright 2016 Citra Emulator Project
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#pragma once #pragma once
#include <memory> #include <memory>
#include <QKeyEvent> #include <QKeyEvent>
#include <QObject>
#include <QPushButton>
#include <QSettings>
#include <QString>
#include <QWidget>
#include "citra_qt/config.h" #include "citra_qt/config.h"
#include "core/settings.h" #include "core/settings.h"
#include "ui_configure_input.h" #include "ui_configure_input.h"
class QObject;
class QPushButton;
class QString;
class QWidget;
namespace Ui { namespace Ui {
class ConfigureInput; class ConfigureInput;
} }
@ -24,22 +24,23 @@ class ConfigureInput : public QWidget
Q_OBJECT Q_OBJECT
public: public:
explicit ConfigureInput(QWidget *parent = 0); explicit ConfigureInput(QWidget* parent = nullptr);
~ConfigureInput(); ~ConfigureInput();
void applyConfiguration(); void applyConfiguration();
public Q_SLOTS:
void handleClick();
void restoreDefaults();
private: private:
std::unique_ptr<Ui::ConfigureInput> ui; std::unique_ptr<Ui::ConfigureInput> ui;
std::map<Settings::NativeInput::Values, QPushButton*> input_mapping; std::map<Settings::NativeInput::Values, QPushButton*> input_mapping;
std::vector<int> keysPressed; std::vector<int> keys_pressed;
QPushButton* changingButton = nullptr; /// button currently waiting for key press. QPushButton* changing_button = nullptr; /// button currently waiting for key press.
void HandleClick();
void setConfiguration(); void setConfiguration();
void SetKey(); void setKey();
void RemoveDuplicates(QString newValue); void removeDuplicates(const QString& newValue);
void RestoreDefaults(); void keyPressEvent(QKeyEvent* event) override;
virtual void keyPressEvent(QKeyEvent *event); QString getKeyName(int key_code) const;
QString GetKeyName(int key_code); Qt::Key ConfigureInput::getKeyValue(const QString& text) const;
int GetKeyValue(QString text);
}; };

805
src/citra_qt/configure_input.ui
View File

@ -7,21 +7,20 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>390</width> <width>390</width>
<height>457</height> <height>445</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>ConfigureInput</string> <string>ConfigureInput</string>
</property> </property>
<widget class="QGroupBox" name="faceButtons"> <layout class="QVBoxLayout" name="vertical">
<property name="geometry"> <item>
<rect> <layout class="QHBoxLayout" name="horizontalLayout1">
<x>10</x> <property name="spacing">
<y>0</y> <number>2</number>
<width>181</width>
<height>130</height>
</rect>
</property> </property>
<item>
<widget class="QGroupBox" name="faceButtons">
<property name="title"> <property name="title">
<string>Face Buttons</string> <string>Face Buttons</string>
</property> </property>
@ -176,15 +175,9 @@
</widget> </widget>
</widget> </widget>
</widget> </widget>
</item>
<item>
<widget class="QGroupBox" name="faceButtons_2"> <widget class="QGroupBox" name="faceButtons_2">
<property name="geometry">
<rect>
<x>200</x>
<y>0</y>
<width>181</width>
<height>130</height>
</rect>
</property>
<property name="title"> <property name="title">
<string>Directional Pad</string> <string>Directional Pad</string>
</property> </property>
@ -194,7 +187,7 @@
<property name="checkable"> <property name="checkable">
<bool>false</bool> <bool>false</bool>
</property> </property>
<widget class="QWidget" name="widget_5" native="true"> <widget class="QWidget" name="widget_13" native="true">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>10</x>
@ -203,7 +196,7 @@
<height>50</height> <height>50</height>
</rect> </rect>
</property> </property>
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_13">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
@ -230,337 +223,11 @@
</property> </property>
</widget> </widget>
</widget> </widget>
<widget class="QWidget" name="widget_8" native="true">
<property name="geometry">
<rect>
<x>10</x>
<y>20</y>
<width>71</width>
<height>50</height>
</rect>
</property>
<widget class="QLabel" name="label_8">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>51</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Left:</string>
</property>
</widget>
<widget class="QPushButton" name="btnDirLeft">
<property name="geometry">
<rect>
<x>0</x>
<y>20</y>
<width>71</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string />
</property>
</widget>
</widget>
<widget class="QWidget" name="widget_7" native="true">
<property name="geometry">
<rect>
<x>100</x>
<y>20</y>
<width>71</width>
<height>50</height>
</rect>
</property>
<widget class="QLabel" name="label_7">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>51</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Right:</string>
</property>
</widget>
<widget class="QPushButton" name="btnDirRight">
<property name="geometry">
<rect>
<x>0</x>
<y>20</y>
<width>71</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string />
</property>
</widget>
</widget>
<widget class="QWidget" name="widget_6" native="true">
<property name="geometry">
<rect>
<x>100</x>
<y>70</y>
<width>71</width>
<height>50</height>
</rect>
</property>
<widget class="QLabel" name="label_6">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>51</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Down:</string>
</property>
</widget>
<widget class="QPushButton" name="btnDirDown">
<property name="geometry">
<rect>
<x>0</x>
<y>20</y>
<width>71</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string />
</property>
</widget>
</widget>
</widget>
<widget class="QGroupBox" name="faceButtons_3">
<property name="geometry">
<rect>
<x>10</x>
<y>140</y>
<width>181</width>
<height>130</height>
</rect>
</property>
<property name="title">
<string>Shoulder Buttons</string>
</property>
<property name="flat">
<bool>false</bool>
</property>
<property name="checkable">
<bool>false</bool>
</property>
<widget class="QWidget" name="widget_9" native="true">
<property name="geometry">
<rect>
<x>10</x>
<y>20</y>
<width>71</width>
<height>50</height>
</rect>
</property>
<widget class="QLabel" name="label_9">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>51</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>L:</string>
</property>
</widget>
<widget class="QPushButton" name="btnShdrL">
<property name="geometry">
<rect>
<x>0</x>
<y>20</y>
<width>71</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string />
</property>
</widget>
</widget>
<widget class="QWidget" name="widget_10" native="true">
<property name="geometry">
<rect>
<x>100</x>
<y>70</y>
<width>71</width>
<height>50</height>
</rect>
</property>
<widget class="QLabel" name="label_10">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>51</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>ZR:</string>
</property>
</widget>
<widget class="QPushButton" name="btnShdrZR">
<property name="geometry">
<rect>
<x>0</x>
<y>20</y>
<width>71</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string />
</property>
</widget>
</widget>
<widget class="QWidget" name="widget_11" native="true">
<property name="geometry">
<rect>
<x>100</x>
<y>20</y>
<width>71</width>
<height>50</height>
</rect>
</property>
<widget class="QLabel" name="label_11">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>51</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>R:</string>
</property>
</widget>
<widget class="QPushButton" name="btnShdrR">
<property name="geometry">
<rect>
<x>0</x>
<y>20</y>
<width>71</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string />
</property>
</widget>
</widget>
<widget class="QWidget" name="widget_12" native="true">
<property name="geometry">
<rect>
<x>10</x>
<y>70</y>
<width>71</width>
<height>50</height>
</rect>
</property>
<widget class="QLabel" name="label_12">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>51</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>ZL:</string>
</property>
</widget>
<widget class="QPushButton" name="btnShdrZL">
<property name="geometry">
<rect>
<x>0</x>
<y>20</y>
<width>71</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string />
</property>
</widget>
</widget>
</widget>
<widget class="QGroupBox" name="faceButtons_4">
<property name="geometry">
<rect>
<x>200</x>
<y>140</y>
<width>181</width>
<height>130</height>
</rect>
</property>
<property name="title">
<string>Circle Pad</string>
</property>
<property name="flat">
<bool>false</bool>
</property>
<property name="checkable">
<bool>false</bool>
</property>
<widget class="QWidget" name="widget_13" native="true">
<property name="geometry">
<rect>
<x>10</x>
<y>20</y>
<width>71</width>
<height>50</height>
</rect>
</property>
<widget class="QLabel" name="label_13">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>51</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Left:</string>
</property>
</widget>
<widget class="QPushButton" name="btnCircleLeft">
<property name="geometry">
<rect>
<x>0</x>
<y>20</y>
<width>71</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string />
</property>
</widget>
</widget>
<widget class="QWidget" name="widget_14" native="true"> <widget class="QWidget" name="widget_14" native="true">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>100</x> <x>10</x>
<y>70</y> <y>20</y>
<width>71</width> <width>71</width>
<height>50</height> <height>50</height>
</rect> </rect>
@ -575,10 +242,10 @@
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string>Down:</string> <string>Left:</string>
</property> </property>
</widget> </widget>
<widget class="QPushButton" name="btnCircleDown"> <widget class="QPushButton" name="btnDirLeft">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
@ -614,7 +281,7 @@
<string>Right:</string> <string>Right:</string>
</property> </property>
</widget> </widget>
<widget class="QPushButton" name="btnCircleRight"> <widget class="QPushButton" name="btnDirRight">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
@ -631,7 +298,7 @@
<widget class="QWidget" name="widget_16" native="true"> <widget class="QWidget" name="widget_16" native="true">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>100</x>
<y>70</y> <y>70</y>
<width>71</width> <width>71</width>
<height>50</height> <height>50</height>
@ -647,10 +314,10 @@
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string>Up:</string> <string>Down:</string>
</property> </property>
</widget> </widget>
<widget class="QPushButton" name="btnCircleUp"> <widget class="QPushButton" name="btnDirDown">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
@ -665,17 +332,18 @@
</widget> </widget>
</widget> </widget>
</widget> </widget>
<widget class="QGroupBox" name="faceButtons_5"> </item>
<property name="geometry"> </layout>
<rect> </item>
<x>10</x> <item>
<y>280</y> <layout class="QHBoxLayout" name="horizontalLayout2">
<width>181</width> <property name="spacing">
<height>130</height> <number>2</number>
</rect>
</property> </property>
<item>
<widget class="QGroupBox" name="faceButtons_3">
<property name="title"> <property name="title">
<string>C-Stick</string> <string>Shoulder Buttons</string>
</property> </property>
<property name="flat"> <property name="flat">
<bool>false</bool> <bool>false</bool>
@ -702,10 +370,10 @@
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string>Left:</string> <string>L:</string>
</property> </property>
</widget> </widget>
<widget class="QPushButton" name="btnStickLeft"> <widget class="QPushButton" name="btnShdrL">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
@ -738,10 +406,10 @@
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string>Down:</string> <string>ZR:</string>
</property> </property>
</widget> </widget>
<widget class="QPushButton" name="btnStickDown"> <widget class="QPushButton" name="btnShdrZR">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
@ -774,10 +442,10 @@
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string>Right:</string> <string>R:</string>
</property> </property>
</widget> </widget>
<widget class="QPushButton" name="btnStickRight"> <widget class="QPushButton" name="btnShdrR">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
@ -810,10 +478,10 @@
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string>Up:</string> <string>ZL:</string>
</property> </property>
</widget> </widget>
<widget class="QPushButton" name="btnStickUp"> <widget class="QPushButton" name="btnShdrZL">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
@ -828,17 +496,11 @@
</widget> </widget>
</widget> </widget>
</widget> </widget>
<widget class="QGroupBox" name="faceButtons_6"> </item>
<property name="geometry"> <item>
<rect> <widget class="QGroupBox" name="faceButtons_4">
<x>200</x>
<y>280</y>
<width>181</width>
<height>130</height>
</rect>
</property>
<property name="title"> <property name="title">
<string>System Buttons</string> <string>Circle Pad</string>
</property> </property>
<property name="flat"> <property name="flat">
<bool>false</bool> <bool>false</bool>
@ -865,10 +527,46 @@
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string>Start:</string> <string>Left:</string>
</property> </property>
</widget> </widget>
<widget class="QPushButton" name="btnStart"> <widget class="QPushButton" name="btnCircleLeft">
<property name="geometry">
<rect>
<x>0</x>
<y>20</y>
<width>71</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string/>
</property>
</widget>
</widget>
<widget class="QWidget" name="widget_22" native="true">
<property name="geometry">
<rect>
<x>100</x>
<y>70</y>
<width>71</width>
<height>50</height>
</rect>
</property>
<widget class="QLabel" name="label_22">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>51</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Down:</string>
</property>
</widget>
<widget class="QPushButton" name="btnCircleDown">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
@ -901,10 +599,10 @@
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string>Select:</string> <string>Right:</string>
</property> </property>
</widget> </widget>
<widget class="QPushButton" name="btnSelect"> <widget class="QPushButton" name="btnCircleRight">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
@ -928,6 +626,291 @@
</rect> </rect>
</property> </property>
<widget class="QLabel" name="label_24"> <widget class="QLabel" name="label_24">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>51</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Up:</string>
</property>
</widget>
<widget class="QPushButton" name="btnCircleUp">
<property name="geometry">
<rect>
<x>0</x>
<y>20</y>
<width>71</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string/>
</property>
</widget>
</widget>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout3">
<property name="spacing">
<number>2</number>
</property>
<item>
<widget class="QGroupBox" name="faceButtons_5">
<property name="title">
<string>C-Stick</string>
</property>
<property name="flat">
<bool>false</bool>
</property>
<property name="checkable">
<bool>false</bool>
</property>
<widget class="QWidget" name="widget_25" native="true">
<property name="geometry">
<rect>
<x>10</x>
<y>20</y>
<width>71</width>
<height>50</height>
</rect>
</property>
<widget class="QLabel" name="label_25">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>51</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Left:</string>
</property>
</widget>
<widget class="QPushButton" name="btnStickLeft">
<property name="geometry">
<rect>
<x>0</x>
<y>20</y>
<width>71</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string/>
</property>
</widget>
</widget>
<widget class="QWidget" name="widget_26" native="true">
<property name="geometry">
<rect>
<x>100</x>
<y>70</y>
<width>71</width>
<height>50</height>
</rect>
</property>
<widget class="QLabel" name="label_26">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>51</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Down:</string>
</property>
</widget>
<widget class="QPushButton" name="btnStickDown">
<property name="geometry">
<rect>
<x>0</x>
<y>20</y>
<width>71</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string/>
</property>
</widget>
</widget>
<widget class="QWidget" name="widget_27" native="true">
<property name="geometry">
<rect>
<x>100</x>
<y>20</y>
<width>71</width>
<height>50</height>
</rect>
</property>
<widget class="QLabel" name="label_27">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>51</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Right:</string>
</property>
</widget>
<widget class="QPushButton" name="btnStickRight">
<property name="geometry">
<rect>
<x>0</x>
<y>20</y>
<width>71</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string/>
</property>
</widget>
</widget>
<widget class="QWidget" name="widget_28" native="true">
<property name="geometry">
<rect>
<x>10</x>
<y>70</y>
<width>71</width>
<height>50</height>
</rect>
</property>
<widget class="QLabel" name="label_28">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>51</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Up:</string>
</property>
</widget>
<widget class="QPushButton" name="btnStickUp">
<property name="geometry">
<rect>
<x>0</x>
<y>20</y>
<width>71</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string/>
</property>
</widget>
</widget>
</widget>
</item>
<item>
<widget class="QGroupBox" name="faceButtons_6">
<property name="title">
<string>System Buttons</string>
</property>
<property name="flat">
<bool>false</bool>
</property>
<property name="checkable">
<bool>false</bool>
</property>
<widget class="QWidget" name="widget_29" native="true">
<property name="geometry">
<rect>
<x>10</x>
<y>20</y>
<width>71</width>
<height>50</height>
</rect>
</property>
<widget class="QLabel" name="label_29">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>51</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Start:</string>
</property>
</widget>
<widget class="QPushButton" name="btnStart">
<property name="geometry">
<rect>
<x>0</x>
<y>20</y>
<width>71</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string/>
</property>
</widget>
</widget>
<widget class="QWidget" name="widget_30" native="true">
<property name="geometry">
<rect>
<x>100</x>
<y>20</y>
<width>71</width>
<height>50</height>
</rect>
</property>
<widget class="QLabel" name="label_30">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>51</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Select:</string>
</property>
</widget>
<widget class="QPushButton" name="btnSelect">
<property name="geometry">
<rect>
<x>0</x>
<y>20</y>
<width>71</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string/>
</property>
</widget>
</widget>
<widget class="QWidget" name="widget_31" native="true">
<property name="geometry">
<rect>
<x>10</x>
<y>70</y>
<width>71</width>
<height>50</height>
</rect>
</property>
<widget class="QLabel" name="label_31">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
@ -955,21 +938,67 @@
</widget> </widget>
</widget> </widget>
</widget> </widget>
</item>
</layout>
</item>
<item>
<widget class="QFrame" name="frame">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>50</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>26</height>
</size>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<widget class="QPushButton" name="btnRestoreDefaults"> <widget class="QPushButton" name="btnRestoreDefaults">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>270</x> <x>260</x>
<y>420</y> <y>0</y>
<width>110</width> <width>110</width>
<height>28</height> <height>26</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeIncrement">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="baseSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="text"> <property name="text">
<string>Restore Defaults</string> <string>Restore Defaults</string>
</property> </property>
</widget> </widget>
</widget> </widget>
<layoutdefault spacing="6" margin="11" /> </item>
</layout>
</widget>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>