M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
02090095
2025-01-11 22:48:00 +03:00
parent 8b2fb67422
commit 7a06c2ce2b
10 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/_VisualDVM/Passes/All/Precompilation.java
View File

@@ -94,7 +94,7 @@ public class Precompilation extends Pass<db_project_info> {
target = Global.mainModule.getProject();
if (Utils_.isWindows()) {
//--
makepath = Global.mainModule.getDb().settings.get(SettingName.LocalMakePathWindows).toString();
makepath = Global.properties.LocalMakePathWindows;
if (makepath.isEmpty()) {
Log.Writeln_("Не задан путь к make.exe.\n " +
"Укажите его в меню глобальных настроек." +
@@ -185,7 +185,7 @@ public class Precompilation extends Pass<db_project_info> {
protected void body() throws Exception {
if (Utils_.isWindows()) {
name_to_kill = "make.exe";
StartProcess(Utils_.DQuotes((Global.mainModule.getDb()).settings.get(SettingName.LocalMakePathWindows).Value) + " -j " + (Global.mainModule.getDb()).settings.get(SettingName.Kernels).toString(),
StartProcess(Utils_.DQuotes(Global.properties.LocalMakePathWindows) + " -j " + (Global.mainModule.getDb()).settings.get(SettingName.Kernels).toString(),
target.compilation_maxtime);
} else
StartProcess("make -j " + (Global.mainModule.getDb()).settings.get(SettingName.Kernels).toString(), target.compilation_maxtime);

6
src/_VisualDVM/Passes/All/UpdateProperty.java
View File

@@ -35,6 +35,12 @@ public class UpdateProperty extends Pass<Object> {
return true;
}
switch (name){
case "LocalMakePathWindows":
fileChooser.setTitle(description);
File file = fileChooser.ShowDialog();
if (file != null)
newValue = file.getAbsolutePath();
break;
case "BugReportsAgeLimit":
if (sliderNumberForm.ShowDialog(description, oldValue, 1, 12))
newValue=sliderNumberForm.Result;

6
src/_VisualDVM/Passes/All/UpdateSetting.java
View File

@@ -31,12 +31,6 @@ public class UpdateSetting extends Pass<DBSetting> {
break;
case StringField:
switch (target.Name) {
case LocalMakePathWindows:
fileChooser.setTitle(target.Name.getDescription());
File file = fileChooser.ShowDialog();
if (file != null)
NewValue = file.getAbsolutePath();
break;
default:
TextFieldDialog ff = new TextFieldDialog();
if (ff.ShowDialog(target.Name.getDescription(), target.Value)) {