Commit | Line | Data |
---|---|---|
808e4c14 EF |
1 | https://salsa.debian.org/debian/tipp10/-/raw/debian/2.1.0-5/debian/patches/disable_downloaders.patch |
2 | ||
3 | Author: Reiner Herrmann <reiner@reiner-h.de> | |
4 | Description: Disable downloaders | |
5 | This makes porting to Qt5 much easier, as QHttp is no longer available. | |
6 | But the functionality was not enabled anyway or is no longer useful. | |
7 | . | |
8 | - checkversion.h/.cpp: | |
9 | At startup (while loading settings), Tipp10 "phones home" to do an | |
10 | update check (www.tipp10.com/update/version.tipp10v210). | |
11 | For a packaged software and one that is no longer being developed, | |
12 | this does not make much sense. | |
13 | - updatedialog.h/.cpp: | |
14 | Can download newer sqlite database (www.tipp10.com/update/sql.tipp10v210.utf), | |
15 | but this file is no longer available on the server (404). | |
16 | The update action has also not been enabled in the menu, so the update | |
17 | functionality was currently not active: | |
18 | widget/mainwindow.cpp:143: //fileMenu->addAction(updateAction); | |
19 | - downloaddialog.h/.cpp: | |
20 | Allows downloading lessons from user-specified location. | |
21 | But the action (widget/startwidget.cpp -> lessonDownload) has not been part | |
22 | of any menu, so it was also not in use. | |
23 | ||
24 | --- a/tipp10.pro | |
25 | +++ b/tipp10.pro | |
26 | @@ -15,7 +15,6 @@ | |
27 | INCLUDEPATH += .\r | |
28 | CONFIG += qt\r | |
29 | QT += sql\r | |
30 | -QT += network\r | |
31 | RC_FILE += tipp10.rc\r | |
32 | RESOURCES += tipp10.qrc\r | |
33 | HEADERS += def/defines.h \\r | |
34 | @@ -36,15 +35,12 @@ | |
35 | widget/settingspages.h \\r | |
36 | widget/lessondialog.h \\r | |
37 | widget/regexpdialog.h \\r | |
38 | - widget/downloaddialog.h \\r | |
39 | widget/lessonprintdialog.h \\r | |
40 | widget/lessonresult.h \\r | |
41 | - widget/updatedialog.h \\r | |
42 | widget/helpbrowser.h \\r | |
43 | widget/companylogo.h \\r | |
44 | widget/errormessage.h \\r | |
45 | widget/txtmessagedialog.h \\r | |
46 | - widget/checkversion.h \\r | |
47 | sql/connection.h \\r | |
48 | sql/lessontablesql.h \\r | |
49 | sql/chartablesql.h \\r | |
50 | @@ -70,15 +66,12 @@ | |
51 | widget/settingspages.cpp \\r | |
52 | widget/lessondialog.cpp \\r | |
53 | widget/regexpdialog.cpp \\r | |
54 | - widget/downloaddialog.cpp \\r | |
55 | widget/lessonprintdialog.cpp \\r | |
56 | widget/lessonresult.cpp \\r | |
57 | - widget/updatedialog.cpp \\r | |
58 | widget/helpbrowser.cpp \\r | |
59 | widget/companylogo.cpp \\r | |
60 | widget/errormessage.cpp \\r | |
61 | widget/txtmessagedialog.cpp \\r | |
62 | - widget/checkversion.cpp \\r | |
63 | sql/lessontablesql.cpp \\r | |
64 | sql/chartablesql.cpp \\r | |
65 | sql/trainingsql.cpp \\r | |
66 | --- a/widget/mainwindow.cpp | |
67 | +++ b/widget/mainwindow.cpp | |
68 | @@ -41,11 +41,9 @@ | |
69 | \r | |
70 | #include "mainwindow.h"\r | |
71 | #include "settingsdialog.h"\r | |
72 | -#include "updatedialog.h"\r | |
73 | #include "def/defines.h"\r | |
74 | #include "def/errordefines.h"\r | |
75 | #include "errormessage.h"\r | |
76 | -#include "checkversion.h"\r | |
77 | \r | |
78 | MainWindow::MainWindow() {\r | |
79 | trainingStarted = false;\r | |
80 | @@ -214,8 +212,8 @@ | |
81 | }\r | |
82 | \r | |
83 | void MainWindow::showUpdate() {\r | |
84 | - UpdateDialog updateDialog(this);\r | |
85 | - updateDialog.exec();\r | |
86 | + //UpdateDialog updateDialog(this);\r | |
87 | + //updateDialog.exec();\r | |
88 | // Fill lesson list after online update\r | |
89 | startWidget->fillLessonList(false);\r | |
90 | }\r | |
91 | @@ -486,6 +484,7 @@ | |
92 | settings.endGroup();\r | |
93 | \r | |
94 | settings.beginGroup("general");\r | |
95 | +#if 0\r | |
96 | if (settings.value("check_new_version", true).toBool()) {\r | |
97 | \r | |
98 | QDate lastVersionCheck = settings.value("last_version_check").toDate();\r | |
99 | @@ -499,6 +498,7 @@ | |
100 | }\r | |
101 | settings.setValue("last_version_check", today);\r | |
102 | }\r | |
103 | +#endif\r | |
104 | settings.endGroup();\r | |
105 | }\r | |
106 | \r | |
107 | --- a/widget/settingspages.cpp | |
108 | +++ b/widget/settingspages.cpp | |
109 | @@ -581,7 +581,7 @@ | |
110 | \r | |
111 | // Layout of group box vertical\r | |
112 | QVBoxLayout *layout = new QVBoxLayout;\r | |
113 | - layout->addWidget(checkNewVersion);\r | |
114 | + //layout->addWidget(checkNewVersion);\r | |
115 | layout->addSpacing(1);\r | |
116 | layout->addWidget(checkNativeStyle);\r | |
117 | layout->setMargin(16);\r | |
118 | @@ -610,7 +610,6 @@ | |
119 | checkIntelligence->setChecked(settings.value("check_toggle_intelligence", true).toBool());\r | |
120 | checkLimitLesson->setChecked(settings.value("check_limit_lesson", true).toBool());\r | |
121 | checkLessonPublish->setChecked(settings.value("check_lesson_publish", true).toBool());\r | |
122 | - checkNewVersion->setChecked(settings.value("check_new_version", true).toBool());\r | |
123 | checkNativeStyle->setChecked(settings.value("check_native_style", false).toBool());\r | |
124 | settings.endGroup();\r | |
125 | }\r | |
126 | @@ -636,7 +635,6 @@ | |
127 | settings.setValue("check_limit_lesson", checkLimitLesson->isChecked());\r | |
128 | settings.setValue("check_lesson_publish", checkLessonPublish->isChecked());\r | |
129 | settings.setValue("check_native_style", checkNativeStyle->isChecked());\r | |
130 | - settings.setValue("check_new_version", checkNewVersion->isChecked());\r | |
131 | settings.endGroup();\r | |
132 | \r | |
133 | return requireRestart;\r | |
134 | --- a/widget/startwidget.cpp | |
135 | +++ b/widget/startwidget.cpp | |
136 | @@ -43,12 +43,10 @@ | |
137 | \r | |
138 | #include "startwidget.h"\r | |
139 | #include "sql/startsql.h"\r | |
140 | -#include "updatedialog.h"\r | |
141 | #include "def/defines.h"\r | |
142 | #include "def/errordefines.h"\r | |
143 | #include "errormessage.h"\r | |
144 | #include "lessondialog.h"\r | |
145 | -#include "downloaddialog.h"\r | |
146 | #include "illustrationdialog.h"\r | |
147 | #include "txtmessagedialog.h"\r | |
148 | \r | |
149 | @@ -1048,7 +1046,7 @@ | |
150 | }\r | |
151 | \r | |
152 | void StartWidget::clickDownloadLesson() {\r | |
153 | -\r | |
154 | +#if 0\r | |
155 | QStringList lessonData;\r | |
156 | \r | |
157 | DownloadDialog downloadDialog(&lessonData, this);\r | |
158 | @@ -1083,6 +1081,7 @@ | |
159 | }\r | |
160 | }\r | |
161 | }\r | |
162 | +#endif\r | |
163 | }\r | |
164 | \r | |
165 | void StartWidget::clickEditLesson() {\r |