Differential D4593 Diff 11319 projectbuilders/makebuilder/makebuilderpreferences.cpp

Changeset View

Standalone View

View Options

projectbuilders/makebuilder/makebuilderpreferences.cpp

Show All 26 Lines
27 27​
28using namespace KDevelop; 28​using namespace KDevelop;
29 29​
30MakeBuilderPreferences::MakeBuilderPreferences(IPlugin* plugin, const ProjectConfigOptions& options, QWidget* parent) 30​MakeBuilderPreferences::MakeBuilderPreferences(IPlugin* plugin, const ProjectConfigOptions& options, QWidget* parent)
31 : ProjectConfigPage<MakeBuilderSettings>(plugin, options, parent) 31​ : ProjectConfigPage<MakeBuilderSettings>(plugin, options, parent)
32{ 32​{
33 m_prefsUi = new Ui::MakeConfig; 33​ m_prefsUi = new Ui::MakeConfig;
34 m_prefsUi->setupUi(this); 34​ m_prefsUi->setupUi(this);
35 connect(m_prefsUi->makeBinary, &KUrlRequester::textChanged, 35​ connect(m_prefsUi->makeExecutable, &KUrlRequester::textChanged,
36 this, &MakeBuilderPreferences::changed); 36​ this, &MakeBuilderPreferences::changed);
37 connect(m_prefsUi->makeBinary, &KUrlRequester::urlSelected, 37​ connect(m_prefsUi->makeExecutable, &KUrlRequester::urlSelected,
38 this, &MakeBuilderPreferences::changed); 38​ this, &MakeBuilderPreferences::changed);
39 connect(m_prefsUi->configureEnvironment, &EnvironmentConfigureButton::environmentConfigured, 39​ connect(m_prefsUi->configureEnvironment, &EnvironmentConfigureButton::environmentConfigured,
40 this, &MakeBuilderPreferences::changed); 40​ this, &MakeBuilderPreferences::changed);
41 41​
42 m_prefsUi->configureEnvironment->setSelectionWidget( m_prefsUi->kcfg_environmentProfile ); 42​ m_prefsUi->configureEnvironment->setSelectionWidget( m_prefsUi->kcfg_environmentProfile );
43} 43​}
44 44​
45void MakeBuilderPreferences::reset() 45​void MakeBuilderPreferences::reset()
46{ 46​{
47 ProjectConfigPage::reset(); 47​ ProjectConfigPage::reset();
48 QSignalBlocker sigBlock(this); // don't emit changed signal from m_prefsUi->makeBinary 48​ QSignalBlocker sigBlock(this); // don't emit changed signal from m_prefsUi->makeExecutable
49 m_prefsUi->makeBinary->setText(MakeBuilderSettings::self()->makeBinary()); 49​ m_prefsUi->makeExecutable->setText(MakeBuilderSettings::self()->makeExecutable());
50} 50​}
51 51​
52void MakeBuilderPreferences::apply() 52​void MakeBuilderPreferences::apply()
53{ 53​{
54 MakeBuilderSettings::self()->setMakeBinary(m_prefsUi->makeBinary->text()); 54​ MakeBuilderSettings::self()->setMakeExecutable(m_prefsUi->makeExecutable->text());
55 MakeBuilderSettings::self()->save(); // TODO: is this needed? KConfigDialogManager should end up calling it 55​ MakeBuilderSettings::self()->save(); // TODO: is this needed? KConfigDialogManager should end up calling it
56 ProjectConfigPage::apply(); 56​ ProjectConfigPage::apply();
57} 57​}
58 58​
59void MakeBuilderPreferences::defaults() 59​void MakeBuilderPreferences::defaults()
60{ 60​{
61 MakeBuilderSettings::self()->setDefaults(); 61​ MakeBuilderSettings::self()->setDefaults();
62 m_prefsUi->makeBinary->setText(MakeBuilderSettings::self()->makeBinary()); 62​ m_prefsUi->makeExecutable->setText(MakeBuilderSettings::self()->makeExecutable());
63 ProjectConfigPage::defaults(); 63​ ProjectConfigPage::defaults();
64} 64​}
65 65​
66MakeBuilderPreferences::~MakeBuilderPreferences() 66​MakeBuilderPreferences::~MakeBuilderPreferences()
67{ 67​{
68 delete m_prefsUi; 68​ delete m_prefsUi;
69} 69​}
70 70​
71QString MakeBuilderPreferences::standardMakeCommand() 71​QString MakeBuilderPreferences::standardMakeExecutable()
72{ 72​{
73#ifdef Q_OS_WIN 73​#ifdef Q_OS_WIN
74 if (!QStandardPaths::findExecutable("make").isEmpty()) 74​ if (!QStandardPaths::findExecutable("make").isEmpty())
75 return QStringLiteral("make"); 75​ return QStringLiteral("make");
76 if (!QStandardPaths::findExecutable("mingw32-make").isEmpty()) 76​ if (!QStandardPaths::findExecutable("mingw32-make").isEmpty())
77 return QStringLiteral("mingw32-make"); 77​ return QStringLiteral("mingw32-make");
78 return QStringLiteral("nmake"); 78​ return QStringLiteral("nmake");
79#else 79​#else
Show All 18 Lines