Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.

BUG:215923


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 78 insertions, 0 deletions

diff --git a/cervisia/protocolview.h b/cervisia/protocolview.h
new file mode 100644
index 00000000..0e0390d2
--- /dev/null
+++ b/cervisia/protocolview.h
@@ -0,0 +1,78 @@
+/*
+ *  Copyright (C) 1999-2002 Bernd Gehrmann
+ *                          bernd@mail.berlios.de
+ *  Copyright (c) 2003-2004 Christian Loose <christian.loose@kdemail.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+
+#ifndef PROTOCOLVIEW_H
+#define PROTOCOLVIEW_H
+
+#include <qtextedit.h>
+#include <dcopobject.h>
+
+class QPoint;
+class QPopupMenu;
+class CvsJob_stub;
+
+
+class ProtocolView : public QTextEdit, public DCOPObject
+{
+    K_DCOP
+    Q_OBJECT
+
+public:
+    explicit ProtocolView(const QCString& appId, QWidget *parent=0, const char *name=0);
+    ~ProtocolView();
+
+    bool startJob(bool isUpdateJob = false);
+
+protected:
+    virtual QPopupMenu* createPopupMenu(const QPoint &pos);
+
+k_dcop:
+    void slotReceivedOutput(QString buffer);
+    void slotJobExited(bool normalExit, int exitStatus);
+
+signals:
+    void receivedLine(QString line);
+    void jobFinished(bool normalExit, int exitStatus);
+
+private slots:
+    void cancelJob();
+
+private:
+    void processOutput();
+    void appendLine(const QString &line);
+
+    QString buf;
+
+    QColor conflictColor;
+    QColor localChangeColor;
+    QColor remoteChangeColor;
+
+    CvsJob_stub* job;
+
+    bool   m_isUpdateJob;
+};
+
+#endif
+
+
+// Local Variables:
+// c-basic-offset: 4
+// End: