Mercurial > hg > easyhg
comparison settingsdialog.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)
author | Chris Cannam |
---|---|
date | Fri, 24 Dec 2010 13:14:45 +0000 |
parents | 731aef59d5f4 |
children | e67bd8abc3e3 |
comparison
equal
deleted
inserted
replaced
194:5ca49523892f | 195:ff0d76dcb3b8 |
---|---|
41 void accept(); | 41 void accept(); |
42 | 42 |
43 private: | 43 private: |
44 QLineEdit *m_nameEdit; | 44 QLineEdit *m_nameEdit; |
45 QLineEdit *m_emailEdit; | 45 QLineEdit *m_emailEdit; |
46 QLabel *m_hgPathLabel; | 46 QLineEdit *m_hgPathLabel; |
47 QLabel *m_diffPathLabel; | 47 QLineEdit *m_diffPathLabel; |
48 QLabel *m_mergePathLabel; | 48 QLineEdit *m_mergePathLabel; |
49 QLabel *m_editPathLabel; | 49 QLineEdit *m_editPathLabel; |
50 | 50 |
51 QCheckBox *m_useExtension; | 51 QCheckBox *m_useExtension; |
52 QLabel *m_extensionPathLabel; | 52 QLineEdit *m_extensionPathLabel; |
53 | 53 |
54 QPushButton *m_ok; | 54 QPushButton *m_ok; |
55 | 55 |
56 void browseFor(QString, QLabel *); | 56 void browseFor(QString, QLineEdit *); |
57 }; | 57 }; |
58 | 58 |
59 #endif | 59 #endif |