summaryrefslogtreecommitdiff
path: root/qt
diff options
context:
space:
mode:
authordaniel-Jones <daniel@danieljon.es>2016-07-08 21:48:52 +0930
committerdaniel-Jones <daniel@danieljon.es>2016-07-08 21:48:52 +0930
commitf7bbb4f3d4325df390ce54cbb46c99a964a5a508 (patch)
treee0d6430d2de0cef960cd7120e1f2dc9bea9b2ed1 /qt
parent3b7cb85d384ca231fb6f25493dbc4e476987beae (diff)
downloadRGB-Controller-f7bbb4f3d4325df390ce54cbb46c99a964a5a508.tar.gz
RGB-Controller-f7bbb4f3d4325df390ce54cbb46c99a964a5a508.zip
Added a dialog box function that gives an ok/cancer message box - put this to use when deleting presets, it now confirms you want to delete the preset. I may have accidently deleted a few by mistake, woops.
Diffstat (limited to 'qt')
-rwxr-xr-xqt/RGBController/controllerwindow.cpp106
-rwxr-xr-xqt/RGBController/controllerwindow.h1
-rwxr-xr-xqt/build/degub/RGBControllerbin1306008 -> 1314264 bytes
-rw-r--r--qt/build/degub/controllerwindow.obin1018376 -> 1029400 bytes
-rw-r--r--qt/build/degub/moc_controllerwindow.obin971632 -> 971792 bytes
-rw-r--r--qt/build/degub/presets.txt6
6 files changed, 64 insertions, 49 deletions
diff --git a/qt/RGBController/controllerwindow.cpp b/qt/RGBController/controllerwindow.cpp
index b258ff2..5fe0ec6 100755
--- a/qt/RGBController/controllerwindow.cpp
+++ b/qt/RGBController/controllerwindow.cpp
@@ -17,7 +17,7 @@ controllerWindow::controllerWindow(QWidget *parent) :
ui->reload_preset_button->setEnabled(false);
ui->set_preset_button->setEnabled(false);
ui->preset_save_button->setEnabled(false);
- ui->preset_delete_button->setEnabled(false);
+ ui->preset_delete_button->setEnabled(false);
ui->preset_name_textbox->setEnabled(false);
ui->presets_dropdown->setEnabled(false);
ui->r_slider->setEnabled(false);
@@ -85,7 +85,7 @@ void controllerWindow::load_presets()
*/
- QFile inputFile("presets.txt");
+ QFile inputFile("presets.txt");
if (inputFile.open(QIODevice::ReadOnly))
{
QTextStream in(&inputFile);
@@ -102,7 +102,7 @@ void controllerWindow::load_presets()
info_log("Presets loaded");
} else
{
- show_msgbox("Unable to find the presets file.\nThis file needs to be named 'presets.txt' and be located in the same directory as the binary.");
+ show_msgbox("Unable to find the presets file.\nThis file needs to be named 'presets.txt' and be located in the same directory as the binary.");
info_log("Presets file not found.");
}
}
@@ -125,51 +125,61 @@ void controllerWindow::save_preset(QString name)
presets.clear();
preset_index = 0;
load_presets();
- }
+ }
}
void controllerWindow::delete_preset(QString name)
{
- /*
- * here we will delete a preset from the presets file
- * process:
- * retrieve preset name
- * go through preset file line by line and write it to a seperate tmp file
- * if the [0] of split('=') equals the preset name, don't write it to the tmp file
- * delete the old preset file
- * rename the tmp file to presets.txt
- */
- info_log("deleting preset: " + name);
- QFile file("tmp.file");
- if(!file.open(QIODevice::Append)) {
- show_msgbox("Fatal error opening temp file for writing");
-
- } else
- {
- QTextStream stream(&file);
- //stream << "test tmp file" << endl;
- for (int x = 0; x < ui->presets_dropdown->count(); x++)
+ /*
+ * here we will delete a preset from the presets file
+ * process:
+ * retrieve preset name
+ * go through preset file line by line and write it to a seperate tmp file
+ * if the [0] of split('=') equals the preset name, don't write it to the tmp file
+ * delete the old preset file
+ * rename the tmp file to presets.txt
+ */
+ int ret = show_question_box("Are you want to delete this preset?", "This process cannot be reverted.");
+ switch (ret) {
+ case QMessageBox::Ok:
{
- if(name != ui->presets_dropdown->itemText(x))
- {
- info_log("adding: " + ui->presets_dropdown->itemText(x) + "=" + presets.at(x));
- stream << ui->presets_dropdown->itemText(x) << "=" << presets.at(x) << endl;
+ info_log("deleting preset: " + name);
+ QFile file("tmp.file");
+ if(!file.open(QIODevice::Append)) {
+ show_msgbox("Fatal error opening temp file for writing");
+
} else
{
- info_log("not adding: " + ui->presets_dropdown->itemText(x) + "=" + presets.at(x));
+ QTextStream stream(&file);
+ //stream << "test tmp file" << endl;
+ for (int x = 0; x < ui->presets_dropdown->count(); x++)
+ {
+ if(name != ui->presets_dropdown->itemText(x))
+ {
+ stream << ui->presets_dropdown->itemText(x) << "=" << presets.at(x) << endl;
+ }
+ }
+ file.close();
+ /* remove the current presets file then rename the temp file to presets.txt */
+ QFile::remove("presets.txt");
+ QFile::rename("tmp.file", "presets.txt");
+ /* reload presets into memory and clear the drop down box */
+ ui->presets_dropdown->clear();
+ presets.clear();
+ preset_index = 0;
+ load_presets();
+ break;
+ }
}
- }
- file.close();
- /* remove the current presets file then rename the temp file to presets.txt */
- QFile::remove("presets.txt");
- QFile::rename("tmp.file", "presets.txt");
- /* reload presets into memory and clear the drop down box */
- ui->presets_dropdown->clear();
- presets.clear();
- preset_index = 0;
- load_presets();
+ case QMessageBox::Cancel:
+ show_msgbox("Preset was not deleted.");
+ break;
+ default:
+ info_log("Unknown response received.");
+ break;
}
+
}
void controllerWindow::serial_rgb_change(int r, int g, int b)
@@ -179,10 +189,20 @@ void controllerWindow::serial_rgb_change(int r, int g, int b)
void controllerWindow::show_msgbox(QString message)
{
- /* show message box to the user */
+ /* show message box to the user */
QMessageBox msgbox;
msgbox.setText(message);
- msgbox.exec();
+ msgbox.exec();
+}
+
+int controllerWindow::show_question_box(QString message, QString omessage)
+{
+ QMessageBox qbox;
+ qbox.setText(message);
+ qbox.setInformativeText(omessage);
+ qbox.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
+ qbox.setDefaultButton(QMessageBox::Cancel);
+ return qbox.exec();
}
/*
@@ -213,7 +233,7 @@ void controllerWindow::on_connect_button_clicked()
ui->reload_preset_button->setEnabled(true);
ui->set_preset_button->setEnabled(true);
ui->preset_save_button->setEnabled(true);
- ui->preset_delete_button->setEnabled(true);
+ ui->preset_delete_button->setEnabled(true);
ui->preset_name_textbox->setEnabled(true);
ui->presets_dropdown->setEnabled(true);
ui->r_slider->setEnabled(true);
@@ -246,7 +266,7 @@ void controllerWindow::on_disconnect_button_clicked()
ui->off_button->setEnabled(false);
ui->reload_preset_button->setEnabled(false);
ui->preset_save_button->setEnabled(false);
- ui->preset_delete_button->setEnabled(false);
+ ui->preset_delete_button->setEnabled(false);
ui->preset_name_textbox->setEnabled(false);
ui->set_preset_button->setEnabled(false);
ui->presets_dropdown->setEnabled(false);
@@ -361,5 +381,5 @@ void controllerWindow::on_preset_save_button_clicked()
void controllerWindow::on_preset_delete_button_clicked()
{
- delete_preset(ui->presets_dropdown->currentText());
+ delete_preset(ui->presets_dropdown->currentText());
}
diff --git a/qt/RGBController/controllerwindow.h b/qt/RGBController/controllerwindow.h
index 9f73749..1350bbc 100755
--- a/qt/RGBController/controllerwindow.h
+++ b/qt/RGBController/controllerwindow.h
@@ -32,6 +32,7 @@ class controllerWindow : public QMainWindow
void delete_preset(QString name);
void serial_rgb_change(int r, int g, int b);
void show_msgbox(QString message);
+ int show_question_box(QString message, QString omessage);
/*public variables */
/* these three ints will hold the current value (0 - 255) of each slider */
int r, g, b;
diff --git a/qt/build/degub/RGBController b/qt/build/degub/RGBController
index 3dbeac9..41cc589 100755
--- a/qt/build/degub/RGBController
+++ b/qt/build/degub/RGBController
Binary files differ
diff --git a/qt/build/degub/controllerwindow.o b/qt/build/degub/controllerwindow.o
index 7fce5fa..b9424c6 100644
--- a/qt/build/degub/controllerwindow.o
+++ b/qt/build/degub/controllerwindow.o
Binary files differ
diff --git a/qt/build/degub/moc_controllerwindow.o b/qt/build/degub/moc_controllerwindow.o
index 9086496..d19a41d 100644
--- a/qt/build/degub/moc_controllerwindow.o
+++ b/qt/build/degub/moc_controllerwindow.o
Binary files differ
diff --git a/qt/build/degub/presets.txt b/qt/build/degub/presets.txt
index 7bc9af4..2b9422e 100644
--- a/qt/build/degub/presets.txt
+++ b/qt/build/degub/presets.txt
@@ -1,9 +1,3 @@
-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