mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-29 19:45:01 +02:00
Call Hierarchy: removed work in progress labels.
This commit is contained in:
parent
285675fc89
commit
c106203a8f
2 changed files with 33 additions and 34 deletions
|
@ -30,7 +30,7 @@ CHHistoryListAction_HistoryDialog_title=Call Hierarchy History
|
||||||
CHHistoryListAction_HistoryList_label=Select the input for the Call Hierarchy:
|
CHHistoryListAction_HistoryList_label=Select the input for the Call Hierarchy:
|
||||||
CHHistoryListAction_OpenHistory_label=Open History...
|
CHHistoryListAction_OpenHistory_label=Open History...
|
||||||
CHHistoryDropDownAction_ShowHistoryList_tooltip=Show History List
|
CHHistoryDropDownAction_ShowHistoryList_tooltip=Show History List
|
||||||
OpenCallHierarchyAction_label=Open Call H&ierarchy (work in progress)
|
OpenCallHierarchyAction_label=Open Call H&ierarchy
|
||||||
OpenCallHierarchyAction_tooltip=Open Call Hierarchy (work in progress)
|
OpenCallHierarchyAction_tooltip=Open Call Hierarchy
|
||||||
CallHierarchyUI_label=Open Call Hierarchy
|
CallHierarchyUI_label=Open Call Hierarchy
|
||||||
CallHierarchyUI_selectMessage=Select one element from the list
|
CallHierarchyUI_selectMessage=Select one element from the list
|
||||||
|
|
|
@ -85,7 +85,7 @@ public class CHViewPart extends ViewPart {
|
||||||
private static final String TRUE = String.valueOf(true);
|
private static final String TRUE = String.valueOf(true);
|
||||||
private static final String KEY_WORKING_SET_FILTER = "workingSetFilter"; //$NON-NLS-1$
|
private static final String KEY_WORKING_SET_FILTER = "workingSetFilter"; //$NON-NLS-1$
|
||||||
private static final String KEY_FILTER_VARIABLES = "variableFilter"; //$NON-NLS-1$
|
private static final String KEY_FILTER_VARIABLES = "variableFilter"; //$NON-NLS-1$
|
||||||
private static final String KEY_FILTER_MACROS = "macroFilter"; //$NON-NLS-1$
|
// private static final String KEY_FILTER_MACROS = "macroFilter"; //$NON-NLS-1$
|
||||||
private static final String KEY_SHOW_FILES= "showFilesInLabels"; //$NON-NLS-1$
|
private static final String KEY_SHOW_FILES= "showFilesInLabels"; //$NON-NLS-1$
|
||||||
|
|
||||||
private IMemento fMemento;
|
private IMemento fMemento;
|
||||||
|
@ -108,7 +108,7 @@ public class CHViewPart extends ViewPart {
|
||||||
|
|
||||||
// filters, sorter
|
// filters, sorter
|
||||||
private ViewerFilter fVariableFilter;
|
private ViewerFilter fVariableFilter;
|
||||||
private ViewerFilter fMacroFilter;
|
// private ViewerFilter fMacroFilter;
|
||||||
private ViewerComparator fSorterAlphaNumeric;
|
private ViewerComparator fSorterAlphaNumeric;
|
||||||
private ViewerComparator fSorterReferencePosition;
|
private ViewerComparator fSorterReferencePosition;
|
||||||
private WorkingSetFilterUI fWorkingSetFilterUI;
|
private WorkingSetFilterUI fWorkingSetFilterUI;
|
||||||
|
@ -117,7 +117,7 @@ public class CHViewPart extends ViewPart {
|
||||||
private Action fReferencedByAction;
|
private Action fReferencedByAction;
|
||||||
private Action fMakesReferenceToAction;
|
private Action fMakesReferenceToAction;
|
||||||
private Action fFilterVariablesAction;
|
private Action fFilterVariablesAction;
|
||||||
private Action fFilterMacrosAction;
|
// private Action fFilterMacrosAction;
|
||||||
private Action fShowFilesInLabelsAction;
|
private Action fShowFilesInLabelsAction;
|
||||||
private Action fNextAction;
|
private Action fNextAction;
|
||||||
private Action fPreviousAction;
|
private Action fPreviousAction;
|
||||||
|
@ -215,12 +215,12 @@ public class CHViewPart extends ViewPart {
|
||||||
private void initializeActionStates() {
|
private void initializeActionStates() {
|
||||||
boolean referencedBy= true;
|
boolean referencedBy= true;
|
||||||
boolean filterVariables= false;
|
boolean filterVariables= false;
|
||||||
boolean filterMacros= false;
|
// boolean filterMacros= false;
|
||||||
boolean showFiles= false;
|
boolean showFiles= false;
|
||||||
|
|
||||||
if (fMemento != null) {
|
if (fMemento != null) {
|
||||||
filterVariables= TRUE.equals(fMemento.getString(KEY_FILTER_VARIABLES));
|
filterVariables= TRUE.equals(fMemento.getString(KEY_FILTER_VARIABLES));
|
||||||
filterMacros= TRUE.equals(fMemento.getString(KEY_FILTER_MACROS));
|
// filterMacros= TRUE.equals(fMemento.getString(KEY_FILTER_MACROS));
|
||||||
showFiles= TRUE.equals(fMemento.getString(KEY_SHOW_FILES));
|
showFiles= TRUE.equals(fMemento.getString(KEY_SHOW_FILES));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -231,8 +231,8 @@ public class CHViewPart extends ViewPart {
|
||||||
fMakesReferenceToAction.setChecked(!referencedBy);
|
fMakesReferenceToAction.setChecked(!referencedBy);
|
||||||
fContentProvider.setComputeReferencedBy(referencedBy);
|
fContentProvider.setComputeReferencedBy(referencedBy);
|
||||||
|
|
||||||
fFilterMacrosAction.setChecked(filterMacros);
|
// fFilterMacrosAction.setChecked(filterMacros);
|
||||||
fFilterMacrosAction.run();
|
// fFilterMacrosAction.run();
|
||||||
fFilterVariablesAction.setChecked(filterVariables);
|
fFilterVariablesAction.setChecked(filterVariables);
|
||||||
fFilterVariablesAction.run();
|
fFilterVariablesAction.run();
|
||||||
updateSorter();
|
updateSorter();
|
||||||
|
@ -248,7 +248,7 @@ public class CHViewPart extends ViewPart {
|
||||||
if (fWorkingSetFilterUI != null) {
|
if (fWorkingSetFilterUI != null) {
|
||||||
fWorkingSetFilterUI.saveState(memento, KEY_WORKING_SET_FILTER);
|
fWorkingSetFilterUI.saveState(memento, KEY_WORKING_SET_FILTER);
|
||||||
}
|
}
|
||||||
memento.putString(KEY_FILTER_MACROS, String.valueOf(fFilterMacrosAction.isChecked()));
|
// memento.putString(KEY_FILTER_MACROS, String.valueOf(fFilterMacrosAction.isChecked()));
|
||||||
memento.putString(KEY_FILTER_VARIABLES, String.valueOf(fFilterVariablesAction.isChecked()));
|
memento.putString(KEY_FILTER_VARIABLES, String.valueOf(fFilterVariablesAction.isChecked()));
|
||||||
memento.putString(KEY_SHOW_FILES, String.valueOf(fShowFilesInLabelsAction.isChecked()));
|
memento.putString(KEY_SHOW_FILES, String.valueOf(fShowFilesInLabelsAction.isChecked()));
|
||||||
super.saveState(memento);
|
super.saveState(memento);
|
||||||
|
@ -366,27 +366,27 @@ public class CHViewPart extends ViewPart {
|
||||||
fFilterVariablesAction.setToolTipText(CHMessages.CHViewPart_FilterVariables_tooltip);
|
fFilterVariablesAction.setToolTipText(CHMessages.CHViewPart_FilterVariables_tooltip);
|
||||||
CPluginImages.setImageDescriptors(fFilterVariablesAction, CPluginImages.T_LCL, CPluginImages.IMG_ACTION_HIDE_FIELDS);
|
CPluginImages.setImageDescriptors(fFilterVariablesAction, CPluginImages.T_LCL, CPluginImages.IMG_ACTION_HIDE_FIELDS);
|
||||||
|
|
||||||
fMacroFilter= new ViewerFilter() {
|
// fMacroFilter= new ViewerFilter() {
|
||||||
public boolean select(Viewer viewer, Object parentElement, Object element) {
|
// public boolean select(Viewer viewer, Object parentElement, Object element) {
|
||||||
if (element instanceof CHNode) {
|
// if (element instanceof CHNode) {
|
||||||
CHNode node= (CHNode) element;
|
// CHNode node= (CHNode) element;
|
||||||
return !node.isMacro();
|
// return !node.isMacro();
|
||||||
}
|
// }
|
||||||
return true;
|
// return true;
|
||||||
}
|
// }
|
||||||
};
|
// };
|
||||||
fFilterMacrosAction= new Action(CHMessages.CHViewPart_HideMacros_label, IAction.AS_CHECK_BOX) {
|
// fFilterMacrosAction= new Action(CHMessages.CHViewPart_HideMacros_label, IAction.AS_CHECK_BOX) {
|
||||||
public void run() {
|
// public void run() {
|
||||||
if (isChecked()) {
|
// if (isChecked()) {
|
||||||
fTreeViewer.addFilter(fMacroFilter);
|
// fTreeViewer.addFilter(fMacroFilter);
|
||||||
}
|
// }
|
||||||
else {
|
// else {
|
||||||
fTreeViewer.removeFilter(fMacroFilter);
|
// fTreeViewer.removeFilter(fMacroFilter);
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
};
|
// };
|
||||||
fFilterMacrosAction.setToolTipText(CHMessages.CHViewPart_HideMacros_tooltip);
|
// fFilterMacrosAction.setToolTipText(CHMessages.CHViewPart_HideMacros_tooltip);
|
||||||
CPluginImages.setImageDescriptors(fFilterMacrosAction, CPluginImages.T_LCL, CPluginImages.IMG_ACTION_HIDE_MACROS);
|
// CPluginImages.setImageDescriptors(fFilterMacrosAction, CPluginImages.T_LCL, CPluginImages.IMG_ACTION_HIDE_MACROS);
|
||||||
|
|
||||||
fSorterAlphaNumeric= new ViewerComparator();
|
fSorterAlphaNumeric= new ViewerComparator();
|
||||||
fSorterReferencePosition= new ViewerComparator() {
|
fSorterReferencePosition= new ViewerComparator() {
|
||||||
|
@ -476,7 +476,7 @@ public class CHViewPart extends ViewPart {
|
||||||
tm.add(fNextAction);
|
tm.add(fNextAction);
|
||||||
tm.add(fPreviousAction);
|
tm.add(fPreviousAction);
|
||||||
tm.add(new Separator());
|
tm.add(new Separator());
|
||||||
tm.add(fFilterMacrosAction);
|
// tm.add(fFilterMacrosAction);
|
||||||
tm.add(fFilterVariablesAction);
|
tm.add(fFilterVariablesAction);
|
||||||
tm.add(new Separator());
|
tm.add(new Separator());
|
||||||
tm.add(fReferencedByAction);
|
tm.add(fReferencedByAction);
|
||||||
|
@ -496,7 +496,7 @@ public class CHViewPart extends ViewPart {
|
||||||
mm.add(new Separator());
|
mm.add(new Separator());
|
||||||
mm.add(fShowFilesInLabelsAction);
|
mm.add(fShowFilesInLabelsAction);
|
||||||
mm.add(new Separator());
|
mm.add(new Separator());
|
||||||
mm.add(fFilterMacrosAction);
|
// mm.add(fFilterMacrosAction);
|
||||||
mm.add(fFilterVariablesAction);
|
mm.add(fFilterVariablesAction);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -630,7 +630,6 @@ public class CHViewPart extends ViewPart {
|
||||||
message= Messages.format(format, label, scope);
|
message= Messages.format(format, label, scope);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
message= "The Call Hierarchy is work in progress! - " + message; //$NON-NLS-1$
|
|
||||||
setContentDescription(message);
|
setContentDescription(message);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue