Forráskód Böngészése

fixed saving config when closing window

Malte Veerman 9 éve
szülő
commit
d53826b691

+ 0 - 1
fancontrol-gui/src/main.cpp

@@ -55,7 +55,6 @@ int main(int argc, char *argv[])
 
     Fancontrol::GUIBase base;
     base.load();
-    QObject::connect(&app, &QApplication::aboutToQuit, [&] () { base.save(false); });
     engine.rootContext()->setContextProperty("base", &base);
 
     KPackage::Package package = KPackage::PackageLoader::self()->loadPackage("KPackage/GenericQML");

+ 2 - 2
lib/src/guibase.h

@@ -83,8 +83,8 @@ public:
     void setConfigUrl(const QUrl &url);
     void setUnit(int unit) { if (unit != m_unit) { m_unit = unit; emit unitChanged(); } }
     void load();
-    void save(bool saveLoader = false);
-
+    
+    Q_INVOKABLE void save(bool saveLoader = false);
     Q_INVOKABLE bool hasSystemdCommunicator() const { return SYSTEMD_BOOL; }
     
     

+ 3 - 1
package/contents/ui/Application.qml

@@ -30,6 +30,8 @@ ApplicationWindow {
     width: 1024
     height: 768
     visible: true
+    
+    onClosing: base.save()
 
     menuBar: MenuBar {
         Menu {
@@ -148,7 +150,7 @@ ApplicationWindow {
         modality: Qt.NonModal
 
         onAccepted: {
-            base.loader.load(fileUrl);
+            base.configUrl = fileUrl;
         }
     }
     FileDialog {