commit f3ea97a125498115a7de2ac7abd0a68f4f9ba3b1
author Zhenkai Zhu <zhenkai@cs.ucla.edu> Wed Jan 30 15:20:52 2013 -0800
committer Zhenkai Zhu <zhenkai@cs.ucla.edu> Wed Jan 30 15:50:35 2013 -0800
tree 9a37857a2bce9c50f070f4b14762e44e91bbcd88
parent f695aed21e651f4cab3030d86b1c762cfbc86bd5

add validators of input
no trailing/prefacing whitespace; no "/" as username
add change id

Change-Id: Id8b67f61eddca4fd884a58f89a99cdd9e6e0f2df

gui/chronosharegui.cpp

diff --git a/gui/chronosharegui.cpp b/gui/chronosharegui.cpp
index d1c6898..fcfb6e2 100644
--- a/gui/chronosharegui.cpp
+++ b/gui/chronosharegui.cpp
@@ -21,6 +21,7 @@
 #include "chronosharegui.h"
 #include "logging.h"
 #include "ccnx-wrapper.h"
+#include <QValidator>
 
 #include <boost/make_shared.hpp>
 
@@ -38,8 +39,18 @@
   labelUsername = new QLabel("Username");
   labelSharedFolder = new QLabel("Shared Folder Name");
   labelSharedFolderPath = new QLabel("Shared Folder Path");
+
+  QRegExp regex("(^/[^/]+)+$");
+  QValidator *prefixValidator = new QRegExpValidator(regex, this);
+
   editUsername = new QLineEdit();
+  editUsername->setValidator(prefixValidator);
+
+  QRegExp noPureWhiteSpace("^\\S+.*$");
+  QValidator *wsValidator = new QRegExpValidator(noPureWhiteSpace, this);
   editSharedFolder = new QLineEdit();
+  editSharedFolder->setValidator(wsValidator);
+
   editSharedFolderPath = new QLineEdit();
   editSharedFolderPath->setReadOnly(true);
   QPalette pal = editSharedFolderPath->palette();
@@ -217,12 +228,12 @@
 void ChronoShareGui::changeSettings()
 {
   if(!editUsername->text().isEmpty())
-    m_username = editUsername->text();
+    m_username = editUsername->text().trimmed();
   else
     editUsername->setText(m_username);
 
   if(!editSharedFolder->text().isEmpty())
-    m_sharedFolderName = editSharedFolder->text();
+    m_sharedFolderName = editSharedFolder->text().trimmed();
   else
     editSharedFolder->setText(m_sharedFolderName);