Attachment 139456 Details for Bug 197703 – tvbrowser 2.6.2 noWin32 file

tvbrowser 2.6.2 noWin32 file

tvbrowser-2.6.2_noWin32.patch (text/plain), 6.83 KB, created by Robert Schedel on 2007-12-27 20:03:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Schedel

Created: 2007-12-27 20:03:54 UTC

Size: 6.83 KB

patch

obsolete

>diff -ru tvbrowser-2.6.2-orig/src/tvbrowser/TVBrowser.java tvbrowser-2.6.2/src/tvbrowser/TVBrowser.java
>--- tvbrowser-2.6.2-orig/src/tvbrowser/TVBrowser.java	2007-12-27 00:01:14.000000000 +0100
>+++ tvbrowser-2.6.2/src/tvbrowser/TVBrowser.java	2007-12-27 18:51:41.000000000 +0100
>@@ -90,10 +90,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.l2fprod.gui.plaf.skin.SkinLookAndFeel;
> 
>@@ -394,53 +390,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 pane = new JOptionPane();
>- 
>- String cancel = mLocalizer.msg("registryCancel","Close TV-Browser");
>- String dontDoIt = mLocalizer.msg("registryJumpOver","Not this time");
>- 
>- pane.setOptions(new String[] {Localizer.getLocalization(Localizer.I18N_OK),dontDoIt,cancel});
>- pane.setOptionType(JOptionPane.YES_NO_CANCEL_OPTION);
>- pane.setMessageType(JOptionPane.WARNING_MESSAGE);
>- pane.setMessage(mLocalizer.msg("registryWarning","The fast shutdown of Windows is activated.\nThe timeout to wait for before Windows is closing an application is too short,\nto give 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.\n\nIf you don't want to change this timeout select 'Not this time' or 'Close TV-Browser'."));
>- 
>- pane.setInitialValue(mLocalizer.msg("registryCancel","Close TV-Browser"));
>- 
>- JDialog d = pane.createDialog(UiUtilities.getLastModalChildOf(mainFrame), UIManager.getString("OptionPane.messageDialogTitle"));
>- d.setModal(true);
>- UiUtilities.centerAndShow(d);
>- 
>- if(pane.getValue() == null || pane.getValue().equals(cancel)) {
>- mainFrame.quit();
>- }
>- else if(!pane.getValue().equals(dontDoIt)) {
>- 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","<html>The Registry value couldn't be changed. Maybe you haven't the right to do it. If it is so contact you Administrator and let him do it for you. <Attention:/b> 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.</html>"),
>- Localizer.getLocalization(Localizer.I18N_ERROR),JOptionPane.ERROR_MESSAGE);
>- }
>- }
>- }
>- }
>- }catch(Throwable registry) {}
>- }
>- 
> // check if user should select picture settings
> if(currentVersion != null && currentVersion.compareTo(new Version(2,22))<0) {
> TvBrowserPictureSettingsUpdateDialog.createAndShow(mainFrame);
>diff -ru tvbrowser-2.6.2-orig/src/tvbrowser/ui/settings/StartupSettingsTab.java tvbrowser-2.6.2/src/tvbrowser/ui/settings/StartupSettingsTab.java
>--- tvbrowser-2.6.2-orig/src/tvbrowser/ui/settings/StartupSettingsTab.java	2007-12-27 00:01:14.000000000 +0100
>+++ tvbrowser-2.6.2/src/tvbrowser/ui/settings/StartupSettingsTab.java	2007-12-27 18:54:55.000000000 +0100
>@@ -48,9 +48,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;
>@@ -151,36 +148,6 @@
> .getBoolean());
> mSettingsPn.add(mShowSplashChB, cc.xy(2, ++y));
> 
>- if (System.getProperty("os.name").toLowerCase().startsWith("windows") && !TVBrowser.isTransportable()) {
>- layout.insertRow(++y,new RowSpec("1dlu"));
>- layout.insertRow(++y,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().toURI().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, y));
>- } catch (Throwable e) {}
>- }
>-
> y++;
> 
> mSettingsPn.add(createRefreshPanel(), cc.xyw(1,++y,5));
>@@ -380,4 +347,4 @@
> 
> mAutoDownloadPeriodCB.setEnabled(enabled);
> }
>-}
>\ Kein Zeilenumbruch am Dateiende.
>+}

Actions: View

Attachments on bug 197703: 139451 | 139452 | 139454 | 139456 | 139546 | 140808