You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
62 lines
1.5 KiB
62 lines
1.5 KiB
/*
|
|
* 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 <kdialogbase.h>
|
|
|
|
|
|
class TQComboBox;
|
|
class TQPushButton;
|
|
class TQRadioButton;
|
|
class CvsService_stub;
|
|
|
|
|
|
class MergeDialog : public KDialogBase
|
|
{
|
|
Q_OBJECT
|
|
|
|
|
|
public:
|
|
MergeDialog( CvsService_stub* service,
|
|
TQWidget *parent=0, const char *name=0 );
|
|
|
|
bool byBranch() const;
|
|
TQString branch() const;
|
|
TQString tag1() const;
|
|
TQString tag2() const;
|
|
|
|
private slots:
|
|
void toggled();
|
|
void tagButtonClicked();
|
|
void branchButtonClicked();
|
|
|
|
private:
|
|
CvsService_stub* cvsService;
|
|
|
|
TQRadioButton *bybranch_button, *bytags_button;
|
|
TQComboBox *branch_combo, *tag1_combo, *tag2_combo;
|
|
TQPushButton *tag_button, *branch_button;
|
|
};
|
|
|
|
#endif
|