From 9b634e32271a06bbc40530d6ff3673febe1a2aad Mon Sep 17 00:00:00 2001 From: angryziber Date: Tue, 28 Aug 2007 20:52:22 +0000 Subject: [PATCH] Fetcher Info columns menu item renamed to About Fetcher_Name git-svn-id: https://ipscan.svn.sourceforge.net/svnroot/ipscan/trunk@212 375186e5-ef17-0410-b0b6-91563547dcda --- resources/Labels.txt | 2 +- src/net/azib/ipscan/config/ComponentRegistry.java | 2 +- src/net/azib/ipscan/gui/MainMenu.java | 4 ++-- src/net/azib/ipscan/gui/actions/ColumnsActions.java | 7 +++++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/resources/Labels.txt b/resources/Labels.txt index e538b056..245ff9cf 100755 --- a/resources/Labels.txt +++ b/resources/Labels.txt @@ -39,7 +39,7 @@ menu.help.checkVersion=Check for newer version... menu.help.about=&About... menu.columns.sortBy=Sort by menu.columns.sortDirection=Change sort direction -menu.columns.info=Fetcher info +menu.columns.about=About menu.columns.preferences=Fetcher preferences... state.ready=Ready state.scanning=Scanning diff --git a/src/net/azib/ipscan/config/ComponentRegistry.java b/src/net/azib/ipscan/config/ComponentRegistry.java index c8a6c2e2..bdbd610c 100755 --- a/src/net/azib/ipscan/config/ComponentRegistry.java +++ b/src/net/azib/ipscan/config/ComponentRegistry.java @@ -173,7 +173,7 @@ public class ComponentRegistry { container.registerComponentImplementation(StartStopScanningAction.class); container.registerComponentImplementation(ColumnsActions.SortBy.class); container.registerComponentImplementation(ColumnsActions.FetcherPreferences.class); - container.registerComponentImplementation(ColumnsActions.FetcherInfo.class); + container.registerComponentImplementation(ColumnsActions.AboutFetcher.class); container.registerComponentImplementation(ColumnsActions.ColumnClick.class); container.registerComponentImplementation(ColumnsActions.ColumnResize.class); } diff --git a/src/net/azib/ipscan/gui/MainMenu.java b/src/net/azib/ipscan/gui/MainMenu.java index 45b465e8..6ae720cd 100755 --- a/src/net/azib/ipscan/gui/MainMenu.java +++ b/src/net/azib/ipscan/gui/MainMenu.java @@ -221,12 +221,12 @@ public class MainMenu { * This is the menu when clicking on a column header. */ public static class ColumnsMenu extends Menu { - public ColumnsMenu(Decorations parent, ColumnsActions.SortBy sortByListener, ColumnsActions.FetcherInfo infoListener, ColumnsActions.FetcherPreferences preferencesListener) { + public ColumnsMenu(Decorations parent, ColumnsActions.SortBy sortByListener, ColumnsActions.AboutFetcher aboutListener, ColumnsActions.FetcherPreferences preferencesListener) { super(parent, SWT.POP_UP); initMenuItem(this, "menu.columns.sortBy", null, null, sortByListener); initMenuItem(this, "menu.columns.preferences", null, null, preferencesListener); - initMenuItem(this, "menu.columns.info", null, null, infoListener); + initMenuItem(this, "menu.columns.about", null, null, aboutListener); } protected void checkSubclass() { } // allow extending of Menu class } diff --git a/src/net/azib/ipscan/gui/actions/ColumnsActions.java b/src/net/azib/ipscan/gui/actions/ColumnsActions.java index dd988e3c..bffc12af 100755 --- a/src/net/azib/ipscan/gui/actions/ColumnsActions.java +++ b/src/net/azib/ipscan/gui/actions/ColumnsActions.java @@ -67,7 +67,10 @@ public class ColumnsActions { sortMenuItem.setText(Labels.getLabel("menu.columns.sortBy") + tableColumn.getText()); } - // remember the clicked column (see SortBy, FetcherPreferences, and FetcherInfo below) + MenuItem aboutMenuItem = columnsMenu.getItem(2); + aboutMenuItem.setText(Labels.getLabel("menu.columns.about") + tableColumn.getText()); + + // remember the clicked column (see SortBy, FetcherPreferences, and AboutFetcher below) columnsMenu.setData(tableColumn); // show the menu @@ -131,7 +134,7 @@ public class ColumnsActions { } } - public static class FetcherInfo implements Listener { + public static class AboutFetcher implements Listener { public void handleEvent(Event event) { // retrieve the clicked column (see ColumnClick above)