comparison changeset.h @ 125:63c2f3f61c79

* Add Incoming dialog and better layouts for dialogs generally

 class Changeset : public QObject
 {
     Q_OBJECT
 
     Q_PROPERTY(QString id READ id WRITE setId NOTIFY idChanged STORED true);
-    Q_PROPERTY(QString author READ author WRITE setAuthor NOTIFY authorChanged STORED true);
+    Q_PROPERTY(QString user READ user WRITE setUser NOTIFY userChanged STORED true);
     Q_PROPERTY(QString branch READ branch WRITE setBranch NOTIFY branchChanged STORED true);
     Q_PROPERTY(QString tag READ tag WRITE setTag NOTIFY tagChanged STORED true);
     Q_PROPERTY(QString datetime READ datetime WRITE setDatetime NOTIFY datetimeChanged STORED true);
     Q_PROPERTY(qulonglong timestamp READ timestamp WRITE setTimestamp NOTIFY timestampChanged STORED true);
     Q_PROPERTY(QString age READ age WRITE setAge NOTIFY ageChanged STORED true);

 public:
     Changeset() : QObject() { }
     explicit Changeset(const LogEntry &e);
 
     QString id() const { return m_id; }
-    QString author() const { return m_author; }
+    QString user() const { return m_user; }
     QString branch() const { return m_branch; }
     QString tag() const { return m_tag; }
     QString datetime() const { return m_datetime; }
     qulonglong timestamp() const { return m_timestamp; }
     QString age() const { return m_age; }

 
     int number() const {
         return id().split(':')[0].toInt();
     }
 
-    QString authorName() const {
-	QString a = author();
+    QString userName() const {
+	QString a = user();
 	return a.replace(QRegExp("\\s*<[^>]*>"), "");
     }
 
     QString date() const {
         return datetime().split(' ')[0];

             csets.push_back(new Changeset(e));
         }
         return csets;
     }
 
+    static QString getLogTemplate();
+
+    QString formatHtml();
+    
 signals:
     void idChanged(QString id);
-    void authorChanged(QString author);
+    void userChanged(QString user);
     void branchChanged(QString branch);
     void tagChanged(QString tag);
     void datetimeChanged(QString datetime);
     void timestampChanged(qulonglong timestamp);
     void ageChanged(QString age);

     void childrenChanged(QStringList children);
     void commentChanged(QString comment);
 
 public slots:
     void setId(QString id) { m_id = id; emit idChanged(id); }
-    void setAuthor(QString author) { m_author = author; emit authorChanged(author); }
+    void setUser(QString user) { m_user = user; emit userChanged(user); }
     void setBranch(QString branch) { m_branch = branch; emit branchChanged(branch); }
     void setTag(QString tag) { m_tag = tag; emit tagChanged(tag); }
     void setDatetime(QString datetime) { m_datetime = datetime; emit datetimeChanged(datetime); }
     void setTimestamp(qulonglong timestamp) { m_timestamp = timestamp; emit timestampChanged(timestamp); }
     void setAge(QString age) { m_age = age; emit ageChanged(age); }

     void addChild(QString child) { m_children.push_back(child); emit childrenChanged(m_children); }
     void setComment(QString comment) { m_comment = comment; emit commentChanged(comment); }
 
 private:
     QString m_id;
-    QString m_author;
+    QString m_user;
     QString m_branch;
     QString m_tag;
     QString m_datetime;
     qulonglong m_timestamp;
     QString m_age;