diff -Nur Jubler-3.0.0/src/com/panayotis/jubler/information/HelpBrowser.java Jubler-3.0.0_patched/src/com/panayotis/jubler/information/HelpBrowser.java --- Jubler-3.0.0/src/com/panayotis/jubler/information/HelpBrowser.java 2006-11-22 23:14:28.000000000 +0200 +++ Jubler-3.0.0_patched/src/com/panayotis/jubler/information/HelpBrowser.java 2006-11-29 22:03:18.000000000 +0200 @@ -31,7 +31,7 @@ history = new ArrayList(); - String initpage = "file:"+SystemFileFinder.getJublerAppPath()+"/help/jubler-faq.html"; + String initpage = "file:"+SystemFileFinder.getJublerAppPath()+"/../help/jubler-faq.html"; setPage(initpage); history.add(initpage); diff -Nur Jubler-3.0.0/src/com/panayotis/jubler/os/SystemDependent.java Jubler-3.0.0_patched/src/com/panayotis/jubler/os/SystemDependent.java --- Jubler-3.0.0/src/com/panayotis/jubler/os/SystemDependent.java 2006-11-15 01:28:04.000000000 +0200 +++ Jubler-3.0.0_patched/src/com/panayotis/jubler/os/SystemDependent.java 2006-11-29 20:25:20.000000000 +0200 @@ -23,9 +23,11 @@ package com.panayotis.jubler.os; +/* import com.apple.eawt.Application; import com.apple.eawt.ApplicationAdapter; import com.apple.eawt.ApplicationEvent; +*/ import static com.panayotis.jubler.i18n.I18N._; @@ -50,6 +52,7 @@ OS = props.getProperty("os.name").toLowerCase(); } + /* private static boolean isLinux() { return OS.toLowerCase().indexOf("linux") >= 0; } @@ -60,6 +63,7 @@ private static boolean isMacOSX() { return OS.toLowerCase().indexOf("mac") >= 0; } + */ public static int getSliderLOffset() { return 7; @@ -73,6 +77,7 @@ public static String getDefaultMPlayerArgs() { String fontconfig = "-fontconfig "; String fontname = "%f"; + /* if (!isLinux()) { fontconfig = ""; if (isWindows()) { @@ -81,13 +86,14 @@ fontname = "%j/lib/freesans.ttf"; } } + */ return "%p -slave -identify -ontop -utf8 -noquiet -nofs "+fontconfig+"-subfont-autoscale 0 -volstep 10"+ " -sub %s -ss %t -geometry +%x+%y -font "+fontname+" -subfont-text-scale %z %v"; } /* Force ASpell to use UTF-8 encoding - broken on Windows */ public static boolean forceASpellEncoding() { - return !isWindows(); + return true; } public static String getRealExecFilename( String fname ) { @@ -99,19 +105,21 @@ public static void hideSystemMenus(JMenuItem about, JMenuItem prefs, JMenuItem quit) { + /* if (isMacOSX()) { about.setVisible(false); prefs.setVisible(false); quit.setVisible(false); } + */ } public static void initApplication() { - /* In Linux this is a dummy function */ + /* In Linux this is a dummy function if (isMacOSX()) { JublerApp japp = new JublerApp(); - } + }*/ } @@ -119,6 +127,7 @@ return 4; } public static String getKeyMods(boolean [] mods) { + /* if (isMacOSX()) { StringBuffer res = new StringBuffer(); if (mods[0]) res.append("\u2318"); @@ -128,6 +137,7 @@ if (res.length()>0) res.append(' '); return res.toString(); } + */ StringBuffer res = new StringBuffer(); if (mods[0]) res.append("+Meta"); @@ -142,24 +152,24 @@ } public static int getDefaultKeyModifier() { - if (isMacOSX()) return 0; + //if (isMacOSX()) return 0; return 2; } public static String getCanonicalFilename(String filename) { - if (isWindows()) return filename.toLowerCase()+".exe"; + //if (isWindows()) return filename.toLowerCase()+".exe"; return filename.toLowerCase(); } public static void openURL(String url) { try { - if (isMacOSX()) { + /*if (isMacOSX()) { Class fileMgr = Class.forName("com.apple.eio.FileManager"); Method openURL = fileMgr.getDeclaredMethod("openURL", new Class[] {String.class}); openURL.invoke(null, new Object[] {url}); } else if (isWindows()) Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + url); - else { //assume Unix or Linux + else {*/ //assume Unix or Linux String[] browsers = { "firefox", "konqueror", "opera", "epiphany", "mozilla", "netscape" }; String browser = null; @@ -171,7 +181,7 @@ throw new Exception("Could not find web browser"); else Runtime.getRuntime().exec(new String[] {browser, url}); - } + //} } catch (Exception e) { DEBUG.warning("URL selected: " + url); } @@ -182,6 +192,7 @@ +/* class JublerApp extends Application { public JublerApp() { setEnabledPreferencesMenu(true); @@ -208,3 +219,4 @@ event.setHandled(false); } } +*/ diff -Nur Jubler-3.0.0/src/com/panayotis/jubler/os/SystemFileFinder.java Jubler-3.0.0_patched/src/com/panayotis/jubler/os/SystemFileFinder.java --- Jubler-3.0.0/src/com/panayotis/jubler/os/SystemFileFinder.java 2006-11-23 03:03:10.000000000 +0200 +++ Jubler-3.0.0_patched/src/com/panayotis/jubler/os/SystemFileFinder.java 2006-11-29 21:47:22.000000000 +0200 @@ -44,20 +44,20 @@ } public static boolean loadLibrary(String name) { - File libfile = findFile("lib"+pathseparator+System.mapLibraryName(name)); - if (libfile!=null) { + /*File libfile = findFile("lib"+pathseparator+System.mapLibraryName(name)); + if (libfile!=null) {*/ try { - System.load(libfile.getAbsolutePath()); + System.loadLibrary(name); return true; } catch (UnsatisfiedLinkError e) { e.printStackTrace(); } - } + //} return false; } public static String getJublerAppPath() { - File f = findFile("Jubler.jar"); + File f = findFile("jubler.jar"); if (f==null) f = findFile("Jubler.exe"); if (f!=null) return f.getParent();