summaryrefslogtreecommitdiffstats
path: root/cervisia/resolvedlg.h
diff options
context:
space:
mode:
authortoma <toma@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2009-11-25 17:56:58 +0000
committertoma <toma@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2009-11-25 17:56:58 +0000
commitbd9e6617827818fd043452c08c606f07b78014a0 (patch)
tree425bb4c3168f9c02f10150f235d2cb998dcc6108 /cervisia/resolvedlg.h
downloadtdesdk-bd9e6617827818fd043452c08c606f07b78014a0.tar.gz
tdesdk-bd9e6617827818fd043452c08c606f07b78014a0.zip
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
Diffstat (limited to 'cervisia/resolvedlg.h')
-rw-r--r--cervisia/resolvedlg.h98
1 files changed, 98 insertions, 0 deletions
diff --git a/cervisia/resolvedlg.h b/cervisia/resolvedlg.h
new file mode 100644
index 00000000..1cee22b7
--- /dev/null
+++ b/cervisia/resolvedlg.h
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 1999-2002 Bernd Gehrmann
+ * bernd@mail.berlios.de
+ * Copyright (c) 2003-2004 Christian Loose <christian.loose@hamburg.de>
+ *
+ * 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 RESOLVEDLG_H
+#define RESOLVEDLG_H
+
+
+#include <kdialogbase.h>
+
+#include <qptrlist.h>
+#include "diffview.h"
+
+
+class QLabel;
+class QTextCodec;
+class KConfig;
+class ResolveItem;
+
+
+class ResolveDialog : public KDialogBase
+{
+ Q_OBJECT
+
+public:
+ enum ChooseType { ChA, ChB, ChAB, ChBA, ChEdit };
+
+ explicit ResolveDialog( KConfig& cfg, QWidget *parent=0, const char *name=0 );
+ virtual ~ResolveDialog();
+
+ bool parseFile(const QString &name);
+
+protected:
+ virtual void keyPressEvent(QKeyEvent *e);
+
+private slots:
+ void backClicked();
+ void forwClicked();
+ void aClicked();
+ void bClicked();
+ void abClicked();
+ void baClicked();
+ void editClicked();
+ void saveClicked();
+ void saveAsClicked();
+
+private:
+ void updateNofN();
+ void updateHighlight(int newitem);
+ void choose(ChooseType ch);
+ void chooseEdit();
+ void saveFile(const QString &name);
+ QString readFile();
+ void addToMergeAndVersionA(const QString& line, DiffView::DiffType type,
+ int& lineNo);
+ void addToVersionB(const QString& line, DiffView::DiffType type, int& lineNo);
+ void updateMergedVersion(ResolveItem* item, ChooseType chosen);
+ QString contentVersionA(const ResolveItem *item);
+ QString contentVersionB(const ResolveItem *item);
+
+ QLabel *nofnlabel;
+ QPushButton *backbutton, *forwbutton;
+ QPushButton *abutton, *bbutton, *abbutton, *babutton, *editbutton;
+ DiffView *diff1, *diff2, *merge;
+
+ QPtrList<ResolveItem> items;
+ QString fname;
+ QTextCodec *fcodec;
+ int markeditem;
+ KConfig& partConfig;
+
+ QString m_contentMergedVersion;
+};
+
+
+#endif
+
+
+// Local Variables:
+// c-basic-offset: 4
+// End: