diff options
Diffstat (limited to 'rbutil/rbutilqt/install.cpp')
-rw-r--r-- | rbutil/rbutilqt/install.cpp | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/rbutil/rbutilqt/install.cpp b/rbutil/rbutilqt/install.cpp index d9c750ea4d..ee0d2114da 100644 --- a/rbutil/rbutilqt/install.cpp +++ b/rbutil/rbutilqt/install.cpp | |||
@@ -120,19 +120,25 @@ void Install::accept() | |||
120 | return; | 120 | return; |
121 | } | 121 | } |
122 | settings->sync(); | 122 | settings->sync(); |
123 | 123 | ||
124 | if(Detect::check(settings,false,settings->curTargetId()) == false) | 124 | QString warning = Detect::check(settings, false, settings->curTargetId()); |
125 | if(!warning.isEmpty()) | ||
125 | { | 126 | { |
126 | logger->addItem(tr("Aborted!"),LOGERROR); | 127 | if(QMessageBox::warning(this, tr("Really continue?"), warning, |
127 | logger->abort(); | 128 | QMessageBox::Ok | QMessageBox::Abort, QMessageBox::Abort) |
128 | return; | 129 | == QMessageBox::Abort) |
129 | } | 130 | { |
130 | 131 | logger->addItem(tr("Aborted!"),LOGERROR); | |
132 | logger->abort(); | ||
133 | return; | ||
134 | } | ||
135 | } | ||
136 | |||
131 | //! check if we should backup | 137 | //! check if we should backup |
132 | if(ui.backup->isChecked()) | 138 | if(ui.backup->isChecked()) |
133 | { | 139 | { |
134 | logger->addItem(tr("Beginning Backup..."),LOGINFO); | 140 | logger->addItem(tr("Beginning Backup..."),LOGINFO); |
135 | 141 | ||
136 | //! create dir, if it doesnt exist | 142 | //! create dir, if it doesnt exist |
137 | QFileInfo backupFile(m_backupName); | 143 | QFileInfo backupFile(m_backupName); |
138 | if(!QDir(backupFile.path()).exists()) | 144 | if(!QDir(backupFile.path()).exists()) |
@@ -140,7 +146,7 @@ void Install::accept() | |||
140 | QDir a; | 146 | QDir a; |
141 | a.mkpath(backupFile.path()); | 147 | a.mkpath(backupFile.path()); |
142 | } | 148 | } |
143 | 149 | ||
144 | //! create backup | 150 | //! create backup |
145 | RbZip backup; | 151 | RbZip backup; |
146 | connect(&backup,SIGNAL(zipProgress(int,int)),logger,SLOT(setProgress(int,int))); | 152 | connect(&backup,SIGNAL(zipProgress(int,int)),logger,SLOT(setProgress(int,int))); |
@@ -155,7 +161,7 @@ void Install::accept() | |||
155 | return; | 161 | return; |
156 | } | 162 | } |
157 | } | 163 | } |
158 | 164 | ||
159 | //! install build | 165 | //! install build |
160 | installer = new ZipInstaller(this); | 166 | installer = new ZipInstaller(this); |
161 | installer->setUrl(file); | 167 | installer->setUrl(file); |