summaryrefslogtreecommitdiffstats
path: root/src/fbgui.h
diff options
context:
space:
mode:
authorNiklas Goby2011-03-23 14:48:14 +0100
committerNiklas Goby2011-03-23 14:48:14 +0100
commitffe9e4a14a917f04e9d22b96fcbf7f42d546fa09 (patch)
tree489ce4adb6cac6ab07ef1b5b9e4d626bd96fc0c0 /src/fbgui.h
parentworking jquery over qrc (diff)
parentfile/dir checks for the file triggering (diff)
downloadfbgui-ffe9e4a14a917f04e9d22b96fcbf7f42d546fa09.tar.gz
fbgui-ffe9e4a14a917f04e9d22b96fcbf7f42d546fa09.tar.xz
fbgui-ffe9e4a14a917f04e9d22b96fcbf7f42d546fa09.zip
Merge branch 'master' of git.openslx.org:lsfks/master-teamprojekt/fbgui
Conflicts: src/fbgui.h
Diffstat (limited to 'src/fbgui.h')
-rw-r--r--src/fbgui.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/fbgui.h b/src/fbgui.h
index 6a9e10b..40f105b 100644
--- a/src/fbgui.h
+++ b/src/fbgui.h
@@ -28,8 +28,8 @@
#define DEFAULT_DOWNLOAD_DIR "/tmp/fbgui/downloads"
#define DEFAULT_CONFIG_PATH "/etc/fbgui.conf"
#define DEFAULT_UPDATE_INTERVAL 1;
-#define DEFAULT_FILE_TRIGGER "/tmp/trigger_fbgui"
#define DEFAULT_QRC_HTML_DIR ":/html"
+#define DEFAULT_FILE_TRIGGER "/tmp/fbgui/trigger"
// Global settings
@@ -53,7 +53,7 @@ private:
void setupDebugSplit();
void createActions();
bool checkHost() const;
- void watchDHCP();
+ void watchFileTrigger();
// widgets constituing the gui
@@ -66,15 +66,12 @@ private:
QAction* _toggleDebug;
//
- QNetworkAccessManager *mgr;
- QNetworkReply *rep;
QFileSystemWatcher* _watcher;
private slots:
// slots for processing actions
void toggleDebug();
-
- void netAccessible(const QString& name);
+ void checkForTrigger(const QString& dirname);
};
#endif // FBGUI_H