summaryrefslogtreecommitdiff
path: root/qt
diff options
context:
space:
mode:
authordaniel-Jones <daniel@danieljon.es>2016-06-18 15:15:36 +0930
committerdaniel-Jones <daniel@danieljon.es>2016-06-18 15:15:36 +0930
commit963bfd49550f8ec555174ce236f4f0bfa2d370f3 (patch)
treebda4eecc7d83131a376c7eb2c7cf56abcadb0a0b /qt
parent3ebaa902b535773247105f3d0aa4e039ef7b55c6 (diff)
downloadRGB-Controller-963bfd49550f8ec555174ce236f4f0bfa2d370f3.tar.gz
RGB-Controller-963bfd49550f8ec555174ce236f4f0bfa2d370f3.zip
Added ability to save presets to file. NOTE: this commit includes a hardcoded presets.txt file location for personal use, make sure to replace it with just presets.txt!
Diffstat (limited to 'qt')
-rw-r--r--qt/RGBController/.controllerwindow.cpp.swobin16384 -> 0 bytes
-rw-r--r--qt/RGBController/.controllerwindow.cpp.swpbin24576 -> 0 bytes
-rw-r--r--qt/RGBController/.controllerwindow.h.swobin12288 -> 0 bytes
-rw-r--r--qt/RGBController/.controllerwindow.h.swpbin12288 -> 0 bytes
-rwxr-xr-xqt/RGBController/RGBController.pro.user2
-rwxr-xr-xqt/RGBController/controllerwindow.cpp9
-rwxr-xr-xqt/build/degub/RGBControllerbin1300072 -> 1302536 bytes
-rw-r--r--qt/build/degub/controllerwindow.obin1007624 -> 1007824 bytes
8 files changed, 8 insertions, 3 deletions
diff --git a/qt/RGBController/.controllerwindow.cpp.swo b/qt/RGBController/.controllerwindow.cpp.swo
deleted file mode 100644
index 39ed63a..0000000
--- a/qt/RGBController/.controllerwindow.cpp.swo
+++ /dev/null
Binary files differ
diff --git a/qt/RGBController/.controllerwindow.cpp.swp b/qt/RGBController/.controllerwindow.cpp.swp
deleted file mode 100644
index e33becb..0000000
--- a/qt/RGBController/.controllerwindow.cpp.swp
+++ /dev/null
Binary files differ
diff --git a/qt/RGBController/.controllerwindow.h.swo b/qt/RGBController/.controllerwindow.h.swo
deleted file mode 100644
index b273e95..0000000
--- a/qt/RGBController/.controllerwindow.h.swo
+++ /dev/null
Binary files differ
diff --git a/qt/RGBController/.controllerwindow.h.swp b/qt/RGBController/.controllerwindow.h.swp
deleted file mode 100644
index 51c6912..0000000
--- a/qt/RGBController/.controllerwindow.h.swp
+++ /dev/null
Binary files differ
diff --git a/qt/RGBController/RGBController.pro.user b/qt/RGBController/RGBController.pro.user
index 92130ad..cd38fba 100755
--- a/qt/RGBController/RGBController.pro.user
+++ b/qt/RGBController/RGBController.pro.user
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.0.0, 2016-05-30T20:26:17. -->
+<!-- Written by QtCreator 4.0.0, 2016-06-15T13:55:50. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
diff --git a/qt/RGBController/controllerwindow.cpp b/qt/RGBController/controllerwindow.cpp
index 250be58..ef0ab30 100755
--- a/qt/RGBController/controllerwindow.cpp
+++ b/qt/RGBController/controllerwindow.cpp
@@ -82,7 +82,11 @@ void controllerWindow::load_presets()
* -> split line at delimeter
* -> add [0] to dropdown (name), add [1] to an array that stores all the values
*/
- QFile inputFile("presets.txt");
+
+ /* PLEASE READ ME
+ * This is a hard coded directory for i3wm's sake, you have to fix this yourself.
+ */
+ QFile inputFile("/home/daniel_j/documents/school/2016\ research\ project/RGBController/qt/build/degub/presets.txt");
if (inputFile.open(QIODevice::ReadOnly))
{
QTextStream in(&inputFile);
@@ -99,7 +103,7 @@ void controllerWindow::load_presets()
info_log("Presets loaded");
} else
{
- show_msgbox("Unable to find the presets fle.\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.");
}
}
@@ -306,4 +310,5 @@ void controllerWindow::on_preset_save_button_clicked()
{
save_preset(tempname);
}
+ ui->preset_name_textbox->clear();
}
diff --git a/qt/build/degub/RGBController b/qt/build/degub/RGBController
index fecc4e7..21a2bfd 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 c5c9213..07494b6 100644
--- a/qt/build/degub/controllerwindow.o
+++ b/qt/build/degub/controllerwindow.o
Binary files differ