From 3b7cb85d384ca231fb6f25493dbc4e476987beae Mon Sep 17 00:00:00 2001 From: daniel-Jones Date: Fri, 1 Jul 2016 22:59:30 +0930 Subject: Added the ability to delete presets, removed the hardcoded preset file location - that was dumb on my behalf. --- qt/build/degub/RGBController | Bin 1302536 -> 1306008 bytes qt/build/degub/controllerwindow.o | Bin 1007824 -> 1018376 bytes qt/build/degub/main.o | Bin 872920 -> 872920 bytes qt/build/degub/moc_controllerwindow.cpp | 51 ++++++++++++++++++-------------- qt/build/degub/moc_controllerwindow.o | Bin 971016 -> 971632 bytes qt/build/degub/ui_controllerwindow.h | 31 +++++++++++-------- 6 files changed, 47 insertions(+), 35 deletions(-) (limited to 'qt/build/degub') diff --git a/qt/build/degub/RGBController b/qt/build/degub/RGBController index 21a2bfd..3dbeac9 100755 Binary files a/qt/build/degub/RGBController and b/qt/build/degub/RGBController differ diff --git a/qt/build/degub/controllerwindow.o b/qt/build/degub/controllerwindow.o index 07494b6..7fce5fa 100644 Binary files a/qt/build/degub/controllerwindow.o and b/qt/build/degub/controllerwindow.o differ diff --git a/qt/build/degub/main.o b/qt/build/degub/main.o index 8f14278..bb17f39 100644 Binary files a/qt/build/degub/main.o and b/qt/build/degub/main.o differ diff --git a/qt/build/degub/moc_controllerwindow.cpp b/qt/build/degub/moc_controllerwindow.cpp index 8d6a754..07e69be 100755 --- a/qt/build/degub/moc_controllerwindow.cpp +++ b/qt/build/degub/moc_controllerwindow.cpp @@ -19,8 +19,8 @@ QT_BEGIN_MOC_NAMESPACE struct qt_meta_stringdata_controllerWindow_t { - QByteArrayData data[18]; - char stringdata0[413]; + QByteArrayData data[19]; + char stringdata0[445]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -46,7 +46,8 @@ QT_MOC_LITERAL(13, 286, 21), // "on_off_button_clicked" QT_MOC_LITERAL(14, 308, 28), // "on_set_preset_button_clicked" QT_MOC_LITERAL(15, 337, 39), // "on_presets_dropdown_currentIn..." QT_MOC_LITERAL(16, 377, 5), // "index" -QT_MOC_LITERAL(17, 383, 29) // "on_preset_save_button_clicked" +QT_MOC_LITERAL(17, 383, 29), // "on_preset_save_button_clicked" +QT_MOC_LITERAL(18, 413, 31) // "on_preset_delete_button_clicked" }, "controllerWindow\0on_connect_button_clicked\0" @@ -60,7 +61,8 @@ QT_MOC_LITERAL(17, 383, 29) // "on_preset_save_button_clicked" "on_off_button_clicked\0" "on_set_preset_button_clicked\0" "on_presets_dropdown_currentIndexChanged\0" - "index\0on_preset_save_button_clicked" + "index\0on_preset_save_button_clicked\0" + "on_preset_delete_button_clicked" }; #undef QT_MOC_LITERAL @@ -70,7 +72,7 @@ static const uint qt_meta_data_controllerWindow[] = { 7, // revision 0, // classname 0, 0, // classinfo - 14, 14, // methods + 15, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors @@ -78,20 +80,21 @@ static const uint qt_meta_data_controllerWindow[] = { 0, // signalCount // slots: name, argc, parameters, tag, flags - 1, 0, 84, 2, 0x08 /* Private */, - 3, 0, 85, 2, 0x08 /* Private */, - 4, 0, 86, 2, 0x08 /* Private */, - 5, 0, 87, 2, 0x08 /* Private */, - 6, 1, 88, 2, 0x08 /* Private */, - 8, 1, 91, 2, 0x08 /* Private */, - 9, 1, 94, 2, 0x08 /* Private */, - 10, 0, 97, 2, 0x08 /* Private */, - 11, 0, 98, 2, 0x08 /* Private */, - 12, 0, 99, 2, 0x08 /* Private */, - 13, 0, 100, 2, 0x08 /* Private */, - 14, 0, 101, 2, 0x08 /* Private */, - 15, 1, 102, 2, 0x08 /* Private */, - 17, 0, 105, 2, 0x08 /* Private */, + 1, 0, 89, 2, 0x08 /* Private */, + 3, 0, 90, 2, 0x08 /* Private */, + 4, 0, 91, 2, 0x08 /* Private */, + 5, 0, 92, 2, 0x08 /* Private */, + 6, 1, 93, 2, 0x08 /* Private */, + 8, 1, 96, 2, 0x08 /* Private */, + 9, 1, 99, 2, 0x08 /* Private */, + 10, 0, 102, 2, 0x08 /* Private */, + 11, 0, 103, 2, 0x08 /* Private */, + 12, 0, 104, 2, 0x08 /* Private */, + 13, 0, 105, 2, 0x08 /* Private */, + 14, 0, 106, 2, 0x08 /* Private */, + 15, 1, 107, 2, 0x08 /* Private */, + 17, 0, 110, 2, 0x08 /* Private */, + 18, 0, 111, 2, 0x08 /* Private */, // slots: parameters QMetaType::Void, @@ -107,6 +110,7 @@ static const uint qt_meta_data_controllerWindow[] = { QMetaType::Void, QMetaType::Void, QMetaType::Void, QMetaType::Int, 16, + QMetaType::Void, QMetaType::Void, 0 // eod @@ -132,6 +136,7 @@ void controllerWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int case 11: _t->on_set_preset_button_clicked(); break; case 12: _t->on_presets_dropdown_currentIndexChanged((*reinterpret_cast< int(*)>(_a[1]))); break; case 13: _t->on_preset_save_button_clicked(); break; + case 14: _t->on_preset_delete_button_clicked(); break; default: ; } } @@ -162,13 +167,13 @@ int controllerWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 14) + if (_id < 15) qt_static_metacall(this, _c, _id, _a); - _id -= 14; + _id -= 15; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 14) + if (_id < 15) *reinterpret_cast(_a[0]) = -1; - _id -= 14; + _id -= 15; } return _id; } diff --git a/qt/build/degub/moc_controllerwindow.o b/qt/build/degub/moc_controllerwindow.o index 5adbd14..9086496 100644 Binary files a/qt/build/degub/moc_controllerwindow.o and b/qt/build/degub/moc_controllerwindow.o differ diff --git a/qt/build/degub/ui_controllerwindow.h b/qt/build/degub/ui_controllerwindow.h index f110c61..03ce981 100755 --- a/qt/build/degub/ui_controllerwindow.h +++ b/qt/build/degub/ui_controllerwindow.h @@ -52,15 +52,16 @@ public: QComboBox *presets_dropdown; QTextEdit *info_log_textarea; QLineEdit *preset_name_textbox; - QPushButton *reload_preset_button; QPushButton *preset_save_button; + QPushButton *preset_delete_button; + QPushButton *reload_preset_button; void setupUi(QMainWindow *controllerWindow) { if (controllerWindow->objectName().isEmpty()) controllerWindow->setObjectName(QStringLiteral("controllerWindow")); controllerWindow->setWindowModality(Qt::WindowModal); - controllerWindow->resize(235, 402); + controllerWindow->resize(235, 428); centralWidget = new QWidget(controllerWindow); centralWidget->setObjectName(QStringLiteral("centralWidget")); formLayout = new QFormLayout(centralWidget); @@ -163,7 +164,7 @@ public: info_log_label = new QLabel(centralWidget); info_log_label->setObjectName(QStringLiteral("info_log_label")); - formLayout->setWidget(12, QFormLayout::LabelRole, info_log_label); + formLayout->setWidget(14, QFormLayout::LabelRole, info_log_label); set_preset_button = new QPushButton(centralWidget); set_preset_button->setObjectName(QStringLiteral("set_preset_button")); @@ -179,22 +180,27 @@ public: info_log_textarea = new QTextEdit(centralWidget); info_log_textarea->setObjectName(QStringLiteral("info_log_textarea")); - formLayout->setWidget(13, QFormLayout::SpanningRole, info_log_textarea); + formLayout->setWidget(15, QFormLayout::SpanningRole, info_log_textarea); preset_name_textbox = new QLineEdit(centralWidget); preset_name_textbox->setObjectName(QStringLiteral("preset_name_textbox")); - formLayout->setWidget(11, QFormLayout::LabelRole, preset_name_textbox); - - reload_preset_button = new QPushButton(centralWidget); - reload_preset_button->setObjectName(QStringLiteral("reload_preset_button")); - - formLayout->setWidget(12, QFormLayout::FieldRole, reload_preset_button); + formLayout->setWidget(12, QFormLayout::LabelRole, preset_name_textbox); preset_save_button = new QPushButton(centralWidget); preset_save_button->setObjectName(QStringLiteral("preset_save_button")); - formLayout->setWidget(11, QFormLayout::FieldRole, preset_save_button); + formLayout->setWidget(12, QFormLayout::FieldRole, preset_save_button); + + preset_delete_button = new QPushButton(centralWidget); + preset_delete_button->setObjectName(QStringLiteral("preset_delete_button")); + + formLayout->setWidget(13, QFormLayout::FieldRole, preset_delete_button); + + reload_preset_button = new QPushButton(centralWidget); + reload_preset_button->setObjectName(QStringLiteral("reload_preset_button")); + + formLayout->setWidget(11, QFormLayout::LabelRole, reload_preset_button); controllerWindow->setCentralWidget(centralWidget); @@ -220,8 +226,9 @@ public: off_button->setText(QApplication::translate("controllerWindow", "Off", 0)); info_log_label->setText(QApplication::translate("controllerWindow", "Information log", 0)); set_preset_button->setText(QApplication::translate("controllerWindow", "Set", 0)); - reload_preset_button->setText(QApplication::translate("controllerWindow", "Reload", 0)); preset_save_button->setText(QApplication::translate("controllerWindow", "Save", 0)); + preset_delete_button->setText(QApplication::translate("controllerWindow", "Delete", 0)); + reload_preset_button->setText(QApplication::translate("controllerWindow", "Reload", 0)); } // retranslateUi }; -- cgit v1.2.3