comparison src/settingsdialog.cpp @ 633:db62a0cb3037

* Added setting to specify that diff command should be run once for each selected file, rather than passing all file names to diff command (p4merge doesn't like being given many files)

     pathsLayout->addWidget(m_diffPathLabel, row, 2);
 
     browse = new QPushButton(tr("Browse..."));
     pathsLayout->addWidget(browse, row++, 1);
     connect(browse, SIGNAL(clicked()), this, SLOT(diffPathBrowse()));
-    
+
+    m_multipleDiffInstances = new QCheckBox(tr("Multiple instances when multiple files are selected"));
+    pathsLayout->addWidget(m_multipleDiffInstances, row++, 2);
+
     pathsLayout->addWidget(new QLabel(tr("External file-merge program:")), row, 0);
 
     m_mergePathLabel = new QLineEdit();
     pathsLayout->addWidget(m_mergePathLabel, row, 2);
 

     m_extensionBrowse = new QPushButton(tr("Browse..."));
     pathsLayout->addWidget(m_extensionBrowse, row++, 1);
     connect(m_extensionBrowse, SIGNAL(clicked()), this, SLOT(extensionPathBrowse()));
 
     pathsLayout->setRowStretch(row, 20);
+    pathsLayout->setColumnStretch(2, 20);
 
 
     reset(); // loads current defaults from settings
 
 

     settings.remove("sshbinary");
     settings.remove("extensionpath");
     settings.endGroup();
     settings.beginGroup("");
     settings.remove("useextension");
+    settings.remove("multipleDiffInstances");
     settings.endGroup();
 }
 
 void
 SettingsDialog::reset()

     m_extensionPathLabel->setText(settings.value("extensionpath").toString());
     settings.endGroup();
     settings.beginGroup("");
     m_useExtension->setChecked(settings.value("useextension", true).toBool());
     useExtension(m_useExtension->isChecked());
+    m_multipleDiffInstances->setChecked(settings.value("multipleDiffInstances", false).toBool());
     settings.endGroup();
 }
 
 void
 SettingsDialog::accept()

     settings.setValue("sshbinary", m_sshPathLabel->text());
     settings.setValue("extensionpath", m_extensionPathLabel->text());
     settings.endGroup();
     settings.beginGroup("");
     settings.setValue("useextension", m_useExtension->isChecked());
+    settings.setValue("multipleDiffInstances", m_multipleDiffInstances->isChecked());
     settings.endGroup();
     QDialog::accept();
 }