comparison settingsdialog.cpp @ 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)

 
     row = 0;
 
     pathsLayout->addWidget(new QLabel(tr("Mercurial (hg) program:")), row, 0);
 
-    m_hgPathLabel = new QLabel();
+    m_hgPathLabel = new QLineEdit();
     m_hgPathLabel->setText(settings.value("hgbinary").toString());
     pathsLayout->addWidget(m_hgPathLabel, row, 2);
 
     QPushButton *browse = new QPushButton(tr("Browse..."));
     pathsLayout->addWidget(browse, row++, 1);
     connect(browse, SIGNAL(clicked()), this, SLOT(hgPathBrowse()));
 
     pathsLayout->addWidget(new QLabel(tr("External diff program:")), row, 0);
 
-    m_diffPathLabel = new QLabel();
+    m_diffPathLabel = new QLineEdit();
     m_diffPathLabel->setText(settings.value("extdiffbinary").toString());
     pathsLayout->addWidget(m_diffPathLabel, row, 2);
 
     browse = new QPushButton(tr("Browse..."));
     pathsLayout->addWidget(browse, row++, 1);
     connect(browse, SIGNAL(clicked()), this, SLOT(diffPathBrowse()));
     
     pathsLayout->addWidget(new QLabel(tr("External file-merge program:")), row, 0);
 
-    m_mergePathLabel = new QLabel();
+    m_mergePathLabel = new QLineEdit();
     m_mergePathLabel->setText(settings.value("mergebinary").toString());
     pathsLayout->addWidget(m_mergePathLabel, row, 2);
 
     browse = new QPushButton(tr("Browse..."));
     pathsLayout->addWidget(browse, row++, 1);
     connect(browse, SIGNAL(clicked()), this, SLOT(mergePathBrowse()));
 
     pathsLayout->addWidget(new QLabel(tr("External text editor:")), row, 0);
 
-    m_editPathLabel = new QLabel();
+    m_editPathLabel = new QLineEdit();
     m_editPathLabel->setText(settings.value("editorbinary").toString());
     pathsLayout->addWidget(m_editPathLabel, row, 2);
 
     browse = new QPushButton(tr("Browse..."));
     pathsLayout->addWidget(browse, row++, 1);

     
     settings.beginGroup("Locations");
 
     pathsLayout->addWidget(new QLabel(tr("EasyHg Mercurial extension:")), row, 0);
 
-    m_extensionPathLabel = new QLabel();
+    m_extensionPathLabel = new QLineEdit();
     m_extensionPathLabel->setText(settings.value("extensionpath").toString());
     pathsLayout->addWidget(m_extensionPathLabel, row, 2);
 
     browse = new QPushButton(tr("Browse..."));
     pathsLayout->addWidget(browse, row++, 1);

 {
     browseFor(tr("EasyHg Mercurial extension"), m_extensionPathLabel);
 }
 
 void
-SettingsDialog::browseFor(QString title, QLabel *edit)
+SettingsDialog::browseFor(QString title, QLineEdit *edit)
 {
     QString origin = edit->text();
 
     if (origin == "") {
 #ifdef Q_OS_WIN32