forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
/
3.4.3-remove-registrykey.patch
150 lines (145 loc) · 7.19 KB
/
3.4.3-remove-registrykey.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
--- src/tvbrowser/TVBrowser.java.orig 2015-03-24 17:41:56.811494046 +0000
+++ src/tvbrowser/TVBrowser.java 2015-03-24 17:43:30.625486471 +0000
@@ -113,9 +113,6 @@
import util.ui.UIThreadRunner;
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;
@@ -567,77 +564,6 @@
public void run() {
ChannelList.completeChannelLoading();
initializeAutomaticDownload();
- 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.<br>If it is so contact you Administrator and let him do it for you.<br><br><b><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.<br><br>To get no warning on TV-Browser start the Registry value <b>WaitToKillAppTimeout</b> in the Registry path<br><b>HKEY_CURRENT_USER\\Control Panel\\Desktop</b> have to be at least <b>5000</b> or the value for <b>AutoEndTasks</b> in the same path have to be <b>0</b>.</html>"),
- Localizer.getLocalization(Localizer.I18N_ERROR),
- JOptionPane.ERROR_MESSAGE);
- }
- }
- }
- }
- } catch (Throwable registry) {
- }
- }
if (currentVersion != null
&& currentVersion.compareTo(new Version(2, 71, false)) < 0) {
--- src/tvbrowser/ui/settings/StartupSettingsTab.java.orig 2015-03-24 17:51:54.418445794 +0000
+++ src/tvbrowser/ui/settings/StartupSettingsTab.java 2015-03-24 17:52:23.370443456 +0000
@@ -50,8 +50,6 @@
import tvbrowser.ui.mainframe.PeriodItem;
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.builder.PanelBuilder;
import com.jgoodies.forms.factories.Borders;
@@ -163,41 +161,6 @@
.getBoolean());
mSettingsPn.add(mShowStartScreenChB, cc.xy(2, ++y));
- if (System.getProperty("os.name").toLowerCase().startsWith("windows") && !TVBrowser.isTransportable()) {
- layout.insertRow(++y, RowSpec.decode("1dlu"));
- layout.insertRow(++y, RowSpec.decode("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();
- }
-
- mLinkFileFile = new File(path,"TV-Browser.url");
-
- try {
- mLinkFile = new LinkFile(mLinkFileFile);
-
- if(mLinkFileFile.isFile()) {
- try {
- if (!mLinkFile.hasTarget((new File("tvbrowser.exe")).getAbsoluteFile())) {
- createLink(mLinkFile);
- }
- }catch(Exception linkException) {
- mLinkFileFile.delete();
- }
- }
- }catch(FileNotFoundException fe) {}
-
- mAutostartWithWindows = new JCheckBox(mLocalizer.msg("autostart","Start TV-Browser with Windows"),
- mLinkFileFile.isFile());
-
- mSettingsPn.add(mAutostartWithWindows, cc.xy(2, y));
- } catch (Throwable e) {e.printStackTrace();}
- }
-
y++;
mSettingsPn.add(createRefreshPanel(), cc.xyw(1,++y,5));
@@ -513,4 +476,4 @@
return new File(mTarget).equals(file);
}
}
-}
\ No newline at end of file
+}