From bd9e6617827818fd043452c08c606f07b78014a0 Mon Sep 17 00:00:00 2001 From: toma Date: Wed, 25 Nov 2009 17:56:58 +0000 Subject: 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 --- cervisia/mergedlg.h | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 cervisia/mergedlg.h (limited to 'cervisia/mergedlg.h') diff --git a/cervisia/mergedlg.h b/cervisia/mergedlg.h new file mode 100644 index 00000000..bd4464c1 --- /dev/null +++ b/cervisia/mergedlg.h @@ -0,0 +1,65 @@ +/* + * Copyright (C) 1999-2002 Bernd Gehrmann + * bernd@mail.berlios.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 MERGEDLG_H +#define MERGEDLG_H + + +#include + + +class QComboBox; +class QPushButton; +class QRadioButton; +class CvsService_stub; + + +class MergeDialog : public KDialogBase +{ + Q_OBJECT + +public: + MergeDialog( CvsService_stub* service, + QWidget *parent=0, const char *name=0 ); + + bool byBranch() const; + QString branch() const; + QString tag1() const; + QString tag2() const; + +private slots: + void toggled(); + void tagButtonClicked(); + void branchButtonClicked(); + +private: + CvsService_stub* cvsService; + + QRadioButton *bybranch_button, *bytags_button; + QComboBox *branch_combo, *tag1_combo, *tag2_combo; + QPushButton *tag_button, *branch_button; +}; + +#endif + + +// Local Variables: +// c-basic-offset: 4 +// End: -- cgit v1.2.1