GUI: Add project root path to Project file -dialog.

kimmov · kimmov · commit d967151c3284 · 2010-08-21T17:08:10.000+03:00
diff --git a/gui/project.cpp b/gui/project.cpp
@@ -77,7 +77,8 @@ bool Project::Open()
 void Project::Edit()
 {
     ProjectFileDialog dlg(mFilename, mParentWidget);
-
+    QString root = mPFile->GetRootPath();
+    dlg.SetRootPath(root);
     QStringList includes = mPFile->GetIncludeDirs();
     dlg.SetIncludepaths(includes);
     QStringList defines = mPFile->GetDefines();
@@ -87,6 +88,8 @@ void Project::Edit()
     int rv = dlg.exec();
     if (rv == QDialog::Accepted)
     {
+        QString root = dlg.GetRootPath();
+        mPFile->SetRootPath(root);
         QStringList includes = dlg.GetIncludePaths();
         mPFile->SetIncludes(includes);
         QStringList defines = dlg.GetDefines();
diff --git a/gui/projectfile.ui b/gui/projectfile.ui
@@ -7,13 +7,30 @@
     <x>0</x>
     <y>0</y>
     <width>400</width>
-    <height>112</height>
+    <height>131</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Project File</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_4">
+     <item>
+      <widget class="QLabel" name="label_4">
+       <property name="text">
+        <string>Project:</string>
+       </property>
+       <property name="buddy">
+        <cstring>mEditProjectRoot</cstring>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="mEditProjectRoot"/>
+     </item>
+    </layout>
+   </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_3">
      <item>
@@ -91,6 +108,7 @@
   </layout>
  </widget>
  <tabstops>
+  <tabstop>mEditProjectRoot</tabstop>
   <tabstop>mEditPaths</tabstop>
   <tabstop>mEditIncludePaths</tabstop>
   <tabstop>mEditDefines</tabstop>
diff --git a/gui/projectfiledialog.cpp b/gui/projectfiledialog.cpp
@@ -33,6 +33,13 @@ ProjectFileDialog::ProjectFileDialog(const QString &path, QWidget *parent)
     connect(mUI.mButtons, SIGNAL(accepted()), this, SLOT(accept()));
 }
 
+QString ProjectFileDialog::GetRootPath() const
+{
+    QString root = mUI.mEditProjectRoot->text();
+    root = root.trimmed();
+    return root;
+}
+
 QStringList ProjectFileDialog::GetIncludePaths() const
 {
     QString include = mUI.mEditIncludePaths->text();
@@ -78,6 +85,11 @@ QStringList ProjectFileDialog::GetPaths() const
     return paths;
 }
 
+void ProjectFileDialog::SetRootPath(const QString &root)
+{
+    mUI.mEditProjectRoot->setText(root);
+}
+
 void ProjectFileDialog::SetIncludepaths(const QStringList &includes)
 {
     QString includestr;
diff --git a/gui/projectfiledialog.h b/gui/projectfiledialog.h
@@ -21,6 +21,7 @@
 
 #include <QDialog>
 #include <QString>
+#include <QStringList>
 
 #include "ui_projectfile.h"
 
@@ -39,6 +40,12 @@ class ProjectFileDialog : public QDialog
 public:
     ProjectFileDialog(const QString &path, QWidget *parent = 0);
 
+    /**
+    * @brief Return project root path from the dialog control.
+    * @return Project root path.
+    */
+    QString GetRootPath() const;
+
     /**
     * @brief Return include paths from the dialog control.
     * @return List of include paths.
@@ -57,6 +64,12 @@ class ProjectFileDialog : public QDialog
     */
     QStringList GetPaths() const;
 
+    /**
+    * @brief Set project root path to dialog control.
+    * @param root Project root path to set to dialog control.
+    */
+    void SetRootPath(const QString &root);
+
     /**
     * @brief Set include paths to dialog control.
     * @param includes List of include paths to set to dialog control.

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,13 @@ ProjectFileDialog::ProjectFileDialog(const QString &path, QWidget *parent)`
`33`	`33`	`connect(mUI.mButtons, SIGNAL(accepted()), this, SLOT(accept()));`
`34`	`34`	`}`
`35`	`35`
	`36`	`+QString ProjectFileDialog::GetRootPath() const`
	`37`	`+{`
	`38`	`+ QString root = mUI.mEditProjectRoot->text();`
	`39`	`+ root = root.trimmed();`
	`40`	`+ return root;`
	`41`	`+}`
	`42`	`+`
`36`	`43`	`QStringList ProjectFileDialog::GetIncludePaths() const`
`37`	`44`	`{`
`38`	`45`	`QString include = mUI.mEditIncludePaths->text();`
`@@ -78,6 +85,11 @@ QStringList ProjectFileDialog::GetPaths() const`
`78`	`85`	`return paths;`
`79`	`86`	`}`
`80`	`87`
	`88`	`+void ProjectFileDialog::SetRootPath(const QString &root)`
	`89`	`+{`
	`90`	`+ mUI.mEditProjectRoot->setText(root);`
	`91`	`+}`
	`92`	`+`
`81`	`93`	`void ProjectFileDialog::SetIncludepaths(const QStringList &includes)`
`82`	`94`	`{`
`83`	`95`	`QString includestr;`