Extended the settings dialog Reorganized the workspace management code Fixed issue where the previous current directory was in effect even in new workspaces Improved the log responsiveness on long fossil operations FossilOrigin-Name: 945c841fba73be1355611554499e68a878b95359
41 lines
672 B
C++
41 lines
672 B
C++
#ifndef SETTINGSDIALOG_H
|
|
#define SETTINGSDIALOG_H
|
|
|
|
#include <QDialog>
|
|
|
|
namespace Ui {
|
|
class SettingsDialog;
|
|
}
|
|
|
|
struct Settings
|
|
{
|
|
QString fossilPath;
|
|
QString gDiffCommand;
|
|
QString gMergeCommand;
|
|
};
|
|
|
|
|
|
class SettingsDialog : public QDialog
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
explicit SettingsDialog(QWidget *parent, Settings &_settings);
|
|
~SettingsDialog();
|
|
|
|
static bool run(QWidget *parent, Settings &_settings);
|
|
|
|
|
|
private slots:
|
|
void on_btnSelectFossil_clicked();
|
|
void on_buttonBox_accepted();
|
|
void on_btnSelectFossilGDiff_clicked();
|
|
void on_btnSelectGMerge_clicked();
|
|
|
|
private:
|
|
Ui::SettingsDialog *ui;
|
|
Settings *settings;
|
|
};
|
|
|
|
#endif // SETTINGSDIALOG_H
|