Merge branch 'scriptsDir' of git://github.com/Anna-/trikRuntime

trikset · Sep 26, 2014 · 3a4d540 · 3a4d540
2 parents 9cb8950 + 1d8ff82
commit 3a4d540
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/trikGui/controller.cpp b/trikGui/controller.cpp
@@ -31,6 +31,7 @@ Controller::Controller(QString const &configPath, QString const &startDirPath)
 	, mScriptRunner(mBrick, startDirPath)
 	, mCommunicator(mScriptRunner)
 	, mRunningWidget(NULL)
+	, mStartDirPath(startDirPath)
 {
 	connect(&mScriptRunner, SIGNAL(completed(QString)), this, SLOT(scriptExecutionCompleted(QString)));
 
@@ -77,6 +78,11 @@ trikControl::Brick &Controller::brick()
 	return mBrick;
 }
 
+QString Controller::startDirPath()
+{
+	return mStartDirPath;
+}
+
 void Controller::scriptExecutionCompleted(QString const &error)
 {
 	if (mRunningWidget && error.isEmpty()) {

diff --git a/trikGui/controller.h b/trikGui/controller.h
@@ -45,6 +45,8 @@ class Controller : public QObject
 	/// Returns reference to Brick object, which provides access to low-level robot functionality.
 	trikControl::Brick &brick();
 
+	QString startDirPath();
+
 private slots:
 	void scriptExecutionCompleted(QString const &error);
 
@@ -57,6 +59,7 @@ private slots:
 	trikCommunicator::TrikCommunicator mCommunicator;
 
 	RunningWidget *mRunningWidget;  // Has ownership.
+	QString const &mStartDirPath;
 };
 
 }
diff --git a/trikGui/fileManagerWidget.cpp b/trikGui/fileManagerWidget.cpp
@@ -22,12 +22,20 @@
 #include <QtGui/QKeyEvent>
 
 using namespace trikGui;
+QString const scriptsDirName = "scripts";
 
 FileManagerWidget::FileManagerWidget(Controller &controller, QWidget *parent)
 	: TrikGuiDialog(parent)
 	, mController(controller)
 {
-	mFileSystemModel.setRootPath(QDir::rootPath());
+	mRootDirPath = mController.startDirPath() + scriptsDirName;
+
+	QDir::setCurrent(mController.startDirPath());
+	QDir dir;
+	dir.mkdir(scriptsDirName);
+	QDir::setCurrent(mRootDirPath);
+
+	mFileSystemModel.setRootPath(mRootDirPath);
 	mFileSystemModel.setFilter(QDir::AllEntries | QDir::Hidden | QDir::System | QDir::NoDot);
 
 	connect(&mFileSystemModel
@@ -93,7 +101,7 @@ void FileManagerWidget::showCurrentDir()
 	mCurrentPathLabel.setText(QDir::currentPath());
 
 	QDir::Filters filters = mFileSystemModel.filter();
-	if (QDir::currentPath() == QDir::rootPath()) {
+	if (QDir::currentPath() == mRootDirPath) {
 		filters |= QDir::NoDotDot;
 	} else {
 		filters &= ~QDir::NoDotDot;

diff --git a/trikGui/fileManagerWidget.h b/trikGui/fileManagerWidget.h
@@ -68,6 +68,7 @@ private slots:
 	QListView mFileSystemView;
 	QFileSystemModel mFileSystemModel;
 	Controller &mController;
+	QString mRootDirPath;
 };
 
 }