view incomingdialog.h @ 195:ff0d76dcb3b8

* Don't close proc input on finished() -- causes crash on program failure on Windows
 * Use merge binary from settings, even if empty -- sometimes user may wish to set an empty string to avoid having an external merge program
 * Revert labels to line edits in settings dialog, for a similar reason (permit setting empty value)
 * Avoid showing hard hyphens on Windows, they don't look right
 * Use preformatted text for merge outcome dialog (but format3 would be better)

/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */

/*
    EasyMercurial

    Based on hgExplorer by Jari Korhonen
    Copyright (c) 2010 Jari Korhonen
    Copyright (c) 2010 Chris Cannam
    Copyright (c) 2010 Queen Mary, University of London

    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.  See the file
    COPYING included with this distribution for more information.
*/

#ifndef INCOMING_DIALOG_H
#define INCOMING_DIALOG_H

#include <QDialog>

class IncomingDialog : public QDialog
{
    Q_OBJECT

public:
    IncomingDialog(QWidget *parent, QString incoming);
};

#endif