summaryrefslogtreecommitdiffstats
path: root/Source/QtDialog/CMakeSetupDialog.h
diff options
context:
space:
mode:
authorClinton Stimpson <clinton@elemtech.com>2010-12-18 02:04:57 (GMT)
committerClinton Stimpson <clinton@elemtech.com>2010-12-18 02:04:57 (GMT)
commit3f158c6dfab7420696498ed4386761d847b6e943 (patch)
treefacc533c1bbc7a4ead03f95cf93c5a933ac57882 /Source/QtDialog/CMakeSetupDialog.h
parentd11c70295b072d19c90c3e5d415d27de10253615 (diff)
downloadCMake-3f158c6dfab7420696498ed4386761d847b6e943.zip
CMake-3f158c6dfab7420696498ed4386761d847b6e943.tar.gz
CMake-3f158c6dfab7420696498ed4386761d847b6e943.tar.bz2
cmake-gui: always enable generate button.
Diffstat (limited to 'Source/QtDialog/CMakeSetupDialog.h')
-rw-r--r--Source/QtDialog/CMakeSetupDialog.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/Source/QtDialog/CMakeSetupDialog.h b/Source/QtDialog/CMakeSetupDialog.h
index 0e3caec..1934795 100644
--- a/Source/QtDialog/CMakeSetupDialog.h
+++ b/Source/QtDialog/CMakeSetupDialog.h
@@ -16,6 +16,7 @@
#include "QCMake.h"
#include <QMainWindow>
#include <QThread>
+#include <QEventLoop>
#include "ui_CMakeSetupDialog.h"
class QCMakeThread;
@@ -43,8 +44,6 @@ protected slots:
void doHelp();
void doAbout();
void doInterrupt();
- void finishConfigure(int error);
- void finishGenerate(int error);
void error(const QString& message);
void message(const QString& message);
@@ -74,6 +73,10 @@ protected slots:
void setGroupedView(bool);
void showUserChanges();
void setSearchFilter(const QString& str);
+ bool prepareConfigure();
+ bool doConfigureInternal();
+ bool doGenerateInternal();
+ void exitLoop(int);
protected:
@@ -87,6 +90,7 @@ protected:
QCMakeThread* CMakeThread;
bool ExitAfterGenerate;
bool CacheModified;
+ bool ConfigureNeeded;
QAction* ReloadCacheAction;
QAction* DeleteCacheAction;
QAction* ExitAction;
@@ -99,6 +103,10 @@ protected:
QTextCharFormat ErrorFormat;
QTextCharFormat MessageFormat;
+ QEventLoop LocalLoop;
+
+ float ProgressOffset;
+ float ProgressFactor;
};
// QCMake instance on a thread