[Magicmap-commits] SF.net SVN: magicmap: [662] trunk/magicmapclient

[<an...@us...>]

Revision: 662
          http://svn.sourceforge.net/magicmap/?rev=662&view=rev
Author:   anweiss
Date:     2007-07-19 07:59:59 -0700 (Thu, 19 Jul 2007)

Log Message:
-----------
added "Homepage" Menu

Modified Paths:
--------------
    trunk/magicmapclient/res/screentext.properties
    trunk/magicmapclient/res/screentext_de_DE.properties
    trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainFrame.java
    trunk/magicmapclient/src/net/sf/magicmap/client/net/WindowsNetworkInfo.java

Modified: trunk/magicmapclient/res/screentext.properties
===================================================================
--- trunk/magicmapclient/res/screentext.properties	2007-07-19 12:19:35 UTC (rev 661)
+++ trunk/magicmapclient/res/screentext.properties	2007-07-19 14:59:59 UTC (rev 662)
@@ -9,6 +9,7 @@
 help=&Help
 onlinehelp=Online help
 onlinehelptooltip=Help at MagicMap wiki
+homepage=Homepage
 simpleview=Beginner
 normalview=Advanced
 expertview=Expert

Modified: trunk/magicmapclient/res/screentext_de_DE.properties
===================================================================
--- trunk/magicmapclient/res/screentext_de_DE.properties	2007-07-19 12:19:35 UTC (rev 661)
+++ trunk/magicmapclient/res/screentext_de_DE.properties	2007-07-19 14:59:59 UTC (rev 662)
@@ -9,6 +9,7 @@
 help=&Hilfe
 onlinehelp=Online Hilfe
 onlinehelptooltip=Hilfe im MagicMap Wiki
+homepage=Homepage
 simpleview=Anf\xE4nger
 normalview=Fortgeschritten
 expertview=Experte

Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainFrame.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainFrame.java	2007-07-19 12:19:35 UTC (rev 661)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainFrame.java	2007-07-19 14:59:59 UTC (rev 662)
@@ -10,7 +10,6 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.rmi.RemoteException;
-import java.rmi.UnknownHostException;
 
 import javax.swing.AbstractAction;
 import javax.swing.JButton;
@@ -37,11 +36,7 @@
 import net.sf.magicmap.client.gui.views.MapView;
 import net.sf.magicmap.client.gui.views.MeasurementView;
 import net.sf.magicmap.client.gui.views.OutlineView;
-import net.sf.magicmap.client.interfaces.CreateNewMapCallback;
 import net.sf.magicmap.client.interfaces.LoadMapDialogListener;
-import net.sf.magicmap.client.interfaces.MapNamesCallback;
-import net.sf.magicmap.client.interfaces.ServerConnectCallback;
-import net.sf.magicmap.client.interfaces.ServerDisconnectCallback;
 import net.sf.magicmap.client.meta.MapInfo;
 import net.sf.magicmap.client.meta.ServerConnectionInfo;
 import net.sf.magicmap.client.utils.Settings;
@@ -80,6 +75,7 @@
     private AbstractAction    exitAction;
     private AbstractAction    aboutAction;
     private AbstractAction    onlineHelp;
+    private AbstractAction    homepageAction;
     private MagicAction       invisibleAction;
     private MagicAction       simpleView;
     private MagicAction       normalView;
@@ -268,6 +264,7 @@
         Browser.init();
         JMenu menu = GUIBuilder.createMenu("help");
         menu.add(GUIBuilder.createMenuItem(this.onlineHelp));
+        menu.add(GUIBuilder.createMenuItem(this.homepageAction));
         menu.addSeparator();
         menu.add(GUIBuilder.createMenuItem(this.aboutAction));
         return menu;
@@ -588,7 +585,27 @@
                 }
             }
         };
+        
+        this.homepageAction = new MagicAction("homepage") {
 
+            /**
+             * serial version id
+             */
+            private static final long serialVersionUID = -2931521125912428814L;
+
+            /* (non-Javadoc)
+             * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+             */
+            @Override
+            public void actionPerformed(ActionEvent e){
+                try {
+                    Browser.displayURL("http://www.magicmap.de");
+                } catch (IOException e1) {
+                    //TODO: exception handling
+                }
+            }
+        };
+
         this.aboutAction = new MagicAction("about") {
 
             /**

Modified: trunk/magicmapclient/src/net/sf/magicmap/client/net/WindowsNetworkInfo.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/net/WindowsNetworkInfo.java	2007-07-19 12:19:35 UTC (rev 661)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/net/WindowsNetworkInfo.java	2007-07-19 14:59:59 UTC (rev 662)
@@ -34,6 +34,7 @@
 
             // see if line contains IP address, this means stop if we've already
             // seen a MAC address
+            // the "(" occurs in vista, if this is a preferred connection
             if ((line.contains(localHost + "/r/n")||line.contains(localHost + "(")) && lastMacAddress != null) return lastMacAddress;
             // see if line might contain a MAC address
             int macAddressPosition = line.indexOf(":");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.