comparison filestatuswidget.cpp @ 106:729438d70af8

* Retrieve and store current branch and heads; some refactoring

     ++row;
     layout->addWidget(new QLabel(tr("Remote:")), row, 0);
     m_remoteURLLabel = new QLabel;
     layout->addWidget(m_remoteURLLabel, row, 1);
 
+    ++row;
+    layout->addWidget(new QLabel(tr("Branch:")), row, 0);
+    m_branchLabel = new QLabel;
+    layout->addWidget(m_branchLabel, row, 1);
+
     layout->setColumnStretch(1, 20);
+
+    layout->addWidget(new QLabel("<qt><hr></qt>"), ++row, 0, 1, 2);
 
     m_simpleLabels[FileStates::Clean] = tr("Unmodified:");
     m_simpleLabels[FileStates::Modified] = tr("Modified:");
     m_simpleLabels[FileStates::Added] = tr("Added:");
     m_simpleLabels[FileStates::Removed] = tr("Removed:");

         QWidget *box = new QWidget;
         QGridLayout *boxlayout = new QGridLayout;
         boxlayout->setMargin(0);
         box->setLayout(boxlayout);
 
-        boxlayout->addItem(new QSpacerItem(5, 8), 0, 0);
+        boxlayout->addItem(new QSpacerItem(5, 5), 0, 0);
 
         boxlayout->addWidget(new QLabel(labelFor(s)), 1, 0);
 
         QListWidget *w = new QListWidget;
         m_stateListMap[s] = w;

     m_fileStates = p;
     updateWidgets();
 }
 
 void
+FileStatusWidget::setBranch(QString b)
+{
+    m_branch = b;
+    m_branchLabel->setText(b);
+}
+
+void
 FileStatusWidget::updateWidgets()
 {
     QDateTime lastInteractionTime;
     if (m_dateReference) {
         lastInteractionTime = m_dateReference->lastModified();