diff filestatuswidget.h @ 307:5b4aa1c24407 new-branches-with-status-outside-tabs

Merge branch status_outside_tabs into branch new-branches, and make a new branch

--- a/filestatuswidget.h	Wed Feb 09 12:03:15 2011 +0000
+++ b/filestatuswidget.h	Mon Feb 28 13:09:37 2011 +0000
@@ -27,7 +27,6 @@
 class QListWidget;
 class QPushButton;
 class QFileInfo;
-class ClickableLabel;
 class QCheckBox;
 
 class FileStatusWidget : public QWidget
@@ -38,16 +37,10 @@
     FileStatusWidget(QWidget *parent = 0);
     ~FileStatusWidget();
 
-    QString localPath() const { return m_localPath; }
+    QString localPath() const;
     void setLocalPath(QString p);
 
-    QString remoteURL() const { return m_remoteURL; }
-    void setRemoteURL(QString u);
-
-    QString state() const { return m_state; }
-    void setState(QString b);
-
-    FileStates fileStates() const { return m_fileStates; }
+    FileStates fileStates() const;
     void setFileStates(FileStates sp);
 
     bool haveChangesToCommit() const;
@@ -80,18 +73,9 @@
 
 private slots:
     void itemSelectionChanged();
-    void openButtonClicked();
 
 private:
     QString m_localPath;
-    ClickableLabel *m_openButton;
-
-    QString m_remoteURL;
-    QLabel *m_remoteURLLabel;
-
-    QString m_state;
-    QLabel *m_stateLabel;
-    
     QLabel *m_noModificationsLabel;
 
     QCheckBox *m_showAllFiles;
@@ -112,7 +96,6 @@
 
     void layoutBoxesGridly(int count);
     void layoutBoxesLinearly();
-    void updateStateLabel();
     void setNoModificationsLabelText();
     QString labelFor(FileStates::State, bool addHighlightExplanation = false);
     void setLabelFor(QWidget *w, FileStates::State, bool addHighlightExplanation);