no message
This commit is contained in:
2
.idea/workspace.xml
generated
2
.idea/workspace.xml
generated
@@ -14,7 +14,7 @@
|
|||||||
<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/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/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/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/LastOpenedProjectsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.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" />
|
<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" />
|
||||||
|
|||||||
@@ -51,6 +51,7 @@
|
|||||||
"FortranWrapsOn": false,
|
"FortranWrapsOn": false,
|
||||||
"ExtensionsOn": false,
|
"ExtensionsOn": false,
|
||||||
"ComparsionDiffMergeOn": true,
|
"ComparsionDiffMergeOn": true,
|
||||||
|
"ShowFullArraysDeclarations": false,
|
||||||
"BugReportsAgeLimit": 4,
|
"BugReportsAgeLimit": 4,
|
||||||
"FastAccessPassesCount": 5,
|
"FastAccessPassesCount": 5,
|
||||||
"LastOpenedProjectsCount": 25
|
"LastOpenedProjectsCount": 25
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ package _VisualDVM.GlobalData.Settings;
|
|||||||
public enum SettingName {
|
public enum SettingName {
|
||||||
Undefined,
|
Undefined,
|
||||||
//--------------
|
//--------------
|
||||||
ShowFullArraysDeclarations,
|
|
||||||
ShowFullTabsNames,
|
ShowFullTabsNames,
|
||||||
LocalMakePathWindows,
|
LocalMakePathWindows,
|
||||||
SmallScreen,
|
SmallScreen,
|
||||||
@@ -55,8 +54,6 @@ public enum SettingName {
|
|||||||
return "Путь к make.exe";
|
return "Путь к make.exe";
|
||||||
case ShowFullTabsNames:
|
case ShowFullTabsNames:
|
||||||
return "Показывать полные имена вкладок";
|
return "Показывать полные имена вкладок";
|
||||||
case ShowFullArraysDeclarations:
|
|
||||||
return "Показывать развернутый список объявлений массивов";
|
|
||||||
case STATIC_SHADOW_ANALYSIS:
|
case STATIC_SHADOW_ANALYSIS:
|
||||||
return "Оптимизация теневых обменов";
|
return "Оптимизация теневых обменов";
|
||||||
case STATIC_PRIVATE_ANALYSIS:
|
case STATIC_PRIVATE_ANALYSIS:
|
||||||
|
|||||||
@@ -30,7 +30,6 @@ public class SettingsDBTable extends DBTable<SettingName, DBSetting> {
|
|||||||
public void AddAll() throws Exception {
|
public void AddAll() throws Exception {
|
||||||
//проверка списка всех настроек.
|
//проверка списка всех настроек.
|
||||||
//<editor-fold desc="Global">
|
//<editor-fold desc="Global">
|
||||||
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.Kernels, Utils.getHalfKernels(), SettingType.IntField, ComponentType.Visualiser));
|
AddSetting(new DBSetting(SettingName.Kernels, Utils.getHalfKernels(), SettingType.IntField, ComponentType.Visualiser));
|
||||||
if (Utils_.isWindows())
|
if (Utils_.isWindows())
|
||||||
|
|||||||
@@ -107,7 +107,7 @@ public class GlobalProperties {
|
|||||||
public int lastUserId = CommonConstants.Nan;
|
public int lastUserId = CommonConstants.Nan;
|
||||||
@Expose
|
@Expose
|
||||||
public int lastCompilerId = CommonConstants.Nan;
|
public int lastCompilerId = CommonConstants.Nan;
|
||||||
//--
|
//-- сравнение
|
||||||
@Expose
|
@Expose
|
||||||
public boolean RegisterOn = false;
|
public boolean RegisterOn = false;
|
||||||
@Expose
|
@Expose
|
||||||
@@ -120,6 +120,10 @@ public class GlobalProperties {
|
|||||||
public boolean ExtensionsOn = false;
|
public boolean ExtensionsOn = false;
|
||||||
@Expose
|
@Expose
|
||||||
public boolean ComparsionDiffMergeOn = false;
|
public boolean ComparsionDiffMergeOn = false;
|
||||||
|
//--
|
||||||
|
//компактность
|
||||||
|
@Expose
|
||||||
|
public boolean ShowFullArraysDeclarations =false;
|
||||||
@Expose
|
@Expose
|
||||||
public int BugReportsAgeLimit = 2;
|
public int BugReportsAgeLimit = 2;
|
||||||
@Expose
|
@Expose
|
||||||
@@ -177,6 +181,8 @@ public class GlobalProperties {
|
|||||||
//-----------------
|
//-----------------
|
||||||
public String getFieldDescription(String fieldName) {
|
public String getFieldDescription(String fieldName) {
|
||||||
switch (fieldName) {
|
switch (fieldName) {
|
||||||
|
case "ShowFullArraysDeclarations":
|
||||||
|
return "Показывать развернутый список объявлений массивов";
|
||||||
case "LastOpenedProjectsCount":
|
case "LastOpenedProjectsCount":
|
||||||
return "Число отображаемых последних открытых проектов";
|
return "Число отображаемых последних открытых проектов";
|
||||||
case "FastAccessPassesCount":
|
case "FastAccessPassesCount":
|
||||||
|
|||||||
@@ -26,21 +26,14 @@ public class UpdateProperty extends Pass<Object> {
|
|||||||
oldValue = field.get(Global.properties);
|
oldValue = field.get(Global.properties);
|
||||||
newValue = null;
|
newValue = null;
|
||||||
SliderNumberForm sliderNumberForm = new SliderNumberForm();
|
SliderNumberForm sliderNumberForm = new SliderNumberForm();
|
||||||
SpinnerNumberForm spinnerNumberForm = new SpinnerNumberForm() {
|
|
||||||
@Override
|
|
||||||
public void InitFields() {
|
|
||||||
fields.setModel(new SpinnerNumberModel(
|
|
||||||
(int)oldValue,
|
|
||||||
1,
|
|
||||||
50,
|
|
||||||
1));
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
VDirectoryChooser directoryChooser = new VDirectoryChooser("");
|
VDirectoryChooser directoryChooser = new VDirectoryChooser("");
|
||||||
VFileChooser fileChooser = new VFileChooser("", "exe");
|
VFileChooser fileChooser = new VFileChooser("", "exe");
|
||||||
//-
|
//-
|
||||||
if (args.length==1){
|
if (args.length==1){
|
||||||
|
if (oldValue instanceof Boolean){
|
||||||
|
newValue=!(Boolean)oldValue;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
switch (name){
|
switch (name){
|
||||||
case "BugReportsAgeLimit":
|
case "BugReportsAgeLimit":
|
||||||
if (sliderNumberForm.ShowDialog(description, oldValue, 1, 12))
|
if (sliderNumberForm.ShowDialog(description, oldValue, 1, 12))
|
||||||
@@ -51,6 +44,16 @@ public class UpdateProperty extends Pass<Object> {
|
|||||||
newValue=sliderNumberForm.Result;
|
newValue=sliderNumberForm.Result;
|
||||||
break;
|
break;
|
||||||
case "LastOpenedProjectsCount":
|
case "LastOpenedProjectsCount":
|
||||||
|
SpinnerNumberForm spinnerNumberForm = new SpinnerNumberForm() {
|
||||||
|
@Override
|
||||||
|
public void InitFields() {
|
||||||
|
fields.setModel(new SpinnerNumberModel(
|
||||||
|
(int)oldValue,
|
||||||
|
1,
|
||||||
|
50,
|
||||||
|
1));
|
||||||
|
}
|
||||||
|
};
|
||||||
if (spinnerNumberForm.ShowDialog(description, oldValue, 1, 50))
|
if (spinnerNumberForm.ShowDialog(description, oldValue, 1, 50))
|
||||||
newValue=spinnerNumberForm.Result;
|
newValue=spinnerNumberForm.Result;
|
||||||
break;
|
break;
|
||||||
@@ -102,6 +105,10 @@ public class UpdateProperty extends Pass<Object> {
|
|||||||
case "FastAccessPassesCount":
|
case "FastAccessPassesCount":
|
||||||
MainModule_.instance.getUI().getFastAccessMenuBar().Refresh();
|
MainModule_.instance.getUI().getFastAccessMenuBar().Refresh();
|
||||||
break;
|
break;
|
||||||
|
case "ShowFullArraysDeclarations":
|
||||||
|
if (Global.mainModule.HasProject())
|
||||||
|
Global.mainModule.getProject().declaratedArrays.ShowUI();
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -81,10 +81,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 ShowFullArraysDeclarations:
|
|
||||||
if (Global.mainModule.HasProject())
|
|
||||||
Global.mainModule.getProject().declaratedArrays.ShowUI();
|
|
||||||
break;
|
|
||||||
case ShowFullTabsNames:
|
case ShowFullTabsNames:
|
||||||
Global.mainModule.getUI().getMainWindow().getTestingWindow().RefreshTabsNames();
|
Global.mainModule.getUI().getMainWindow().getTestingWindow().RefreshTabsNames();
|
||||||
if (Global.mainModule.HasProject())
|
if (Global.mainModule.HasProject())
|
||||||
|
|||||||
@@ -53,15 +53,15 @@ public class ProjectArraysForm extends DataSetControlForm<ProjectArray> {
|
|||||||
@Override
|
@Override
|
||||||
public Class getRendererClass() {
|
public Class getRendererClass() {
|
||||||
//todo все настройки переделать в проперти(?)
|
//todo все настройки переделать в проперти(?)
|
||||||
return (Global.mainModule.getDb()).settings.get(SettingName.ShowFullArraysDeclarations).toBoolean() ? RendererHyperlinks.class : RendererHiddenList.class;
|
return Global.properties.ShowFullArraysDeclarations ? RendererHyperlinks.class : RendererHiddenList.class;
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public Class getEditorClass() {
|
public Class getEditorClass() {
|
||||||
return (Global.mainModule.getDb()).settings.get(SettingName.ShowFullArraysDeclarations).toBoolean() ? EditorFilesHyperlinks.class : null;
|
return Global.properties.ShowFullArraysDeclarations ? EditorFilesHyperlinks.class : null;
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public int getMaxWidth() {
|
public int getMaxWidth() {
|
||||||
return (Global.mainModule.getDb()).settings.get(SettingName.ShowFullArraysDeclarations).toBoolean() ? CommonConstants.Nan : 200;
|
return Global.properties.ShowFullArraysDeclarations ? CommonConstants.Nan : 200;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
new ColumnInfo<ProjectArray>("Размерность") {
|
new ColumnInfo<ProjectArray>("Размерность") {
|
||||||
|
|||||||
@@ -6,9 +6,9 @@ public class CompactnessSettingsMenu extends SettingsSubmenu {
|
|||||||
public CompactnessSettingsMenu() {
|
public CompactnessSettingsMenu() {
|
||||||
super("Компактность отображения", null,
|
super("Компактность отображения", null,
|
||||||
SettingName.SmallScreen,
|
SettingName.SmallScreen,
|
||||||
SettingName.ShowFullTabsNames,
|
SettingName.ShowFullTabsNames
|
||||||
SettingName.ShowFullArraysDeclarations
|
|
||||||
);
|
);
|
||||||
|
add(Global.properties.getMenuItem("ShowFullArraysDeclarations"));
|
||||||
add(Global.properties.getMenuItem("LastOpenedProjectsCount"));
|
add(Global.properties.getMenuItem("LastOpenedProjectsCount"));
|
||||||
add(Global.properties.getMenuItem("FastAccessPassesCount"));
|
add(Global.properties.getMenuItem("FastAccessPassesCount"));
|
||||||
addSeparator();
|
addSeparator();
|
||||||
|
|||||||
Reference in New Issue
Block a user