Merge remote branch 'hef/master'

Conflicts: mainwindow.ui
bdenne2 · Dec 2, 2010 · 6196cc1 · 6196cc1
2 parents 1e89ceb + 57aa42a
commit 6196cc1
Show file tree

Hide file tree

Showing 6 changed files with 110 additions and 73 deletions.
diff --git a/gitcommand.cpp b/gitcommand.cpp
@@ -8,7 +8,8 @@ GitCommand::GitCommand(QObject *parent) :
     defaultArgs(new QStringList),
     repo(),
     gitStatusProcess(new QProcess),
-    gitLSIgnoredProcess(new QProcess)
+    gitLSIgnoredProcess(new QProcess),
+    gitAddProcess(new QProcess)
 {
     connect(gitStatusProcess, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(statusOutput(int, QProcess::ExitStatus)));
     connect(gitLSIgnoredProcess, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(lsIgnoredOutput(int, QProcess::ExitStatus)));
@@ -18,6 +19,7 @@ GitCommand::~GitCommand()
     delete defaultArgs;
     delete gitStatusProcess;
     delete gitLSIgnoredProcess;
+    delete gitAddProcess;
 }
 void GitCommand::status()
 {
@@ -53,6 +55,17 @@ void GitCommand::lsIgnoredOutput(int exitCode, QProcess::ExitStatus exitStatus)
     QStringList fileList = resultString.split('\n',QString::SkipEmptyParts);
     emit lsIgnored(fileList);
 }
+void GitCommand::add(QString filename)
+{
+    QSettings settings;
+    QString proc = settings.value("gitPath").toString();
+    QStringList args = *defaultArgs;
+    args << "add" << filename;
+    gitAddProcess->start(proc, args);
+    gitAddProcess->waitForFinished(5000);
+
+}
+
 void GitCommand::setRepo(QString repo)
 {
     *defaultArgs = QStringList() << "--git-dir" << repo + "/.git" << "--work-tree" << repo;

diff --git a/gitcommand.h b/gitcommand.h
@@ -17,12 +17,14 @@ class GitCommand : public QObject
     ~GitCommand();
     void status();
     void lsIgnored();
+    void add(QString filename);
 
 private:
     QStringList* defaultArgs;
     QString repo;
     QProcess* gitStatusProcess;
     QProcess* gitLSIgnoredProcess;
+    QProcess* gitAddProcess;
 
 signals:
     void status(QStringList files);

diff --git a/mainwindow.cpp b/mainwindow.cpp
@@ -111,10 +111,18 @@ void MainWindow::updateIgnoredModel(QStringList files)
 
 void MainWindow::on_gitAddButton_clicked()
 {
-    //ui->git
-    //QModelIndexList *indexList = ui->changedFileslistView->selectedIndexes();
-    /* (int i=0; i < indexList->count(); ++i)
+    QItemSelectionModel* selectionModel = ui->changedFileslistView->selectionModel();
+    QItemSelection itemSelection = selectionModel->selection();
+    QModelIndexList indexList = itemSelection.indexes();
+    for(int i=0; i < indexList.count(); ++i)
     {
-        indexList->at(i);
-    } */
+        QString filename = QString(indexList.at(i).data().toString());
+        gitCommand->add( filename );
+        ui->statusBar->showMessage(filename,5000);
+    }
+    reload();
+}
+void MainWindow::reload()
+{
+    gitCommand->status();
 }
diff --git a/mainwindow.h b/mainwindow.h
@@ -49,6 +49,7 @@ private slots:
     void activateExistingProjectWizard();
     void activateShareProjectWizard();
     void updateIgnoredModel(QStringList);
+    void reload();
 };
 
 #endif // MAINWINDOW_H
diff --git a/mainwindow.ui b/mainwindow.ui
@@ -168,19 +168,6 @@ p, li { white-space: pre-wrap; }
           </widget>
          </widget>
          <widget class="QPushButton" name="gitIgnoreButton">
-          <property name="geometry">
-           <rect>
-            <x>150</x>
-            <y>90</y>
-            <width>93</width>
-            <height>27</height>
-           </rect>
-          </property>
-          <property name="text">
-           <string>-----&gt;</string>
-          </property>
-         </widget>
-         <widget class="QPushButton" name="pushButton_3">
           <property name="geometry">
            <rect>
             <x>170</x>
@@ -206,7 +193,7 @@ p, li { white-space: pre-wrap; }
            <bool>true</bool>
           </property>
          </widget>
-         <widget class="QPushButton" name="topArrow">
+         <widget class="QPushButton" name="gitAddButton">
           <property name="geometry">
            <rect>
             <x>170</x>