From ca2380584dfa084e6d9f3d51747753663dbbeebd Mon Sep 17 00:00:00 2001 From: angryziber Date: Tue, 21 Aug 2007 18:18:58 +0000 Subject: [PATCH] * more getting started text * AboutDialog now shows OS version * TODO updated git-svn-id: https://ipscan.svn.sourceforge.net/svnroot/ipscan/trunk@195 375186e5-ef17-0410-b0b6-91563547dcda --- TODO | 4 +++- resources/Labels.txt | 13 +++++++++++-- src/net/azib/ipscan/gui/AboutDialog.java | 6 +++--- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/TODO b/TODO index d8eb90bb..dbf968e2 100644 --- a/TODO +++ b/TODO @@ -1,13 +1,15 @@ Before 3.0 beta: +* host:port for detection +* min port timeout (for adaptation) * sorting by columns * export/import of settings * disabling of buttons/menus during scanning -* tools->delete menus * Mac build Before 3.0: +* tools->delete menus * fetcher-specific options * multiple port support web-detect * add new fetchers by configuration of PortTextFetcher diff --git a/resources/Labels.txt b/resources/Labels.txt index 4491798c..afff1c0e 100755 --- a/resources/Labels.txt +++ b/resources/Labels.txt @@ -82,8 +82,8 @@ text.configDetect.firstRun=This is the first run of Angry IP Scanner.\n\n text.configDetect=We will try to detect the number of threads that works reliably on this machine by listening on a local free port and then connecting to it using the configured port timeout. text.configDetect.tries=Initiated connections: text.configDetect.successes=Successful connections: -text.configDetect.setMaxThreads=Do you want to set maximum number of threads to %d?\n\nThis is the detected number and should provide reliable scanning results on your machine. -text.configDetect.setMaxThreads.firstRun=You will be able to play more with it later, just select Tools->Options from the menu. +text.configDetect.setMaxThreads=Do you want to set maximum number of threads to %d?\n\nThis is the detected number and should provide reliable scanning results on your machine.\n\nAlternatively, you can manually increase port timeout to make detection more reliable. +text.configDetect.setMaxThreads.firstRun=\n\nYou will be able to play more with these settings later, just select Tools->Options from the menu. text.scan.new=New scan text.scan.confirmation=Discard previous scanning results? text.scan.finished=Scanning completed @@ -265,3 +265,12 @@ UDP - sends UDP packets (datagrams) to one of the host's ports and sees if there TCP - tries to connect to port 80 (http) on the host. This may work better than UDP for some networks, but usually it is worse.\n\n\ UDP and TCP pinging most often doesn't properly detect routers or other network equipment.\n\n\ TTL (time to live) - this fetcher works only with ICMP pinging method. Its initial value is usually 64 or 128, and the difference represents the distance to the host in number of nodes it has travelled. + +text.gettingStarted5=The results list displays the scanning results, one line per each scanned address.\n\n\ +Using the Options dialog, you may configure to display:\n\ +- all scanned hosts\n\ +- only alive hosts\n\ +- only hosts with any ports open\n\n\ +Special values (also configurable):\n\ +[n/s] - not scanned value that wasn't scanned at all (eg if the host is dead)\n\ +[n/a] - the value is not available, but was scanned diff --git a/src/net/azib/ipscan/gui/AboutDialog.java b/src/net/azib/ipscan/gui/AboutDialog.java index 756a6744..f57c71a9 100755 --- a/src/net/azib/ipscan/gui/AboutDialog.java +++ b/src/net/azib/ipscan/gui/AboutDialog.java @@ -36,7 +36,7 @@ public class AboutDialog extends AbstractModalDialog { shell = new Shell(parent, SWT.APPLICATION_MODAL | SWT.DIALOG_TRIM); shell.setText(Labels.getLabel("title.about")); - shell.setSize(new Point(400, 363)); + shell.setSize(new Point(400, 373)); Label iconLabel = new Label(shell, SWT.ICON); iconLabel.setLocation(10, 10); @@ -53,7 +53,7 @@ public class AboutDialog extends AbstractModalDialog { text = text.replaceAll("%NAME", Version.NAME); text = text.replaceAll("%VERSION", Version.getVersion()); text = text.replaceAll("%BUILD", Version.getBuildNumber()); - text = text.replaceAll("%JAVA", System.getProperty("java.vm.vendor") + " " + System.getProperty("java.vm.version") + ", " + System.getProperty("os.name")); + text = text.replaceAll("%JAVA", System.getProperty("java.vm.vendor") + " " + System.getProperty("java.vm.version") + "\n" + System.getProperty("os.name") + " " + System.getProperty("os.version")); text = text.replaceAll("%COPYLEFT", Version.COPYLEFT); text = text.replaceAll("%WEBSITE", Version.WEBSITE); text = text.replaceAll("%MAILTO", Version.MAILTO); @@ -65,7 +65,7 @@ public class AboutDialog extends AbstractModalDialog { Button button = createCloseButton(); Text licenseText = new Text(shell, SWT.BORDER | SWT.MULTI | SWT.READ_ONLY | SWT.V_SCROLL | SWT.WRAP); - licenseText.setBounds(leftBound, textLabel.getBounds().y+textLabel.getBounds().height+10, shell.getClientArea().width - leftBound - 10, button.getLocation().y - 150); + licenseText.setBounds(leftBound, textLabel.getBounds().y+textLabel.getBounds().height+10, shell.getClientArea().width - leftBound - 10, button.getLocation().y - 160); licenseText.setBackground(shell.getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND)); licenseText.setText("Licensed under the GNU General Public License Version 2\n\n" + Version.NAME + " is free software; you can redistribute it and/or " +