no message
This commit is contained in:
6
.idea/workspace.xml
generated
6
.idea/workspace.xml
generated
@@ -8,11 +8,13 @@
|
|||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
|
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingName.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingName.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingName.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingName.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateProperty.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateProperty.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSetting.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java" afterDir="false" />
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
|
|||||||
@@ -51,5 +51,6 @@
|
|||||||
"FortranWrapsOn": false,
|
"FortranWrapsOn": false,
|
||||||
"ExtensionsOn": false,
|
"ExtensionsOn": false,
|
||||||
"ComparsionDiffMergeOn": true,
|
"ComparsionDiffMergeOn": true,
|
||||||
"BugReportsAgeLimit": 4
|
"BugReportsAgeLimit": 4,
|
||||||
|
"FastAccessPassesCount": 5
|
||||||
}
|
}
|
||||||
@@ -2,7 +2,6 @@ package _VisualDVM.GlobalData.Settings;
|
|||||||
public enum SettingName {
|
public enum SettingName {
|
||||||
Undefined,
|
Undefined,
|
||||||
//--------------
|
//--------------
|
||||||
FastAccessPassesCount,
|
|
||||||
LastOpenedProjectsCount,
|
LastOpenedProjectsCount,
|
||||||
ShowFullArraysDeclarations,
|
ShowFullArraysDeclarations,
|
||||||
ShowFullTabsNames,
|
ShowFullTabsNames,
|
||||||
@@ -93,8 +92,7 @@ public enum SettingName {
|
|||||||
return "Сохранять SPF директивы при преобразованиях";
|
return "Сохранять SPF директивы при преобразованиях";
|
||||||
case PARSE_FOR_INLINE:
|
case PARSE_FOR_INLINE:
|
||||||
return "Синтаксический анализ для подстановки";
|
return "Синтаксический анализ для подстановки";
|
||||||
case FastAccessPassesCount:
|
|
||||||
return "Число проходов на панели быстрого доступа";
|
|
||||||
case LastOpenedProjectsCount:
|
case LastOpenedProjectsCount:
|
||||||
return "Число отображаемых последних открытых проектов";
|
return "Число отображаемых последних открытых проектов";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,7 +32,6 @@ public class SettingsDBTable extends DBTable<SettingName, DBSetting> {
|
|||||||
//<editor-fold desc="Global">
|
//<editor-fold desc="Global">
|
||||||
AddSetting(new DBSetting(SettingName.ShowFullArraysDeclarations, 0, SettingType.SapforFlag, ComponentType.Visualiser));
|
AddSetting(new DBSetting(SettingName.ShowFullArraysDeclarations, 0, SettingType.SapforFlag, ComponentType.Visualiser));
|
||||||
AddSetting(new DBSetting(SettingName.ShowFullTabsNames, 0, SettingType.SapforFlag, ComponentType.Visualiser));
|
AddSetting(new DBSetting(SettingName.ShowFullTabsNames, 0, SettingType.SapforFlag, ComponentType.Visualiser));
|
||||||
AddSetting(new DBSetting(SettingName.FastAccessPassesCount, 5, SettingType.IntField, ComponentType.Visualiser));
|
|
||||||
AddSetting(new DBSetting(SettingName.LastOpenedProjectsCount, 5, SettingType.IntField, ComponentType.Visualiser));
|
AddSetting(new DBSetting(SettingName.LastOpenedProjectsCount, 5, SettingType.IntField, ComponentType.Visualiser));
|
||||||
AddSetting(new DBSetting(SettingName.Kernels, Utils.getHalfKernels(), SettingType.IntField, ComponentType.Visualiser));
|
AddSetting(new DBSetting(SettingName.Kernels, Utils.getHalfKernels(), SettingType.IntField, ComponentType.Visualiser));
|
||||||
if (Utils_.isWindows())
|
if (Utils_.isWindows())
|
||||||
|
|||||||
@@ -122,6 +122,8 @@ public class GlobalProperties {
|
|||||||
public boolean ComparsionDiffMergeOn = false;
|
public boolean ComparsionDiffMergeOn = false;
|
||||||
@Expose
|
@Expose
|
||||||
public int BugReportsAgeLimit = 2;
|
public int BugReportsAgeLimit = 2;
|
||||||
|
@Expose
|
||||||
|
public int FastAccessPassesCount=10;
|
||||||
public GlobalProperties(GlobalProperties p) {
|
public GlobalProperties(GlobalProperties p) {
|
||||||
super();
|
super();
|
||||||
Mode = p.Mode;
|
Mode = p.Mode;
|
||||||
@@ -173,6 +175,8 @@ public class GlobalProperties {
|
|||||||
//-----------------
|
//-----------------
|
||||||
public String getFieldDescription(String fieldName) {
|
public String getFieldDescription(String fieldName) {
|
||||||
switch (fieldName) {
|
switch (fieldName) {
|
||||||
|
case "FastAccessPassesCount":
|
||||||
|
return "Число проходов на панели быстрого доступа";
|
||||||
case "Workspace":
|
case "Workspace":
|
||||||
return "Рабочее пространство визуализатора";
|
return "Рабочее пространство визуализатора";
|
||||||
case "BugReportsAgeLimit":
|
case "BugReportsAgeLimit":
|
||||||
|
|||||||
@@ -157,7 +157,7 @@ public class MainModule extends MainModule_<GlobalDatabase, MainUI> {
|
|||||||
//--
|
//--
|
||||||
@Override
|
@Override
|
||||||
public int getFirstAccessPassesCount() {
|
public int getFirstAccessPassesCount() {
|
||||||
return getDb().settings.get(SettingName.FastAccessPassesCount).toInt32();
|
return Global.properties.FastAccessPassesCount;
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public boolean confirmPassesStart() {
|
public boolean confirmPassesStart() {
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
package _VisualDVM.Passes.All;
|
package _VisualDVM.Passes.All;
|
||||||
|
import Common.MainModule_;
|
||||||
import Common.Passes.Pass;
|
import Common.Passes.Pass;
|
||||||
import Common.Visual.Windows.Dialog.SliderNumberForm;
|
import Common.Visual.Windows.Dialog.SliderNumberForm;
|
||||||
import Common.Visual.Windows.Dialog.VDirectoryChooser;
|
import Common.Visual.Windows.Dialog.VDirectoryChooser;
|
||||||
@@ -32,6 +33,10 @@ public class UpdateProperty extends Pass<Object> {
|
|||||||
if (sliderNumberForm.ShowDialog(description, oldValue, 1, 12))
|
if (sliderNumberForm.ShowDialog(description, oldValue, 1, 12))
|
||||||
newValue=sliderNumberForm.Result;
|
newValue=sliderNumberForm.Result;
|
||||||
break;
|
break;
|
||||||
|
case "FastAccessPassesCount":
|
||||||
|
if (sliderNumberForm.ShowDialog(description, oldValue, 5, 15))
|
||||||
|
newValue=sliderNumberForm.Result;
|
||||||
|
break;
|
||||||
case "Workspace":
|
case "Workspace":
|
||||||
directoryChooser.setTitle(description);
|
directoryChooser.setTitle(description);
|
||||||
directoryChooser.SetCurrentDirectory(
|
directoryChooser.SetCurrentDirectory(
|
||||||
@@ -77,6 +82,9 @@ public class UpdateProperty extends Pass<Object> {
|
|||||||
Global.mainModule.getFile().form.ExpandMessages();
|
Global.mainModule.getFile().form.ExpandMessages();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case "FastAccessPassesCount":
|
||||||
|
MainModule_.instance.getUI().getFastAccessMenuBar().Refresh();
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -65,13 +65,6 @@ public class UpdateSetting extends Pass<DBSetting> {
|
|||||||
if (f_.ShowDialog(target.Name.getDescription()))
|
if (f_.ShowDialog(target.Name.getDescription()))
|
||||||
NewValue = String.valueOf(f_.Result);
|
NewValue = String.valueOf(f_.Result);
|
||||||
break;
|
break;
|
||||||
case FastAccessPassesCount:
|
|
||||||
min = 5;
|
|
||||||
max = 15;
|
|
||||||
SliderNumberForm fff = new SliderNumberForm();
|
|
||||||
if (fff.ShowDialog(target.Name.getDescription(), target.toInt32(), min, max))
|
|
||||||
NewValue = String.valueOf(fff.Result);
|
|
||||||
break;
|
|
||||||
case Kernels:
|
case Kernels:
|
||||||
min = 1;
|
min = 1;
|
||||||
max = Utils.getMaxKernels();
|
max = Utils.getMaxKernels();
|
||||||
@@ -102,9 +95,6 @@ public class UpdateSetting extends Pass<DBSetting> {
|
|||||||
if (Global.mainModule.HasFile())
|
if (Global.mainModule.HasFile())
|
||||||
Global.mainModule.getFile().form.ShowGCOV();
|
Global.mainModule.getFile().form.ShowGCOV();
|
||||||
break;
|
break;
|
||||||
case FastAccessPassesCount:
|
|
||||||
MainModule_.instance.getUI().getFastAccessMenuBar().Refresh();
|
|
||||||
break;
|
|
||||||
case ShowFullArraysDeclarations:
|
case ShowFullArraysDeclarations:
|
||||||
if (Global.mainModule.HasProject())
|
if (Global.mainModule.HasProject())
|
||||||
Global.mainModule.getProject().declaratedArrays.ShowUI();
|
Global.mainModule.getProject().declaratedArrays.ShowUI();
|
||||||
|
|||||||
@@ -8,9 +8,9 @@ public class CompactnessSettingsMenu extends SettingsSubmenu {
|
|||||||
SettingName.SmallScreen,
|
SettingName.SmallScreen,
|
||||||
SettingName.ShowFullTabsNames,
|
SettingName.ShowFullTabsNames,
|
||||||
SettingName.ShowFullArraysDeclarations,
|
SettingName.ShowFullArraysDeclarations,
|
||||||
SettingName.FastAccessPassesCount,
|
|
||||||
SettingName.LastOpenedProjectsCount
|
SettingName.LastOpenedProjectsCount
|
||||||
);
|
);
|
||||||
|
add(Global.properties.getMenuItem("FastAccessPassesCount"));
|
||||||
addSeparator();
|
addSeparator();
|
||||||
String[] propertiesNames = new String[]{
|
String[] propertiesNames = new String[]{
|
||||||
"collapseProjectTrees",
|
"collapseProjectTrees",
|
||||||
|
|||||||
Reference in New Issue
Block a user