diff -uwNr tvbrowser-2.5_orig2/src/tvbrowser/TVBrowser.java tvbrowser-2.5/src/tvbrowser/TVBrowser.java
--- tvbrowser-2.5_orig2/src/tvbrowser/TVBrowser.java 2006-12-26 16:47:10.000000000 +0100
+++ tvbrowser-2.5/src/tvbrowser/TVBrowser.java 2007-01-09 17:27:21.000000000 +0100
@@ -81,10 +81,6 @@
import util.ui.UiUtilities;
import util.ui.textcomponentpopup.TextComponentPopupEventQueue;
-import ca.beq.util.win32.registry.RegistryKey;
-import ca.beq.util.win32.registry.RegistryValue;
-import ca.beq.util.win32.registry.RootKey;
-
import com.jgoodies.looks.LookUtils;
import com.jgoodies.looks.Options;
import com.l2fprod.gui.plaf.skin.SkinLookAndFeel;
@@ -362,36 +358,6 @@
}.start();
ChannelList.completeChannelLoading();
- if(Launch.isOsWindowsNtBranch()) {
- try {
- RegistryKey desktopSettings = new RegistryKey(RootKey.HKEY_CURRENT_USER, "Control Panel\\Desktop");
- RegistryValue autoEnd = desktopSettings.getValue("AutoEndTasks");
-
- if(autoEnd.getData().equals("1")) {
- RegistryValue killWait = desktopSettings.getValue("WaitToKillAppTimeout");
-
- int i = Integer.parseInt(killWait.getData().toString());
-
- if(i < 5000) {
- JOptionPane.showMessageDialog(UiUtilities.getLastModalChildOf(mainFrame),
- mLocalizer.msg("registryWarning","The fast shutdown of Windows is activated.\nThe timeout to wait for before Windows is closing an application is too shot,\nto let TV-Browser enough time to save all settings.\n\nThe setting hasn't the default value. It was changed by a tool or by you.\nTV-Browser will now try to change the timeout."),
- UIManager.getString("OptionPane.messageDialogTitle"),JOptionPane.WARNING_MESSAGE);
-
- try {
- killWait.setData("5000");
- desktopSettings.setValue(killWait);
- JOptionPane.showMessageDialog(UiUtilities.getLastModalChildOf(mainFrame),
- mLocalizer.msg("registryChanged","The timeout was changed successfully.\nPlease reboot Windows!"));
- }catch(Exception registySetting) {
- JOptionPane.showMessageDialog(UiUtilities.getLastModalChildOf(mainFrame),
- mLocalizer.msg("registryNotChanged","The Registry value couldn't be changed. Maybe you havn't the right to do it.
If it is so contact you Administrator and let him do it for you.
The following description is for experts. If you change or delete the wrong value in the Registry you could destroy your Windows installation.
To get no warning on TV-Browser start the Registry value WaitToKillAppTimeout in the Registry path
HKEY_CURRENT_USER\\Control Panel\\Desktop have to be at least 5000 or the value for AutoEndTasks in the same path have to be 0."),
- Localizer.getLocalization(Localizer.I18N_ERROR),JOptionPane.ERROR_MESSAGE);
- }
- }
- }
- }catch(Exception registry) {}
- }
-
// check if user should select picture settings
if(currentVersion.compareTo(new Version(2,22))<0) {
TvBrowserPictureSettingsUpdateDialog.createAndShow(mainFrame);
diff -uwNr tvbrowser-2.5_orig2/src/tvbrowser/ui/settings/StartupSettingsTab.java tvbrowser-2.5/src/tvbrowser/ui/settings/StartupSettingsTab.java
--- tvbrowser-2.5_orig2/src/tvbrowser/ui/settings/StartupSettingsTab.java 2006-10-29 22:41:14.000000000 +0100
+++ tvbrowser-2.5/src/tvbrowser/ui/settings/StartupSettingsTab.java 2007-01-09 17:28:52.000000000 +0100
@@ -38,9 +38,6 @@
import util.ui.Localizer;
import util.ui.UiUtilities;
-import ca.beq.util.win32.registry.RegistryKey;
-import ca.beq.util.win32.registry.RootKey;
-
import com.jgoodies.forms.factories.Borders;
import com.jgoodies.forms.factories.DefaultComponentFactory;
import com.jgoodies.forms.layout.CellConstraints;
@@ -91,35 +88,6 @@
.getBoolean());
mSettingsPn.add(mShowSplashChB, cc.xy(2, 5));
- if (System.getProperty("os.name").toLowerCase().startsWith("windows")) {
- layout.appendRow(new RowSpec("3dlu"));
- layout.appendRow(new RowSpec("pref"));
-
- try {
- RegistryKey shellFolders = new RegistryKey(RootKey.HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders");
- String path = shellFolders.getValue("Startup").getData().toString();
-
- if(path == null || path.length() < 1 || !(new File(path)).isDirectory())
- throw new Exception();
-
- mLinkFile = new File(path,"TV-Browser.url");
- mLinkUrl = new UrlFile(mLinkFile);
-
- if(mLinkFile.exists())
- try {
- if (!mLinkUrl.getUrl().equals((new File("tvbrowser.exe")).getAbsoluteFile().toURL()))
- createLink(mLinkUrl);
- }catch(Exception linkException) {
- mLinkFile.delete();
- }
-
- mAutostartWithWindows = new JCheckBox(mLocalizer.msg("autostart","Start TV-Browser with Windows"),
- mLinkFile.isFile());
-
- mSettingsPn.add(mAutostartWithWindows, cc.xy(2, 7));
- } catch (Exception e) {}
- }
-
return mSettingsPn;
}