- removed shutdown from search page (we have it in tray now!)

- fixed doubleclick action for tray

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5211 6c8d7289-2bf4-0310-a012-ef5d649a1542

htroot/env/templates/simpleheader.template

@@ -1,13 +1,12 @@
 <div class="SubMenu">
 <ul class="SubMenu">
-<li style="width:12%;"><a href="/Status.html" class="MenuItemLink">Peer Administration</a></li>
-<li style="width:12%;"><a href="/index.html" onclick="this.href='/index.html?handover='+document.searchform.search.value" class="MenuItemLink">Web Search</a></li>
-<li style="width:12%;"><a href="/compare_yacy.html" onclick="this.href='/compare_yacy.html?display=0&handover='+document.searchform.search.value" class="MenuItemLink">Compare YaCy</a></li>
-<li style="width:12%;"><a href="/Surftips.html" class="MenuItemLink">Surftips</a></li>
-<li style="width:12%;"><a href="/ViewProfile.html?hash=localhash" class="MenuItemLink">Peer Owner Profile</a></li>
-<li style="width:12%;"><a href="http://www.yacy-websearch.net/wiki/" class="MenuItemLink">Help / Wiki</a></li>
-<li style="width:12%;"><a href="http://www.yacy.net/" class="MenuItemLink">Project Home</a></li>
-<li style="width:12%;"><a href="/Steering.html?shutdown=" class="MenuItemLink lock" onclick="return confirm('Confirm Shutdown')">Shutdown</a></li>
+<li style="width:14%;"><a href="/Status.html" class="MenuItemLink">Peer Administration</a></li>
+<li style="width:14%;"><a href="/index.html" onclick="this.href='/index.html?handover='+document.searchform.search.value" class="MenuItemLink">Web Search</a></li>
+<li style="width:14%;"><a href="/compare_yacy.html" onclick="this.href='/compare_yacy.html?display=0&handover='+document.searchform.search.value" class="MenuItemLink">Compare YaCy</a></li>
+<li style="width:14%;"><a href="/Surftips.html" class="MenuItemLink">Surftips</a></li>
+<li style="width:14%;"><a href="/ViewProfile.html?hash=localhash" class="MenuItemLink">Peer Owner Profile</a></li>
+<li style="width:14%;"><a href="http://www.yacy-websearch.net/wiki/" class="MenuItemLink">Help / Wiki</a></li>
+<li style="width:14%;"><a href="http://www.yacy.net/" class="MenuItemLink">Project Home</a></li>
 </ul>
 </div>
 <div style="clear:left; padding:10px;">

source/de/anomic/yacy/yacyTray.java

@@ -44,10 +44,8 @@ import de.anomic.server.serverSystem;
 public final class yacyTray {
 	private static plasmaSwitchboard sb;
 	
-	public static boolean isShown = false;
+	private static boolean isShown = false;
 	public static boolean lockBrowserPopup = true;
-	
-	private static long t1;
 
 	private static nativeTrayIcon ti;
 
@@ -94,7 +92,7 @@ public final class yacyTray {
 		
 		// Quit
 		menu.addSeparator();
-		menuItem = new MenuItem("Quit");
+		menuItem = new MenuItem("Shutdown");
 		menuItem.addActionListener(new ActionListener() {
 			public void actionPerformed(final ActionEvent e) {
 				sb.terminate();
@@ -105,15 +103,12 @@ public final class yacyTray {
 	}
     
 	
-	private static void trayClickAction(){	//detect doubleclick
-		if(System.currentTimeMillis() - t1 < 500){
-			if (lockBrowserPopup) {
-				ti.displayBalloonMessage("YaCy","Please wait until YaCy is started.");
-			} else {
-				openBrowser("");
-			}
-			t1 = 0; //protecting against tripleclick
-		} else { t1 = System.currentTimeMillis(); }
+	private static void trayClickAction(){	//doubleclick
+		if (lockBrowserPopup) {
+			ti.displayBalloonMessage("YaCy","Please wait until YaCy is started.");
+		} else {
+			openBrowser("");
+		}
 	}
 	
 	private static void openBrowser(final String browserPopUpPage){