From 84290839728fecbbf6866c4d2994ad049f4ada06 Mon Sep 17 00:00:00 2001 From: lotus Date: Sun, 22 Feb 2009 15:11:44 +0000 Subject: [PATCH] adjusted tray for dooble: you can now set dooble=true in yacy.init to disable the menu and browser popups by default git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5633 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- defaults/yacy.init | 3 +++ source/de/anomic/yacy/yacyTray.java | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/defaults/yacy.init b/defaults/yacy.init index f1ff306a2..baa226bc4 100644 --- a/defaults/yacy.init +++ b/defaults/yacy.init @@ -896,3 +896,6 @@ disk.free = 3000 # setting if execution of CGI files is allowed or not cgi.allow = false cgi.suffixes = cgi,pl + +# whether this is a version for dooble browser +dooble = false \ No newline at end of file diff --git a/source/de/anomic/yacy/yacyTray.java b/source/de/anomic/yacy/yacyTray.java index 3718c6c02..9f69d94e4 100644 --- a/source/de/anomic/yacy/yacyTray.java +++ b/source/de/anomic/yacy/yacyTray.java @@ -45,6 +45,7 @@ public final class yacyTray { private static plasmaSwitchboard sb; private static nativeTrayIcon ti; + private static boolean isDooble; // dooble browser integration private static boolean isShown = false; final private static boolean deutsch = System.getProperty("user.language","").equals("de"); @@ -53,6 +54,7 @@ public final class yacyTray { public static void init(final plasmaSwitchboard par_sb) { sb = par_sb; + isDooble = sb.getConfigBool("dooble", false); try { final boolean trayIcon = sb.getConfigBool("trayIcon", false); if (trayIcon && serverSystem.isWindows) { @@ -84,6 +86,8 @@ public final class yacyTray { PopupMenu menu = new PopupMenu(); MenuItem menuItem; + if(isDooble) return menu; + // YaCy Search if(deutsch) label = "YaCy Suche"; else label = "YaCy Search"; @@ -146,6 +150,7 @@ public final class yacyTray { } private static void openBrowser(final String browserPopUpPage){ + if(isDooble) return; // no need for https, because we are on localhost serverSystem.openBrowser("http://localhost:" + sb.getConfig("port", "8080") + "/" + browserPopUpPage); }