Added desktopgui to installation, updater and startup.

apps/desktopgui/TODO

@@ -15,7 +15,31 @@ HIGH PRIORITY:
   * One possibility:
         Adding some kind of 'ApplicationManager' that allows starting applications.
         Extra remark: ApplicationManager should also allow stopping certain applications from launching.
+        Suggestion:
+            * ApplicationManager reads/writes clients.config
+            * ApplicationManager itself: independent from clients.config?
+            * Upon reboot, ApplicationManager could add a new application to clients.config _if_ the 'application.manager.version' is not there, or is smaller than the current version.
+            * ApplicationManager can be the clients.config backend for routerconsole, so routerconsole is not the dependency.
+            * API:
+                - addConfig(args, name, ...)
+                - removeConfig(int)
+                - removeConfig(ConfigFilter)
+                    ConfigFilter() {
+                        boolean filterArgs(String args);
+                        boolean filterMain(String main);
+                        ...
+                    }
+                - editConfig(args, name, ..., ConfigFilter)
+                - editConfig(args, name, ..., int)
+                - editConfigArgs(args, ConfigFilter)
+                - editConfigArgs(args, int)
+                - ...
+ * For now: added in the routerconsole startup (like the old SysTray. - DONE
+    Possible migration path: startup ApplicationManager in routerconsole the first time.
+- Check bug: restart is happening instead of shutdown!
+- Check build order (for example: first desktopgui, only later routerconsole)
 - Fix tabs versus spaces ;-)
+- Add check for Java version 6 in RouterConsoleRunner!
 UNKNOWN:
 - API to allow applications to add themselves to the menu?
     * registerApplication(); -- should return a positive number on success, -1 on failure

apps/desktopgui/locale/messages_nl.po

@@ -1,31 +1,29 @@
-#: src/net/i2p/desktopgui/TrayManager.java:73
-msgid "Launch I2P Browser"
-msgstr "Start I2P Browser"
-
-#: src/net/i2p/desktopgui/TrayManager.java:99
-msgid "Browser not found"
-msgstr "Browser niet gevonden"
-
-#: src/net/i2p/desktopgui/TrayManager.java:100
-msgid "The default browser for your system was not found."
-msgstr "De standaard webbrowser voor je systeem werd niet gevonden."
-
-#: src/net/i2p/desktopgui/TrayManager.java:111
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
 msgid "Start I2P"
 msgstr "I2P starten"
 
-#: src/net/i2p/desktopgui/TrayManager.java:126
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
 msgid "I2P is starting!"
 msgstr "I2P is aan het starten!"
 
-#: src/net/i2p/desktopgui/TrayManager.java:126
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
 msgid "Starting"
 msgstr "Bezig met starten"
 
-#: src/net/i2p/desktopgui/TrayManager.java:140
+#: src/net/i2p/desktopgui/InternalTrayManager.java:25
+msgid "Launch I2P Browser"
+msgstr "Start I2P Browser"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:49
 msgid "Restart I2P"
 msgstr "I2P herstarten"
 
-#: src/net/i2p/desktopgui/TrayManager.java:161
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
 msgid "Stop I2P"
 msgstr "I2P stoppen"
+
+#~ msgid "Browser not found"
+#~ msgstr "Browser niet gevonden"
+
+#~ msgid "The default browser for your system was not found."
+#~ msgstr "De standaard webbrowser voor je systeem werd niet gevonden."

apps/desktopgui/src/net/i2p/desktopgui/Main.java

@@ -28,7 +28,7 @@ public class Main {
 	 * Start the tray icon code (loads tray icon in the tray area).
 	 * @throws Exception 
 	 */
-    private void startUp() throws Exception {
+    public void startUp() throws Exception {
         trayManager = TrayManager.getInstance();
         trayManager.startManager();
         
@@ -45,11 +45,15 @@ public class Main {
             });
         }
     }
+    
+    public static void main(String[] args) {
+    	beginStartup(args);
+    }
 
     /**
      * Main method launching the application.
      */
-    public static void main(String[] args) {
+    public static void beginStartup(String[] args) {
     	System.setProperty("java.awt.headless", "false");
         try {
             UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());