From ef885e1a2855bf8de3d44f07451d3c421f0ab5c0 Mon Sep 17 00:00:00 2001 From: daniel-Jones Date: Thu, 2 Jun 2016 18:10:52 +0930 Subject: Added feedback for missing presets.txt file, added message box funcrion for user alerts and other misc things --- qt/build/degub/RGBController | Bin 1289960 -> 1294552 bytes qt/build/degub/controllerwindow.o | Bin 990128 -> 994448 bytes qt/build/degub/main.o | Bin 872920 -> 872920 bytes qt/build/degub/moc_controllerwindow.o | Bin 969920 -> 970056 bytes qt/build/degub/old.txt | 12 ++++++++++++ qt/build/degub/presets.txt | 12 ------------ qt/build/degub/ui_controllerwindow.h | 2 ++ 7 files changed, 14 insertions(+), 12 deletions(-) create mode 100644 qt/build/degub/old.txt delete mode 100644 qt/build/degub/presets.txt (limited to 'qt/build') diff --git a/qt/build/degub/RGBController b/qt/build/degub/RGBController index d3016b1..5697898 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 d88e786..650edf3 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 68c328f..1f486a8 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.o b/qt/build/degub/moc_controllerwindow.o index f716615..dd21680 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/old.txt b/qt/build/degub/old.txt new file mode 100644 index 0000000..776a532 --- /dev/null +++ b/qt/build/degub/old.txt @@ -0,0 +1,12 @@ +Only add things to this file if you know what you are doing. +Don't be dumb. + +The program only cares for lines here if they contain the equals symbol. +Everything else is ignored - if you add an equals symbol to this file, you will most likely crash it. + +white=255,255,255 +purple=255,0,255 +light purple=255,55,255 +yellow=255,83,0 +light blue=0,255,255 + diff --git a/qt/build/degub/presets.txt b/qt/build/degub/presets.txt deleted file mode 100644 index 776a532..0000000 --- a/qt/build/degub/presets.txt +++ /dev/null @@ -1,12 +0,0 @@ -Only add things to this file if you know what you are doing. -Don't be dumb. - -The program only cares for lines here if they contain the equals symbol. -Everything else is ignored - if you add an equals symbol to this file, you will most likely crash it. - -white=255,255,255 -purple=255,0,255 -light purple=255,55,255 -yellow=255,83,0 -light blue=0,255,255 - diff --git a/qt/build/degub/ui_controllerwindow.h b/qt/build/degub/ui_controllerwindow.h index cebe2ce..1bebf40 100755 --- a/qt/build/degub/ui_controllerwindow.h +++ b/qt/build/degub/ui_controllerwindow.h @@ -56,6 +56,7 @@ public: { if (controllerWindow->objectName().isEmpty()) controllerWindow->setObjectName(QStringLiteral("controllerWindow")); + controllerWindow->setWindowModality(Qt::WindowModal); controllerWindow->resize(229, 394); centralWidget = new QWidget(controllerWindow); centralWidget->setObjectName(QStringLiteral("centralWidget")); @@ -173,6 +174,7 @@ public: presets_dropdown = new QComboBox(centralWidget); presets_dropdown->setObjectName(QStringLiteral("presets_dropdown")); + presets_dropdown->setMinimumSize(QSize(120, 0)); formLayout->setWidget(10, QFormLayout::LabelRole, presets_dropdown); -- cgit v1.2.3