Mercurial > hg > easyhg
comparison confirmcommentdialog.cpp @ 237:c9a7e4ec2f78
* Try to do the right thing when completely reverting a merge (forget that the merge took place)
* When trying to clone from remote repo to existing local dir, offer to create a subdir instead
* Tidy up clone-successful notification
* Add a note to commit and revert confirmation dialogs to tell user if they are committing/reverting only a subset of available files
author | Chris Cannam |
---|---|
date | Mon, 10 Jan 2011 12:44:03 +0000 |
parents | 5ca49523892f |
children | 8fd71f570884 |
comparison
equal
deleted
inserted
replaced
236:960b782f0a64 | 237:c9a7e4ec2f78 |
---|---|
35 setWindowTitle(title); | 35 setWindowTitle(title); |
36 | 36 |
37 QGridLayout *layout = new QGridLayout; | 37 QGridLayout *layout = new QGridLayout; |
38 setLayout(layout); | 38 setLayout(layout); |
39 QLabel *label = new QLabel(introText); | 39 QLabel *label = new QLabel(introText); |
40 label->setWordWrap(true); | |
40 layout->addWidget(label, 0, 0); | 41 layout->addWidget(label, 0, 0); |
41 | 42 |
42 m_textEdit = new QTextEdit; | 43 m_textEdit = new QTextEdit; |
43 m_textEdit->setAcceptRichText(false); | 44 m_textEdit->setAcceptRichText(false); |
44 m_textEdit->document()->setPlainText(initialComment); | 45 m_textEdit->document()->setPlainText(initialComment); |