diff 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)

--- a/settingsdialog.h	Mon Dec 20 22:39:45 2010 +0000
+++ b/settingsdialog.h	Fri Dec 24 13:14:45 2010 +0000
@@ -43,17 +43,17 @@
 private:
     QLineEdit *m_nameEdit;
     QLineEdit *m_emailEdit;
-    QLabel *m_hgPathLabel;
-    QLabel *m_diffPathLabel;
-    QLabel *m_mergePathLabel;
-    QLabel *m_editPathLabel;
+    QLineEdit *m_hgPathLabel;
+    QLineEdit *m_diffPathLabel;
+    QLineEdit *m_mergePathLabel;
+    QLineEdit *m_editPathLabel;
 
     QCheckBox *m_useExtension;
-    QLabel *m_extensionPathLabel;
+    QLineEdit *m_extensionPathLabel;
 
     QPushButton *m_ok;
 
-    void browseFor(QString, QLabel *);
+    void browseFor(QString, QLineEdit *);
 };
 
 #endif