1 |
commit: 1834efa38ba3349b146aa504de48c91d176bbaa9 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 29 19:29:52 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 29 19:41:02 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1834efa3 |
7 |
|
8 |
app-office/calligraplan: Patch out KF5KHtml dependency, fix DEPENDs |
9 |
|
10 |
- Update HOMEPAGE |
11 |
|
12 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
.../calligraplan/calligraplan-3.2.2-r1.ebuild | 92 ++++ |
16 |
.../files/calligraplan-3.2.2-no-khtml.patch | 463 +++++++++++++++++++++ |
17 |
2 files changed, 555 insertions(+) |
18 |
|
19 |
diff --git a/app-office/calligraplan/calligraplan-3.2.2-r1.ebuild b/app-office/calligraplan/calligraplan-3.2.2-r1.ebuild |
20 |
new file mode 100644 |
21 |
index 00000000000..275d4ee1d2f |
22 |
--- /dev/null |
23 |
+++ b/app-office/calligraplan/calligraplan-3.2.2-r1.ebuild |
24 |
@@ -0,0 +1,92 @@ |
25 |
+# Copyright 1999-2020 Gentoo Authors |
26 |
+# Distributed under the terms of the GNU General Public License v2 |
27 |
+ |
28 |
+EAPI=7 |
29 |
+ |
30 |
+ECM_HANDBOOK="forceoptional" |
31 |
+ECM_TEST="forceoptional" |
32 |
+KFMIN=5.74.0 |
33 |
+QTMIN=5.15.1 |
34 |
+inherit ecm kde.org |
35 |
+ |
36 |
+DESCRIPTION="Project management application" |
37 |
+HOMEPAGE="https://calligra.org/plan/" |
38 |
+ |
39 |
+if [[ ${KDE_BUILD_TYPE} == release ]]; then |
40 |
+ SRC_URI="mirror://kde/stable/calligra/${PV}/${P}.tar.xz" |
41 |
+ KEYWORDS="amd64 x86" |
42 |
+fi |
43 |
+ |
44 |
+LICENSE="GPL-2" |
45 |
+SLOT="5" |
46 |
+IUSE="activities +holidays kwallet X" |
47 |
+ |
48 |
+# FIXME: Disabled by upstream for good reason |
49 |
+# Crashes (https://bugs.kde.org/show_bug.cgi?id=311940) |
50 |
+# $(add_kdeapps_dep akonadi) |
51 |
+# $(add_kdeapps_dep akonadi-contacts) |
52 |
+# Currently upstream-disabled: |
53 |
+# =dev-libs/kproperty-3.0*:5 |
54 |
+# =dev-libs/kreport-3.0*:5 |
55 |
+DEPEND=" |
56 |
+ >=dev-qt/designer-${QTMIN}:5 |
57 |
+ >=dev-qt/qtdbus-${QTMIN}:5 |
58 |
+ >=dev-qt/qtgui-${QTMIN}:5 |
59 |
+ >=dev-qt/qtprintsupport-${QTMIN}:5 |
60 |
+ >=dev-qt/qtwidgets-${QTMIN}:5 |
61 |
+ >=dev-qt/qtxml-${QTMIN}:5 |
62 |
+ >=kde-frameworks/karchive-${KFMIN}:5 |
63 |
+ >=kde-frameworks/kconfig-${KFMIN}:5 |
64 |
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
65 |
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5 |
66 |
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5 |
67 |
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5 |
68 |
+ >=kde-frameworks/kguiaddons-${KFMIN}:5 |
69 |
+ >=kde-frameworks/ki18n-${KFMIN}:5 |
70 |
+ >=kde-frameworks/kiconthemes-${KFMIN}:5 |
71 |
+ >=kde-frameworks/kio-${KFMIN}:5 |
72 |
+ >=kde-frameworks/kitemviews-${KFMIN}:5 |
73 |
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5 |
74 |
+ >=kde-frameworks/knotifications-${KFMIN}:5 |
75 |
+ >=kde-frameworks/kparts-${KFMIN}:5 |
76 |
+ >=kde-frameworks/kservice-${KFMIN}:5 |
77 |
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5 |
78 |
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
79 |
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5 |
80 |
+ >=kde-frameworks/kxmlgui-${KFMIN}:5 |
81 |
+ dev-lang/perl |
82 |
+ dev-libs/kdiagram:5 |
83 |
+ activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 ) |
84 |
+ holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 ) |
85 |
+ kwallet? ( |
86 |
+ >=app-crypt/qca-2.3.0:2 |
87 |
+ >=kde-frameworks/kwallet-${KFMIN}:5 |
88 |
+ ) |
89 |
+ X? ( |
90 |
+ >=dev-qt/qtx11extras-${QTMIN}:5 |
91 |
+ x11-libs/libX11 |
92 |
+ ) |
93 |
+" |
94 |
+RDEPEND="${DEPEND} |
95 |
+ !app-office/calligra[calligra_features_plan(-)] |
96 |
+ >=dev-qt/qtsvg-${QTMIN}:5 |
97 |
+" |
98 |
+ |
99 |
+RESTRICT+=" test" |
100 |
+ |
101 |
+PATCHES=( |
102 |
+ "${FILESDIR}/${P}-qt-5.15.patch" # bug 741710 |
103 |
+ "${FILESDIR}/${P}-no-khtml.patch" |
104 |
+) |
105 |
+ |
106 |
+src_configure() { |
107 |
+ local mycmakeargs=( |
108 |
+ $(cmake_use_find_package activities KF5Activities) |
109 |
+ $(cmake_use_find_package holidays KF5Holidays) |
110 |
+ $(cmake_use_find_package kwallet Qca-qt5) |
111 |
+ $(cmake_use_find_package kwallet KF5Wallet) |
112 |
+ ) |
113 |
+ # Qt5DBus can't be disabled because of KF5DBusAddons dependency |
114 |
+ |
115 |
+ ecm_src_configure |
116 |
+} |
117 |
|
118 |
diff --git a/app-office/calligraplan/files/calligraplan-3.2.2-no-khtml.patch b/app-office/calligraplan/files/calligraplan-3.2.2-no-khtml.patch |
119 |
new file mode 100644 |
120 |
index 00000000000..c307e332f61 |
121 |
--- /dev/null |
122 |
+++ b/app-office/calligraplan/files/calligraplan-3.2.2-no-khtml.patch |
123 |
@@ -0,0 +1,463 @@ |
124 |
+From 3097da1c42ba7fe3b6a26ccb64df64db9c5588b7 Mon Sep 17 00:00:00 2001 |
125 |
+From: Dag Andersen <dag.andersen@×××××××.net> |
126 |
+Date: Mon, 26 Oct 2020 13:46:06 +0100 |
127 |
+Subject: [PATCH 1/2] Remove dependency on KHtml |
128 |
+ |
129 |
+This also removes the introductory pages, |
130 |
+but these should be cver by the documentation. |
131 |
+--- |
132 |
+ CMakeLists.txt | 10 +++---- |
133 |
+ src/CMakeLists.txt | 2 -- |
134 |
+ src/kptmaindocument.cpp | 1 - |
135 |
+ src/kptmaindocument.h | 5 ---- |
136 |
+ src/kptpart.cpp | 47 -------------------------------- |
137 |
+ src/kptpart.h | 4 --- |
138 |
+ src/kptview.cpp | 53 ------------------------------------- |
139 |
+ src/kptview.h | 10 ------- |
140 |
+ src/libs/ui/CMakeLists.txt | 5 +--- |
141 |
+ src/welcome/WelcomeView.cpp | 9 ------- |
142 |
+ src/welcome/WelcomeView.h | 1 - |
143 |
+ src/welcome/WelcomeView.ui | 6 +---- |
144 |
+ 12 files changed, 7 insertions(+), 146 deletions(-) |
145 |
+ |
146 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
147 |
+index 4348601c..13ac4d24 100644 |
148 |
+--- a/CMakeLists.txt |
149 |
++++ b/CMakeLists.txt |
150 |
+@@ -150,11 +150,11 @@ if(KF5Activities_FOUND) |
151 |
+ set(HAVE_KACTIVITIES TRUE) |
152 |
+ endif() |
153 |
+ |
154 |
+-find_package(KF5KHtml) |
155 |
+-set_package_properties(KF5KHtml PROPERTIES |
156 |
+- PURPOSE "Required for rich text support" |
157 |
+- TYPE REQUIRED |
158 |
+-) |
159 |
++#find_package(KF5KHtml) |
160 |
++#set_package_properties(KF5KHtml PROPERTIES |
161 |
++ #PURPOSE "Required for rich text support" |
162 |
++ #TYPE REQUIRED |
163 |
++#) |
164 |
+ |
165 |
+ find_package(KF5Holidays) |
166 |
+ set_package_properties(KF5Holidays PROPERTIES |
167 |
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
168 |
+index 54f1df57..ee1a6137 100644 |
169 |
+--- a/src/CMakeLists.txt |
170 |
++++ b/src/CMakeLists.txt |
171 |
+@@ -145,8 +145,6 @@ set(planprivate_LIB_SRCS |
172 |
+ kptinsertfiledlg.cpp |
173 |
+ kptloadsharedprojectsdialog.cpp |
174 |
+ |
175 |
+- about/aboutpage.cpp |
176 |
+- |
177 |
+ KPlatoXmlLoader.cpp |
178 |
+ ) |
179 |
+ |
180 |
+diff --git a/src/kptmaindocument.cpp b/src/kptmaindocument.cpp |
181 |
+index b4fe670f..f65f2eb0 100644 |
182 |
+--- a/src/kptmaindocument.cpp |
183 |
++++ b/src/kptmaindocument.cpp |
184 |
+@@ -257,7 +257,6 @@ void MainDocument::setProject(Project *project) |
185 |
+ connect(m_project, &Project::nodeChanged, this, &MainDocument::slotNodeChanged); |
186 |
+ connect(m_project, &Project::sigCalculationFinished, this, &MainDocument::slotCalculationFinished); |
187 |
+ } |
188 |
+- m_aboutPage.setProject(project); |
189 |
+ |
190 |
+ QString dir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation); |
191 |
+ if (!dir.isEmpty()) { |
192 |
+diff --git a/src/kptmaindocument.h b/src/kptmaindocument.h |
193 |
+index 44ab931c..01ad942d 100644 |
194 |
+--- a/src/kptmaindocument.h |
195 |
++++ b/src/kptmaindocument.h |
196 |
+@@ -31,7 +31,6 @@ |
197 |
+ #include "kptconfig.h" |
198 |
+ #include "kptwbsdefinition.h" |
199 |
+ #include "kptxmlloaderobject.h" |
200 |
+-#include "about/aboutpage.h" |
201 |
+ |
202 |
+ #include "KoDocument.h" |
203 |
+ |
204 |
+@@ -130,8 +129,6 @@ public: |
205 |
+ bool insertProject(Project &project, Node *parent, Node *after); |
206 |
+ bool mergeResources(Project &project); |
207 |
+ |
208 |
+- KPlatoAboutPage &aboutPage() { return m_aboutPage; } |
209 |
+- |
210 |
+ bool extractFiles(KoStore *store, Package *package); |
211 |
+ bool extractFile(KoStore *store, Package *package, const Document *doc); |
212 |
+ |
213 |
+@@ -254,8 +251,6 @@ private: |
214 |
+ QList<QUrl> m_skipUrls; |
215 |
+ QMap<QDateTime, Project*> m_mergedPackages; |
216 |
+ |
217 |
+- KPlatoAboutPage m_aboutPage; |
218 |
+- |
219 |
+ QDomDocument m_reports; |
220 |
+ |
221 |
+ bool m_viewlistModified; |
222 |
+diff --git a/src/kptpart.cpp b/src/kptpart.cpp |
223 |
+index cd31b6ce..d498f5e1 100644 |
224 |
+--- a/src/kptpart.cpp |
225 |
++++ b/src/kptpart.cpp |
226 |
+@@ -25,7 +25,6 @@ |
227 |
+ #include "kptmaindocument.h" |
228 |
+ #include "kptfactory.h" |
229 |
+ #include "welcome/WelcomeView.h" |
230 |
+-#include "kpthtmlview.h" |
231 |
+ #include "Help.h" |
232 |
+ #include "calligraplansettings.h" |
233 |
+ #include "kptdebug.h" |
234 |
+@@ -163,7 +162,6 @@ void Part::createStarUpWidget(KoMainWindow *parent) |
235 |
+ startUpWidget = new QStackedWidget(parent); |
236 |
+ |
237 |
+ startUpWidget->addWidget(createWelcomeView(parent)); |
238 |
+- startUpWidget->addWidget(createIntroductionView()); |
239 |
+ } |
240 |
+ |
241 |
+ void Part::finish() |
242 |
+@@ -188,7 +186,6 @@ QWidget *Part::createWelcomeView(KoMainWindow *mw) |
243 |
+ |
244 |
+ connect(v, &WelcomeView::loadSharedResources, doc, &MainDocument::insertResourcesFile); |
245 |
+ connect(v, &WelcomeView::recentProject, mw, &KoMainWindow::slotFileOpenRecent); |
246 |
+- connect(v, &WelcomeView::showIntroduction, this, &Part::slotShowIntroduction); |
247 |
+ connect(v, &WelcomeView::projectCreated, doc, &MainDocument::slotProjectCreated); |
248 |
+ connect(v, &WelcomeView::finished, this, &Part::finish); |
249 |
+ |
250 |
+@@ -197,50 +194,6 @@ QWidget *Part::createWelcomeView(KoMainWindow *mw) |
251 |
+ return v; |
252 |
+ } |
253 |
+ |
254 |
+-void Part::slotShowIntroduction() |
255 |
+-{ |
256 |
+- startUpWidget->setCurrentIndex(1); |
257 |
+- slotOpenUrlRequest(static_cast<HtmlView*>(startUpWidget->currentWidget()), QUrl("about:plan/main")); |
258 |
+-} |
259 |
+- |
260 |
+-void Part::slotOpenUrlRequest(HtmlView *v, const QUrl &url) |
261 |
+-{ |
262 |
+- debugPlan<<url; |
263 |
+- if (url.scheme() == QLatin1String("about")) { |
264 |
+- if (url.url() == QLatin1String("about:close")) { |
265 |
+- startUpWidget->setCurrentIndex(0); |
266 |
+- return; |
267 |
+- } |
268 |
+- if (url.url().startsWith(QLatin1String("about:plan"))) { |
269 |
+- MainDocument *doc = static_cast<MainDocument*>(document()); |
270 |
+- doc->aboutPage().generatePage(v->htmlPart(), url); |
271 |
+- return; |
272 |
+- } |
273 |
+- } |
274 |
+- if (url.scheme() == QLatin1String("help")) { |
275 |
+- KHelpClient::invokeHelp("", url.fileName()); |
276 |
+- return; |
277 |
+- } |
278 |
+- // try to open the url |
279 |
+- debugPlan<<url<<"is external, discard"; |
280 |
+- new KRun(url, currentMainwindow()); |
281 |
+-} |
282 |
+- |
283 |
+-QWidget *Part::createIntroductionView() |
284 |
+-{ |
285 |
+- HtmlView *v = new HtmlView(this, document(), startUpWidget); |
286 |
+- v->htmlPart().setJScriptEnabled(false); |
287 |
+- v->htmlPart().setJavaEnabled(false); |
288 |
+- v->htmlPart().setMetaRefreshEnabled(false); |
289 |
+- v->htmlPart().setPluginsEnabled(false); |
290 |
+- |
291 |
+- slotOpenUrlRequest(v, QUrl("about:plan/main")); |
292 |
+- |
293 |
+- connect(v, &KPlato::HtmlView::openUrlRequest, this, &KPlato::Part::slotOpenUrlRequest); |
294 |
+- |
295 |
+- return v; |
296 |
+-} |
297 |
+- |
298 |
+ void Part::configure(KoMainWindow *mw) |
299 |
+ { |
300 |
+ //debugPlan; |
301 |
+diff --git a/src/kptpart.h b/src/kptpart.h |
302 |
+index 90f50257..20429fe2 100644 |
303 |
+--- a/src/kptpart.h |
304 |
++++ b/src/kptpart.h |
305 |
+@@ -33,7 +33,6 @@ class QStackedWidget; |
306 |
+ namespace KPlato |
307 |
+ { |
308 |
+ class MainDocument; |
309 |
+-class HtmlView; |
310 |
+ |
311 |
+ class PLAN_EXPORT Part : public KoPart |
312 |
+ { |
313 |
+@@ -63,8 +62,6 @@ public Q_SLOTS: |
314 |
+ void finish(); |
315 |
+ |
316 |
+ protected Q_SLOTS: |
317 |
+- void slotShowIntroduction(); |
318 |
+- void slotOpenUrlRequest(KPlato::HtmlView *v, const QUrl &url); |
319 |
+ void openTemplate(const QUrl& url) override; |
320 |
+ void slotOpenTemplate(const QUrl& url); |
321 |
+ |
322 |
+@@ -74,7 +71,6 @@ protected Q_SLOTS: |
323 |
+ protected: |
324 |
+ void createStarUpWidget(KoMainWindow *parent); |
325 |
+ QWidget *createWelcomeView(KoMainWindow *parent); |
326 |
+- QWidget *createIntroductionView(); |
327 |
+ |
328 |
+ private: |
329 |
+ KPlato::MainDocument *m_document; |
330 |
+diff --git a/src/kptview.cpp b/src/kptview.cpp |
331 |
+index aa2c3dd7..7af53136 100644 |
332 |
+--- a/src/kptview.cpp |
333 |
++++ b/src/kptview.cpp |
334 |
+@@ -103,7 +103,6 @@ |
335 |
+ #include "kptpertresult.h" |
336 |
+ #include "kptinsertfiledlg.h" |
337 |
+ #include "kptloadsharedprojectsdialog.h" |
338 |
+-#include "kpthtmlview.h" |
339 |
+ #include "about/aboutpage.h" |
340 |
+ #include "kptlocaleconfigmoneydialog.h" |
341 |
+ #include "kptflatproxymodel.h" |
342 |
+@@ -196,7 +195,6 @@ View::View(KoPart *part, MainDocument *doc, QWidget *parent) |
343 |
+ //////////////////////////////////////////////////////////////////////////////////////////////////// |
344 |
+ |
345 |
+ // Add sub views |
346 |
+- createIntroductionView(); |
347 |
+ |
348 |
+ // The menu items |
349 |
+ // ------ File |
350 |
+@@ -258,11 +256,6 @@ View::View(KoPart *part, MainDocument *doc, QWidget *parent) |
351 |
+ connect(actionOpenReportFile, QAction::triggered, this, &View::slotOpenReportFile); |
352 |
+ #endif |
353 |
+ |
354 |
+- // ------ Help |
355 |
+- actionIntroduction = new QAction(koIcon("dialog-information"), i18n("Introduction to Plan"), this); |
356 |
+- actionCollection()->addAction("plan_introduction", actionIntroduction); |
357 |
+- connect(actionIntroduction, &QAction::triggered, this, &View::slotIntroduction); |
358 |
+- |
359 |
+ // ------ Popup |
360 |
+ actionOpenNode = new QAction(koIcon("document-edit"), i18n("Edit..."), this); |
361 |
+ actionCollection()->addAction("node_properties", actionOpenNode); |
362 |
+@@ -762,46 +755,6 @@ ViewInfo View::defaultCategoryInfo(const QString &type) const |
363 |
+ return vi; |
364 |
+ } |
365 |
+ |
366 |
+-void View::slotOpenUrlRequest(HtmlView *v, const QUrl &url) |
367 |
+-{ |
368 |
+- debugPlan<<url; |
369 |
+- if (url.scheme() == QLatin1String("about")) { |
370 |
+- if (url.url() == QLatin1String("about:close")) { |
371 |
+- int view = m_visitedViews.count() < 2 ? qMin(m_defaultView, m_tab->count()-1) : m_visitedViews.at(m_visitedViews.count() - 2); |
372 |
+- debugPlan<<"Prev:"<<view<<m_visitedViews; |
373 |
+- m_tab->setCurrentIndex(view); |
374 |
+- return; |
375 |
+- } |
376 |
+- if (url.url().startsWith(QLatin1String("about:plan"))) { |
377 |
+- getPart()->aboutPage().generatePage(v->htmlPart(), url); |
378 |
+- return; |
379 |
+- } |
380 |
+- } |
381 |
+- if (url.scheme() == QLatin1String("help")) { |
382 |
+- KHelpClient::invokeHelp("", url.fileName()); |
383 |
+- return; |
384 |
+- } |
385 |
+- // try to open the url |
386 |
+- debugPlan<<url<<"is external, try to open"; |
387 |
+- new KRun(url, mainWindow()); |
388 |
+-} |
389 |
+- |
390 |
+-ViewBase *View::createIntroductionView() |
391 |
+-{ |
392 |
+- HtmlView *v = new HtmlView(getKoPart(), getPart(), m_tab); |
393 |
+- v->htmlPart().setJScriptEnabled(false); |
394 |
+- v->htmlPart().setJavaEnabled(false); |
395 |
+- v->htmlPart().setMetaRefreshEnabled(false); |
396 |
+- v->htmlPart().setPluginsEnabled(false); |
397 |
+- |
398 |
+- slotOpenUrlRequest(v, QUrl("about:plan/main")); |
399 |
+- |
400 |
+- connect(v, &HtmlView::openUrlRequest, this, &View::slotOpenUrlRequest); |
401 |
+- |
402 |
+- m_tab->addWidget(v); |
403 |
+- return v; |
404 |
+-} |
405 |
+- |
406 |
+ ViewBase *View::createResourceAppointmentsGanttView(ViewListItem *cat, const QString &tag, const QString &name, const QString &tip, int index) |
407 |
+ { |
408 |
+ ResourceAppointmentsGanttView *v = new ResourceAppointmentsGanttView(getKoPart(), getPart(), m_tab); |
409 |
+@@ -1966,12 +1919,6 @@ void View::slotDefineWBSFinished(int result) |
410 |
+ dia->deleteLater(); |
411 |
+ } |
412 |
+ |
413 |
+-void View::slotIntroduction() |
414 |
+-{ |
415 |
+- m_tab->setCurrentIndex(0); |
416 |
+-} |
417 |
+- |
418 |
+- |
419 |
+ Calendar *View::currentCalendar() |
420 |
+ { |
421 |
+ ViewBase *v = dynamic_cast<ViewBase*>(m_tab->currentWidget()); |
422 |
+diff --git a/src/kptview.h b/src/kptview.h |
423 |
+index b9242811..33b9a198 100644 |
424 |
+--- a/src/kptview.h |
425 |
++++ b/src/kptview.h |
426 |
+@@ -84,7 +84,6 @@ class ResourceGroup; |
427 |
+ class Relation; |
428 |
+ class Context; |
429 |
+ class ViewAdaptor; |
430 |
+-class HtmlView; |
431 |
+ class ReportView; |
432 |
+ |
433 |
+ class ReportDesignDialog; |
434 |
+@@ -179,8 +178,6 @@ public Q_SLOTS: |
435 |
+ |
436 |
+ void slotCreateView(); |
437 |
+ |
438 |
+- void slotIntroduction(); |
439 |
+- |
440 |
+ void openRelationDialog(KPlato::Node *par, KPlato::Node *child); |
441 |
+ void slotEditRelation(KPlato::Relation *rel); |
442 |
+ void slotAddRelation(KPlato::Node *par, KPlato::Node *child, int linkType); |
443 |
+@@ -258,8 +255,6 @@ protected Q_SLOTS: |
444 |
+ void slotMailWorkpackage(KPlato::Node *node, KPlato::Resource *resource = nullptr); |
445 |
+ void slotPublishWorkpackages(const QList<KPlato::Node*> &nodes, KPlato::Resource *resource, bool mailTo); |
446 |
+ |
447 |
+- void slotOpenUrlRequest(KPlato::HtmlView *v, const QUrl &url); |
448 |
+- |
449 |
+ void createReportView(const QDomDocument &doc); |
450 |
+ |
451 |
+ void saveTaskModule(const QUrl &url, KPlato::Project *project); |
452 |
+@@ -281,8 +276,6 @@ protected: |
453 |
+ |
454 |
+ ViewBase *currentView() const; |
455 |
+ |
456 |
+- ViewBase *createIntroductionView(); |
457 |
+- |
458 |
+ private Q_SLOTS: |
459 |
+ void slotActionDestroyed(QObject *o); |
460 |
+ void slotViewListItemRemoved(KPlato::ViewListItem *item); |
461 |
+@@ -383,9 +376,6 @@ private: |
462 |
+ // ------ Settings |
463 |
+ QAction *actionConfigure; |
464 |
+ |
465 |
+- // ------ Help |
466 |
+- QAction *actionIntroduction; |
467 |
+- |
468 |
+ // ------ Popup |
469 |
+ QAction *actionOpenNode; |
470 |
+ QAction *actionTaskProgress; |
471 |
+diff --git a/src/libs/ui/CMakeLists.txt b/src/libs/ui/CMakeLists.txt |
472 |
+index ca22f77f..15d8087c 100644 |
473 |
+--- a/src/libs/ui/CMakeLists.txt |
474 |
++++ b/src/libs/ui/CMakeLists.txt |
475 |
+@@ -96,8 +96,6 @@ set(planui_LIB_SRCS |
476 |
+ kptworkpackagemergedialog.cpp |
477 |
+ kptrecalculatedialog.cpp |
478 |
+ |
479 |
+- kpthtmlview.cpp |
480 |
+- |
481 |
+ locale/localemon.cpp |
482 |
+ kptlocaleconfigmoneydialog.cpp |
483 |
+ |
484 |
+@@ -166,13 +164,12 @@ target_link_libraries(planui |
485 |
+ PUBLIC |
486 |
+ planmain |
487 |
+ planmodels |
488 |
+- KF5::KHtml |
489 |
++ KF5::TextWidgets |
490 |
+ PRIVATE |
491 |
+ KChart |
492 |
+ KF5::ItemViews |
493 |
+ KF5::IconThemes |
494 |
+ KF5::Archive |
495 |
+- KF5::TextWidgets |
496 |
+ KF5::KIOCore |
497 |
+ KF5::KIOFileWidgets |
498 |
+ KF5::KIOWidgets |
499 |
+diff --git a/src/welcome/WelcomeView.cpp b/src/welcome/WelcomeView.cpp |
500 |
+index bede7f4f..b6115fd7 100644 |
501 |
+--- a/src/welcome/WelcomeView.cpp |
502 |
++++ b/src/welcome/WelcomeView.cpp |
503 |
+@@ -156,14 +156,6 @@ WelcomeView::WelcomeView(KoPart *part, KoDocument *doc, QWidget *parent) |
504 |
+ "<nl/>This enables you to quickly open projects you have worked on recently." |
505 |
+ "</para>")); |
506 |
+ |
507 |
+- Help::add(ui.introductionBtn, |
508 |
+- xi18nc("@info:whatsthis", |
509 |
+- "<title>Introduction to <application>Plan</application></title>" |
510 |
+- "<para>" |
511 |
+- "These introductory pages gives you hints and tips on what" |
512 |
+- " you can use <application>Plan</application> for, and how to use it." |
513 |
+- "</para>")); |
514 |
+- |
515 |
+ Help::add(ui.contextHelp, |
516 |
+ xi18nc("@info:whatsthis", |
517 |
+ "<title>Context help</title>" |
518 |
+@@ -199,7 +191,6 @@ WelcomeView::WelcomeView(KoPart *part, KoDocument *doc, QWidget *parent) |
519 |
+ connect(ui.newProjectBtn, &QAbstractButton::clicked, this, &WelcomeView::slotNewProject); |
520 |
+ connect(ui.createResourceFileBtn, &QAbstractButton::clicked, this, &WelcomeView::slotCreateResourceFile); |
521 |
+ connect(ui.openProjectBtn, &QAbstractButton::clicked, this, &WelcomeView::slotOpenProject); |
522 |
+- connect(ui.introductionBtn, &QAbstractButton::clicked, this, &WelcomeView::showIntroduction); |
523 |
+ |
524 |
+ connect(ui.recentProjects, &QAbstractItemView::activated, this, &WelcomeView::slotRecentFileSelected); |
525 |
+ |
526 |
+diff --git a/src/welcome/WelcomeView.h b/src/welcome/WelcomeView.h |
527 |
+index a09ebe2d..be604de7 100644 |
528 |
+--- a/src/welcome/WelcomeView.h |
529 |
++++ b/src/welcome/WelcomeView.h |
530 |
+@@ -64,7 +64,6 @@ Q_SIGNALS: |
531 |
+ void newProject(); |
532 |
+ void openProject(); |
533 |
+ void recentProject(const QUrl &file, KoPart *part); |
534 |
+- void showIntroduction(); |
535 |
+ void selectDefaultView(); |
536 |
+ void loadSharedResources(const QUrl &url, const QUrl &projects); |
537 |
+ void openExistingFile(const QUrl &url); |
538 |
+diff --git a/src/welcome/WelcomeView.ui b/src/welcome/WelcomeView.ui |
539 |
+index 7317214b..9b3363db 100644 |
540 |
+--- a/src/welcome/WelcomeView.ui |
541 |
++++ b/src/welcome/WelcomeView.ui |
542 |
+@@ -231,14 +231,10 @@ |
543 |
+ </spacer> |
544 |
+ </item> |
545 |
+ <item> |
546 |
+- <widget class="QPushButton" name="introductionBtn"> |
547 |
++ <widget class="QLabel" name="label_6"> |
548 |
+ <property name="text"> |
549 |
+ <string>Introduction</string> |
550 |
+ </property> |
551 |
+- <property name="icon"> |
552 |
+- <iconset theme="help-hint"> |
553 |
+- <normaloff>.</normaloff>.</iconset> |
554 |
+- </property> |
555 |
+ </widget> |
556 |
+ </item> |
557 |
+ <item> |
558 |
+-- |
559 |
+2.29.1 |
560 |
+ |
561 |
+ |
562 |
+From 8aec5de56c525e71ae650abd4abfba756f5e5724 Mon Sep 17 00:00:00 2001 |
563 |
+From: Dag Andersen <dag.andersen@×××××××.net> |
564 |
+Date: Mon, 26 Oct 2020 14:17:48 +0100 |
565 |
+Subject: [PATCH 2/2] User docs now on docs.kde.org |
566 |
+ |
567 |
+--- |
568 |
+ src/welcome/WelcomeView.ui | 2 +- |
569 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
570 |
+ |
571 |
+diff --git a/src/welcome/WelcomeView.ui b/src/welcome/WelcomeView.ui |
572 |
+index 9b3363db..741913b3 100644 |
573 |
+--- a/src/welcome/WelcomeView.ui |
574 |
++++ b/src/welcome/WelcomeView.ui |
575 |
+@@ -307,7 +307,7 @@ |
576 |
+ <string>https://userbase.kde.org/Plan</string> |
577 |
+ </property> |
578 |
+ <property name="text"> |
579 |
+- <string comment="@action:button"><a href="https://userbase.kde.org/Plan">Plan user documentation</a></string> |
580 |
++ <string comment="@action:button"><a href="https://docs.kde.org/index.php?application=calligraplan">Plan user documentation</a></string> |
581 |
+ </property> |
582 |
+ <property name="alignment"> |
583 |
+ <set>Qt::AlignCenter</set> |
584 |
+-- |
585 |
+2.29.1 |
586 |
+ |