commit d575631ac5e770e2273bdad11bea69bef2740b3f
author Zhenkai Zhu <zhenkai@cs.ucla.edu> Thu Jan 31 13:49:45 2013 -0800
committer Zhenkai Zhu <zhenkai@cs.ucla.edu> Thu Jan 31 15:11:56 2013 -0800
tree f9ab1df327658b97f7e3e5b9985a8d94f96c3ec0
parent f3ea97a125498115a7de2ac7abd0a68f4f9ba3b1

small improvement of GUI. Backend waits until there is valid input to start.
View settings brings window to front.

Change-Id: I46bedbb5dff581ab7a213ae993a47aca3f2e544b

gui/chronosharegui.cpp

diff --git a/gui/chronosharegui.cpp b/gui/chronosharegui.cpp
index fcfb6e2..5889ede 100644
--- a/gui/chronosharegui.cpp
+++ b/gui/chronosharegui.cpp
@@ -32,6 +32,8 @@
 
 ChronoShareGui::ChronoShareGui(QWidget *parent)
   : QDialog(parent)
+  , m_watcher(0)
+  , m_dispatcher(0)
 {
 
   setWindowTitle("Preferences");
@@ -40,7 +42,7 @@
   labelSharedFolder = new QLabel("Shared Folder Name");
   labelSharedFolderPath = new QLabel("Shared Folder Path");
 
-  QRegExp regex("(^/[^/]+)+$");
+  QRegExp regex("(/[^/]+)+$");
   QValidator *prefixValidator = new QRegExpValidator(regex, this);
 
   editUsername = new QLineEdit();
@@ -72,16 +74,6 @@
   mainLayout->addWidget(label);
   setLayout(mainLayout);
 
-  // load settings
-  if(!loadSettings())
-    {
-      // prompt user to choose folder
-      openMessageBox("First Time Setup", "Please enter a username, shared folder name and choose the shared folder path on your local filesystem.");
-      viewSettings();
-      openFileDialog();
-      viewSettings();
-    }
-
   // create actions that result from clicking a menu option
   createActions();
 
@@ -98,6 +90,29 @@
   //            const std::string &sharedFolder, const boost::filesystem::path &rootDir,
   //            Ccnx::CcnxWrapperPtr ccnx, SchedulerPtr scheduler, int poolSize = 2);
 
+  // load settings
+  if(!loadSettings())
+    {
+      // prompt user to choose folder
+      openMessageBox("First Time Setup", "Please enter a username, shared folder name and choose the shared folder path on your local filesystem.");
+      viewSettings();
+      openFileDialog();
+      viewSettings();
+    }
+  else
+    {
+      startBackend();
+    }
+}
+
+void
+ChronoShareGui::startBackend()
+{
+  if (m_watcher != 0 && m_dispatcher != 0)
+  {
+    return;
+  }
+
   m_dispatcher = new Dispatcher (m_username.toStdString (), m_sharedFolderName.toStdString (),
                                  m_dirPath.toStdString (), make_shared<CcnxWrapper> ());
 
@@ -239,6 +254,8 @@
 
   saveSettings();
   this->hide();
+
+  startBackend();
 }
 
 void ChronoShareGui::openFileDialog()
@@ -277,6 +294,8 @@
 {
   //simple for now
   this->show();
+  this->raise();
+  this->activateWindow();
 }
 
 bool ChronoShareGui::loadSettings()