Commit b64f6f7f authored by Volker Krause's avatar Volker Krause

Exterminate tip of the day.

Kontact was one of the very few KDE applications still using this
obsolete feature from the 90s.
parent 022751df
......@@ -93,14 +93,6 @@ OrgKdeAkregatorPartInterface *AkregatorPlugin::interface()
}
QString AkregatorPlugin::tipFile() const
{
// TODO: tips file
//QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "akregator/tips");
QString file;
return file;
}
KParts::ReadOnlyPart *AkregatorPlugin::createPart()
{
KParts::ReadOnlyPart *part = loadPart();
......
......@@ -51,7 +51,6 @@ public:
AkregatorPlugin(KontactInterface::Core *core, const QVariantList &);
~AkregatorPlugin();
QString tipFile() const Q_DECL_OVERRIDE;
int weight() const Q_DECL_OVERRIDE
{
return 475;
......
......@@ -119,14 +119,6 @@ void KAddressBookPlugin::slotNewContactGroup()
QMetaObject::invokeMethod(part, "newGroup");
}
QString KAddressBookPlugin::tipFile() const
{
// TODO: tips file
//QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kaddressbook/tips");
QString file;
return file;
}
KParts::ReadOnlyPart *KAddressBookPlugin::createPart()
{
KParts::ReadOnlyPart *part = loadPart();
......
......@@ -45,7 +45,6 @@ public:
KAddressBookPlugin(KontactInterface::Core *core, const QVariantList &);
~KAddressBookPlugin();
QString tipFile() const Q_DECL_OVERRIDE;
bool isRunningStandalone() const Q_DECL_OVERRIDE;
int weight() const Q_DECL_OVERRIDE
{
......
......@@ -360,7 +360,6 @@ generate_export_header(kmailprivate BASE_NAME kmail)
)
install(FILES data/org.kde.kmail.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
install(FILES antispam-virus/kmail.antispamrc antispam-virus/kmail.antivirusrc DESTINATION ${KDE_INSTALL_CONFDIR})
install(FILES tips DESTINATION ${KDE_INSTALL_DATADIR}/kmail2)
install(FILES
data/kmail_config_misc.desktop
data/kmail_config_appearance.desktop
......
......@@ -19,7 +19,6 @@
#include <KMessageBox>
#include <KLocalizedString>
#include <KRun>
#include <KTipDialog>
#include "util.h"
#include "archivemailagentinterface.h"
......@@ -163,7 +162,3 @@ void KMLaunchExternalComponent::slotFilterLogViewer()
MailCommon::FilterManager::instance()->showFilterLogDialog((qlonglong)mParentWidget->winId());
}
void KMLaunchExternalComponent::slotShowTip()
{
KTipDialog::showTip(mParentWidget, QString(), true);
}
......@@ -41,7 +41,6 @@ public Q_SLOTS:
void slotFilterLogViewer();
void slotAntiVirusWizard();
void slotAntiSpamWizard();
void slotShowTip();
private:
QWidget *mParentWidget;
};
......
......@@ -3404,8 +3404,6 @@ void KMMainWidget::setupActions()
actionCollection()->addAction(KStandardAction::Undo, QStringLiteral("kmail_undo"), this, SLOT(slotUndo()));
KStandardAction::tipOfDay(mLaunchExternalComponent, SLOT(slotShowTip()), actionCollection());
menutimer = new QTimer(this);
menutimer->setObjectName(QStringLiteral("menutimer"));
menutimer->setSingleShot(true);
......
......@@ -89,10 +89,6 @@ KMMainWin::KMMainWin(QWidget *)
connect(mKMMainWidget, SIGNAL(captionChangeRequest(QString)),
SLOT(setCaption(QString)));
if (kmkernel->firstInstance()) {
QTimer::singleShot(200, this, SLOT(slotShowTipOnStart()));
}
mKMMainWidget->updateQuickSearchLineText();
}
......@@ -214,11 +210,6 @@ bool KMMainWin::queryClose()
return kmkernel->canQueryClose();
}
void KMMainWin::slotShowTipOnStart()
{
KTipDialog::showTip(this);
}
void KMMainWin::slotConfigureShortcuts()
{
if (guiFactory()->configureShortcuts()) {
......
......@@ -63,7 +63,6 @@ protected:
protected Q_SLOTS:
void slotQuit();
void slotShowTipOnStart();
private Q_SLOTS:
void slotToggleMenubar(bool dontShowWarning = false);
......
......@@ -184,12 +184,6 @@ bool KMailPlugin::createDBUSInterface(const QString &serviceType)
return false;
}
QString KMailPlugin::tipFile() const
{
const QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kmail2/tips"));
return file;
}
KParts::ReadOnlyPart *KMailPlugin::createPart()
{
KParts::ReadOnlyPart *part = loadPart();
......
......@@ -56,7 +56,6 @@ public:
bool isRunningStandalone() const Q_DECL_OVERRIDE;
bool createDBUSInterface(const QString &serviceType) Q_DECL_OVERRIDE;
KontactInterface::Summary *createSummaryWidget(QWidget *parent) Q_DECL_OVERRIDE;
QString tipFile() const Q_DECL_OVERRIDE;
int weight() const Q_DECL_OVERRIDE
{
return 200;
......
<tip category="KMail|Keyboard">
<html>
<p>...that you can go to the next and previous message by using the
right and left arrow keys respectively?</p>
</html>
</tip>
<tip category="KMail|Filters">
<html>
<p>...that you can rapidly create filters on sender, recipient,
subject and mailing lists with <em>Message-&gt;Create Filter</em>?</p>
</html>
</tip>
<tip category="KMail|General">
<html>
<p>...that you can associate mailing lists with folders in the
<em>Folder-&gt;Mailing List Management</em> dialog? You can then use
<em>Message-&gt;New Message to Mailing List...</em>
to open the composer with the mailing list address preset.
Alternatively, you can click with the middle mouse button on the folder.</p>
</html>
</tip>
<tip category="KMail|General">
<html>
<p>...that you can assign custom icons to each folder individually?
See <em>Folder-&gt;Properties</em></p>
</html>
</tip>
<tip category="KMail|Security">
<html>
<p>...that KMail can show a color bar indicating the type of message
(Plain text/HTML/OpenPGP) currently displayed?</p>
<p>This thwarts attempts to fake successful signature verification by
sending HTML mails mimicking KMail's signature status frames.</p>
</html>
</tip>
<tip category="KMail|Filters">
<html>
<p>...that you can filter on any header by simply entering its name
in the first edit field of a search rule?</p>
</html>
</tip>
<tip category="KMail|Filters">
<html>
<p>...that you can filter out HTML only messages with the rule
<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>
</p>
</html>
</tip>
<tip category="KMail|General">
<html>
<p>...that when replying, only the selected part of the message is quoted?</p>
<p>If nothing is selected, the full message is quoted.</p>
<p>This even works with text of attachments when
<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>
<p>This feature is available with all reply commands except
<em>Message-&gt;Reply Without Quote</em>.</p>
<p align="right"><em>contributed by David F. Newman</em></p>
</html>
</tip>
......@@ -87,14 +87,6 @@ bool KNotesPlugin::isRunningStandalone() const
return mUniqueAppWatcher->isRunningStandalone();
}
QString KNotesPlugin::tipFile() const
{
// TODO: tips file
//QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "knotes/tips");
QString file;
return file;
}
KParts::ReadOnlyPart *KNotesPlugin::createPart()
{
return new KNotesPart(this);
......
......@@ -47,7 +47,6 @@ public:
bool isRunningStandalone() const Q_DECL_OVERRIDE;
QString tipFile() const Q_DECL_OVERRIDE;
int weight() const Q_DECL_OVERRIDE
{
return 600;
......
<?xml version="1.0"?>
<!DOCTYPE gui SYSTEM "kpartgui.dtd">
<gui version="414" name="kontact" >
<gui version="415" name="kontact" >
<MenuBar>
<Menu name="file" noMerge="1">
<text>&amp;File</text>
......@@ -21,7 +21,6 @@
</Menu>
<Menu name="help"><text>&amp;Help</text>
<Action name="help_introduction"/>
<Action name="help_tipofday"/>
</Menu>
</MenuBar>
<ToolBar position="Top" noMerge="1" name="mainToolBar"><text>Main Toolbar</text>
......
......@@ -55,7 +55,6 @@ using namespace Kontact;
#include <KShortcutsDialog>
#include <KSqueezedTextLabel>
#include <KStandardAction>
#include <KTipDialog>
#include <KToolBar>
#include <KParts/PartManager>
#include <KSettings/Dispatcher>
......@@ -250,8 +249,6 @@ void MainWindow::initObject()
statusBar()->show();
QTimer::singleShot(200, this, SLOT(slotShowTipOnStart()));
// done initializing
slotShowStatusMsg(QString());
......@@ -482,17 +479,6 @@ void MainWindow::setupActions()
actionCollection()->addAction(QStringLiteral("help_introduction"), action);
connect(action, &QAction::triggered, this, &MainWindow::slotShowIntroduction);
action =
new QAction(QIcon::fromTheme(QStringLiteral("ktip")),
i18nc("@action:inmenu", "&Tip of the Day"), this);
setHelpText(action, i18nc("@info:status", "Show the Tip-of-the-Day dialog"));
action->setWhatsThis(
i18nc("@info:whatsthis",
"You will be presented with a dialog showing small tips to help "
"you use this program more effectively."));
actionCollection()->addAction(QStringLiteral("help_tipofday"), action);
connect(action, &QAction::triggered, this, &MainWindow::slotShowTip);
//TODO 4.12: add description
QShortcut *shortcut = new QShortcut(QKeySequence(Qt::Key_F9), this);
connect(shortcut, &QShortcut::activated, this, &MainWindow::slotShowHideSideBar);
......@@ -998,35 +984,11 @@ void MainWindow::saveSettings()
}
}
void MainWindow::slotShowTip()
{
showTip(true);
}
void MainWindow::slotShowTipOnStart()
{
showTip(false);
}
void MainWindow::slotShowIntroduction()
{
mPartsStack->setCurrentIndex(0);
}
void MainWindow::showTip(bool force)
{
QStringList tips;
PluginList::ConstIterator end = mPlugins.constEnd();
for (PluginList::ConstIterator it = mPlugins.constBegin(); it != end; ++it) {
const QString file = (*it)->tipFile();
if (!file.isEmpty()) {
tips.append(file);
}
}
KTipDialog::showMultiTip(this, tips, force);
}
void MainWindow::slotQuit()
{
mReallyClose = true;
......
......@@ -81,8 +81,6 @@ protected Q_SLOTS:
void slotNewClicked();
void slotSyncClicked();
void slotQuit();
void slotShowTip();
void slotShowTipOnStart();
void slotNewToolbarConfig();
void slotShowIntroduction();
void showAboutDialog();
......@@ -106,7 +104,6 @@ private:
void addPlugin(KontactInterface::Plugin *plugin);
void partLoaded(KontactInterface::Plugin *plugin, KParts::ReadOnlyPart *part) Q_DECL_OVERRIDE;
void setupActions();
void showTip(bool);
bool queryClose() Q_DECL_OVERRIDE;
void readProperties(const KConfigGroup &config) Q_DECL_OVERRIDE;
void saveProperties(KConfigGroup &config) Q_DECL_OVERRIDE;
......
......@@ -287,11 +287,6 @@ set(korganizerprivate_LIB_SRCS
DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR}
)
install(FILES
tips
DESTINATION ${KDE_INSTALL_DATADIR}/korganizer
)
install(FILES
korganizer_part.desktop data/webcal.protocol
DESTINATION ${KDE_INSTALL_KSERVICES5DIR}
......
......@@ -80,7 +80,6 @@
#include <KStandardAction>
#include <QTemporaryFile>
#include <KTipDialog>
#include <KToggleAction>
#include <KWindowSystem>
#include <KIO/NetAccess>
......@@ -158,10 +157,6 @@ void ActionManager::init()
// add this instance of the window to the static list.
if (!mWindowList) {
mWindowList = new KOWindowList;
// Show tip of the day, when the first calendar is shown.
if (!mIsPart) {
QTimer::singleShot(0, this, SLOT(showTipOnStart()));
}
}
// Note: We need this ActionManager to be fully constructed, and
......@@ -719,11 +714,6 @@ void ActionManager::initActions()
KStandardAction::preferences(mCalendarView, SLOT(edit_options()), mACollection);
KStandardAction::keyBindings(this, SLOT(keyBindings()), mACollection);
}
/**************************** HELP MENU **********************************/
QAction *a = mACollection->addAction(KStandardAction::TipofDay, this,
SLOT(showTip()));
mACollection->addAction(QStringLiteral("help_tipofday"), a);
}
void ActionManager::setItems(const QStringList &lst, int idx)
......@@ -1257,18 +1247,6 @@ void ActionManager::configureDateTime()
}
}
void ActionManager::showTip()
{
KTipDialog::showTip(dialogParent(), QString(), true);
}
void ActionManager::showTipOnStart()
{
KConfigGroup config(KSharedConfig::openConfig(), "TipOfDay");
KTipDialog::setShowOnStart(config.readEntry("RunOnStart", false));
KTipDialog::showTip(dialogParent());
}
KOrg::MainWindow *ActionManager::findInstance(const QUrl &url)
{
if (mWindowList) {
......
......@@ -297,12 +297,6 @@ protected Q_SLOTS:
/** Open kcontrol module for configuring date and time formats */
void configureDateTime();
/** Show tip of the day */
void showTip();
/** Show tip of the day */
void showTipOnStart();
void downloadNewStuff();
void toggleDateNavigator();
......
<!DOCTYPE kpartgui>
<kpartgui name="korganizer" version="428" translationDomain="korganizer">
<kpartgui name="korganizer" version="429" translationDomain="korganizer">
<MenuBar>
<Menu name="file"><text>&amp;File</text>
<Menu name="import"><text>&amp;Import</text>
......@@ -110,7 +110,6 @@
</Menu>
<Menu name="help"><text>&amp;Help</text>
<Action name="show_intro"/>
<Action name="help_tipofday"/>
</Menu>
</MenuBar>
......
......@@ -116,12 +116,6 @@ KParts::ReadOnlyPart *KOrganizerPlugin::createPart()
return part;
}
QString KOrganizerPlugin::tipFile() const
{
QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("korganizer/tips"));
return file;
}
QStringList KOrganizerPlugin::invisibleToolbarActions() const
{
QStringList invisible;
......
......@@ -54,7 +54,6 @@ public:
KontactInterface::Summary *createSummaryWidget(QWidget *parent) Q_DECL_OVERRIDE;
QString tipFile() const Q_DECL_OVERRIDE;
QStringList invisibleToolbarActions() const Q_DECL_OVERRIDE;
void select() Q_DECL_OVERRIDE;
......
<tip category="KOrganizer|General">
<html>
<p>...that you can select whether the week starts on Monday or on Sunday in the System Settings? KOrganizer uses this setting. Look at
Locale->Country/Region & Languages in the System Settings, or select <b>Settings</b>,
<b>Configure Date & Time...</b> from the menu bar. Select the Calendar tab.
</p>
</html>
</tip>
<tip category="KOrganizer|General">
<html>
<p>...that you can edit to-dos quickly by right clicking on the property you wish to change; like the priority, the category or the date?
</p>
</html>
</tip>
<tip category="KOrganizer|General">
<html>
<p>...that your calendar can display birthdays from your address book? It is even possible to set up reminders for them. To activate this, add the corresponding 'birthdays' calendar from the Calendar Manager.
</p>
</html>
</tip>
<tip category="KOrganizer|General">
<html>
<p>...that you can store your calendar on an FTP server? Use the standard file dialog to save the calendar to a URL like <b>ftp://username@ftpserver/filename</b>. You can make your calendar active and load and save it as if it were local, or add it permanently to your calendar list, by adding a remote file from the Calendar Manager. Just make sure that no two KOrganizer applications are working on the same file, at the same time.
</p>
</html>
</tip>
<tip category="KOrganizer|General">
<html>
<p>...that you can create hierarchical to-dos by clicking with the right mouse button on an existing to-do and selecting <b>New Sub-to-do</b> from the context menu?
</p>
</html>
</tip>
<tip category="KOrganizer|General">
<html>
<p>...that a color can be assigned to each category? Events with a certain category will be shown in that color. You can assign these in the section <b>Colors</b> within the dialog which appears after selecting <b>Settings</b>, <b>Configure KOrganizer...</b> from the menu bar.
</p>
</html>
</tip>
<tip category="KOrganizer|General">
<html>
<p>...that you can view and edit a calendar with Konqueror? Just click on the calendar file to make Konqueror open it.
</p>
</html>
</tip>
<tip category="KOrganizer|General">
<html>
<p>...that it is possible to add an attachment to an event or to-do? To do so, add a link to the <b>Attachments</b> tab within the <b>Edit Event</b> or <b>Edit To-do</b> dialog.
</p>
</html>
</tip>
<tip category="KOrganizer|General">
<html>
<p>...that you can export your calendar to HTML? Select <b>File</b>, <b>Export</b>, <b>Export Web Page...</b> from the menu bar to open the <b>Export calendar as web page</b> dialog.
</p>
</html>
</tip>
<tip category="KOrganizer|General">
<html>
<p>...that you can purge completed to-dos in one step? Go to the <b>File</b> menu and choose <b>Purge Completed To-dos</b>.
</p>
</html>
</tip>
<tip category="KOrganizer|General">
<html>
<p>...that you can create a new sub-to-do by pasting a to-do while another one is selected?
</p>
</html>
</tip>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment