Merge lp:~jimmy-jonsson-hiq/forssim/Bug_423041_3 into lp:forssim

[Jimmy Jonsson]

[Jimmy Jonsson (jimmy-jonsson-hiq)]

Bug 423041_3 fixed and ready to merge

[Martin Flodin (mflodin)]

The "wait cursor" is still showing even after the dialog has been closed which leads the user to believe the program is still waiting for something. Please see to it that the cursor returns to its normal state when the dialog is closed.

Is it possible to add a cancel button to the dialog? It was not that intuitive to press the window closing button to cancel.

maxValue(-1) has been removed from the constructor in FsWisdom/ProgressDialog.cpp. Why is that?

review: Needs Fixing

[lp:~jimmy-jonsson-hiq/forssim/Bug_423041_3]

346. By Jimmy <jimmy@ubuntu> on 2009-10-01

Bug_423041_3

[Jimmy Jonsson (jimmy-jonsson-hiq)]

> The "wait cursor" is still showing even after the dialog has been closed which
> leads the user to believe the program is still waiting for something. Please
> see to it that the cursor returns to its normal state when the dialog is
> closed.
>
> Is it possible to add a cancel button to the dialog? It was not that intuitive
> to press the window closing button to cancel.
>
> maxValue(-1) has been removed from the constructor in
> FsWisdom/ProgressDialog.cpp. Why is that?

Wait cursor set to normal state. Adding cancel button was not as easy as I thought. We might put some more effort on the issue next week. maxValue(-1) does not make any sense and I think it is better if it is removed to avoid confusion.

[lp:~jimmy-jonsson-hiq/forssim/Bug_423041_3]

347. By Jimmy <jimmy@ubuntu> on 2009-10-02

Bug_423041_3

[Martin Flodin (mflodin)]

Review: Approve
Looks good now. Tested on Ubuntu.

[Martin Flodin (mflodin)]

review: Approve

Unmerged revisions

347. By Jimmy <jimmy@ubuntu> on 2009-10-02

Bug_423041_3

346. By Jimmy <jimmy@ubuntu> on 2009-10-01

Bug_423041_3

345. By Jimmy <jimmy@ubuntu> on 2009-09-30

Bug_423041_3

=== modified file 'FsWisdom/ApplicationNode.cpp'
--- FsWisdom/ApplicationNode.cpp	2009-09-18 14:43:43 +0000
+++ FsWisdom/ApplicationNode.cpp	2009-10-02 08:28:11 +0000
@@ -42,6 +42,7 @@
 forsCaseVersionId(-1),
 myCDcommand(-1),
 ftpAborted(false),
+ftpFinished(true),
 isMirrored(false),
 isStereo(false),
 isPlayback(false),
@@ -608,8 +609,10 @@
 		std::cout << "ApplicationNode CommandFinished CD" << std::endl;
 		if (commandID == myCDcommand)
 		{
-			progressDialog.reset(new ProgressDialog(this,"-Welcome to FsWisdom-\n Downloading and installing cases!",0,0,5));
+			progressDialog.reset(new ProgressDialog(this,"-Welcome to FsWisdom-\n Downloading and installing cases!","Cancel",0,5));
+			QObject::connect(this->getProgressDialog(),SIGNAL(canceled()),this,SLOT(cancelFtp()));
 			progressDialog->show();
+			ftpFinished = false;
 
 			/*Create localCaselist and serverCaseList and download cases over ftp if not already downloaded.*/
 			localCaseList.reset(new LocalCaseList(this,this->getCaseDirectory(), this->getFtp()));
@@ -634,7 +637,7 @@
 	/*registerUserWindow.reset(new RegisterUserWindow(this));
 	registerUserWindow->setGeometry(QApplication::desktop()->availableGeometry(0));
 	registerUserWindow->showMaximized();*/
-
+	ftpFinished = true;
 	ftp->close();
 	if (progressDialog.get() != NULL)
 		progressDialog->reset();
@@ -673,5 +676,16 @@
 void ApplicationNode::setFtpAborted(bool a_aborted)
 {
 	ftpAborted = a_aborted;
+	if(a_aborted)
+		ftpFinished = true;
+}
+bool ApplicationNode::getFtpAborted()
+{
+	return ftpAborted;
+}
+
+void ApplicationNode::cancelFtp()
+{
+	this->getProgressDialog()->cancelFtpDownloading();
 }
 

=== modified file 'FsWisdom/ApplicationNode.h'
--- FsWisdom/ApplicationNode.h	2009-09-18 14:43:43 +0000
+++ FsWisdom/ApplicationNode.h	2009-10-02 08:28:11 +0000
@@ -180,13 +180,15 @@
 	LocalCaseList* getLocalCaseList();
 	ProgressDialog* getProgressDialog();
 	void setFtpAborted(bool aborted);
+	bool getFtpAborted();
 
 public slots:
 
 	/// Quit the application
 	void Quit()
 	{
-		quit();
+		if(ftpFinished)
+			quit();
 	}
 
 	/// Returns to the Register User Screen
@@ -202,6 +204,7 @@
 	void ftpCommandFinished(int commandID, bool error);
 	void ftpCommandStarted(int id);
 	void ftpDownloadComplete();
+	void cancelFtp();
 
 private:
 
@@ -295,6 +298,7 @@
 	auto_ptr<QFtp> ftp;
 	int myCDcommand;
 	bool ftpAborted;
+	bool ftpFinished;
 };
 
 }

=== modified file 'FsWisdom/LocalCaseList.cpp'
--- FsWisdom/LocalCaseList.cpp	2009-09-15 12:03:38 +0000
+++ FsWisdom/LocalCaseList.cpp	2009-10-02 08:28:11 +0000
@@ -49,6 +49,8 @@
 
 void LocalCaseList::ftpCommandFinished(int, bool error)
 {
+	if(!applicationNode->getFtpAborted())
+	{
 	cout << "LocalCaseList ftpCommandFinished: " << endl;
 
 	if (ftp->currentCommand() == QFtp::ConnectToHost) {
@@ -110,6 +112,7 @@
 			}
 		}
 	}
+	}
 }
 
 void LocalCaseList::addLocally(const Case& newCase, QSqlDatabase& forsDatabase)

=== modified file 'FsWisdom/ProgressDialog.cpp'
--- FsWisdom/ProgressDialog.cpp	2009-09-15 12:03:38 +0000
+++ FsWisdom/ProgressDialog.cpp	2009-10-02 08:28:11 +0000
@@ -17,8 +17,7 @@
 using namespace FS;
 
 ProgressDialog::ProgressDialog(ApplicationNode *a_applicationNode, const QString & labelText, const QString & cancelButtonText, int minimum, int maximum, QWidget *parent)
-:QProgressDialog(labelText,cancelButtonText,minimum,maximum,parent),
-maxValue(-1)
+:QProgressDialog(labelText,cancelButtonText,minimum,maximum,parent)
 {
 	applicationNode = a_applicationNode;
 	aborted = false;
@@ -51,15 +50,18 @@
 
 void ProgressDialog::closeEvent(QCloseEvent *event)
 {
-
 	if(applicationNode == NULL)
 	{
 		event->ignore();
 		return;
 	}
-
 	std::cout << "Progress dialog closed" << std::endl;
+	cancelFtpDownloading();
+	event->accept();
+}
 
+void ProgressDialog::cancelFtpDownloading()
+{
 	// Stop ftp transfer
 	QFtp* ftp = applicationNode->getFtp();
 	ftp->abort();
@@ -70,7 +72,7 @@
 	if(!removeDirectories())
 		std::cout << "Not able to remove empty case directories" << std::endl;
 
-	event->accept();
+	applicationNode->restoreNormalCursor();
 }
 
 bool ProgressDialog::getAborted()

=== modified file 'FsWisdom/ProgressDialog.h'
--- FsWisdom/ProgressDialog.h	2009-09-09 12:22:21 +0000
+++ FsWisdom/ProgressDialog.h	2009-10-02 08:28:11 +0000
@@ -29,6 +29,7 @@
     void setNewText(QString text);
     virtual void closeEvent(QCloseEvent *event);
     bool getAborted();
+    void cancelFtpDownloading();
 private:
 	int maxValue;
 	ApplicationNode *applicationNode;