comparison src/settingsdialog.h @ 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)
author Sam Izzo <sam@humbug.net>
date Mon, 27 Aug 2012 01:26:57 +1000
parents 5dc24f89b791
children 58ac1b197666
comparison
equal deleted inserted replaced
632:f9fd48e55af1 633:db62a0cb3037
83 83
84 #ifdef NOT_IMPLEMENTED_YET 84 #ifdef NOT_IMPLEMENTED_YET
85 QComboBox *m_workHistoryArrangement; 85 QComboBox *m_workHistoryArrangement;
86 #endif 86 #endif
87 87
88 QCheckBox *m_multipleDiffInstances;
89
88 QPushButton *m_extensionBrowse; 90 QPushButton *m_extensionBrowse;
89 QPushButton *m_ok; 91 QPushButton *m_ok;
90 92
91 bool m_presentationChanged; 93 bool m_presentationChanged;
92 94