Commit 78d5c7f0 authored by Daniel Vrátil's avatar Daniel Vrátil 🤖

Rename Tools->Account Wizard action to Settings->Add Account...

Now it's an actual action that makes it clear what's going to happen
when user clicks it and it's easier to find as it's more likely user
will look for such action in Settings rather than Tools menu.

Differential Review: https://phabricator.kde.org/D5500
parent cffe634b
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
the same menu entries at the same place in KMail and Kontact --> the same menu entries at the same place in KMail and Kontact -->
<!DOCTYPE gui> <!DOCTYPE gui>
<gui version="522" name="kmmainwin" translationDomain="kmail"> <gui version="523" name="kmmainwin" translationDomain="kmail">
<MenuBar> <MenuBar>
<Menu noMerge="1" name="file" > <Menu noMerge="1" name="file" >
<text>&amp;File</text> <text>&amp;File</text>
...@@ -199,8 +199,6 @@ ...@@ -199,8 +199,6 @@
<Separator/> <Separator/>
<Action name="kmail_export_data"/> <Action name="kmail_export_data"/>
<Separator/> <Separator/>
<Action name="accountWizard"/>
<Separator/>
<ActionList name="kmail_plugins_tools"/> <ActionList name="kmail_plugins_tools"/>
</Menu> </Menu>
<Menu noMerge="1" name="settings"> <Menu noMerge="1" name="settings">
...@@ -210,6 +208,7 @@ ...@@ -210,6 +208,7 @@
<Action name="show_quick_search"/> <Action name="show_quick_search"/>
<Action name="filter" append="save_merge"/> <Action name="filter" append="save_merge"/>
<Action name="sieveFilters" append="save_merge"/> <Action name="sieveFilters" append="save_merge"/>
<Action name="accountWizard"/>
<Separator/> <Separator/>
<Action name="tools_automatic_archiving"/> <Action name="tools_automatic_archiving"/>
<Separator/> <Separator/>
......
...@@ -2925,11 +2925,6 @@ void KMMainWidget::setupActions() ...@@ -2925,11 +2925,6 @@ void KMMainWidget::setupActions()
actionCollection()->addAction(QStringLiteral("filter_log_viewer"), action); actionCollection()->addAction(QStringLiteral("filter_log_viewer"), action);
connect(action, &QAction::triggered, mLaunchExternalComponent, &KMLaunchExternalComponent::slotFilterLogViewer); connect(action, &QAction::triggered, mLaunchExternalComponent, &KMLaunchExternalComponent::slotFilterLogViewer);
} }
{
QAction *action = new QAction(i18n("&Account Wizard..."), this);
actionCollection()->addAction(QStringLiteral("accountWizard"), action);
connect(action, &QAction::triggered, mLaunchExternalComponent, &KMLaunchExternalComponent::slotAccountWizard);
}
{ {
QAction *action = new QAction(i18n("&Import from another Email Client..."), this); QAction *action = new QAction(i18n("&Import from another Email Client..."), this);
actionCollection()->addAction(QStringLiteral("importWizard"), action); actionCollection()->addAction(QStringLiteral("importWizard"), action);
...@@ -3314,6 +3309,11 @@ void KMMainWidget::setupActions() ...@@ -3314,6 +3309,11 @@ void KMMainWidget::setupActions()
actionCollection()->addAction(QStringLiteral("sieveFilters"), action); actionCollection()->addAction(QStringLiteral("sieveFilters"), action);
connect(action, &QAction::triggered, this, &KMMainWidget::slotManageSieveScripts); connect(action, &QAction::triggered, this, &KMMainWidget::slotManageSieveScripts);
} }
{
QAction *action = new QAction(i18n("&Add Account..."), this);
actionCollection()->addAction(QStringLiteral("accountWizard"), action);
connect(action, &QAction::triggered, mLaunchExternalComponent, &KMLaunchExternalComponent::slotAccountWizard);
}
{ {
mShowIntroductionAction = new QAction(QIcon::fromTheme(QStringLiteral("kmail")), i18n("KMail &Introduction"), this); mShowIntroductionAction = new QAction(QIcon::fromTheme(QStringLiteral("kmail")), i18n("KMail &Introduction"), this);
actionCollection()->addAction(QStringLiteral("help_kmail_welcomepage"), mShowIntroductionAction); actionCollection()->addAction(QStringLiteral("help_kmail_welcomepage"), mShowIntroductionAction);
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
the same menu entries at the same place in KMail and Kontact --> the same menu entries at the same place in KMail and Kontact -->
<!DOCTYPE gui> <!DOCTYPE gui>
<gui version="522" name="kmmainwin" translationDomain="kmail"> <gui version="523" name="kmmainwin" translationDomain="kmail">
<MenuBar> <MenuBar>
<Menu noMerge="1" name="file" > <Menu noMerge="1" name="file" >
<text>&amp;File</text> <text>&amp;File</text>
...@@ -199,8 +199,6 @@ ...@@ -199,8 +199,6 @@
<Separator/> <Separator/>
<Action name="kmail_export_data"/> <Action name="kmail_export_data"/>
<Separator/> <Separator/>
<Action name="accountWizard"/>
<Separator/>
<ActionList name="kmail_plugins_tools"/> <ActionList name="kmail_plugins_tools"/>
</Menu> </Menu>
<Menu noMerge="1" name="settings"> <Menu noMerge="1" name="settings">
...@@ -210,6 +208,7 @@ ...@@ -210,6 +208,7 @@
<Action name="show_quick_search"/> <Action name="show_quick_search"/>
<Action name="filter" append="save_merge"/> <Action name="filter" append="save_merge"/>
<Action name="sieveFilters" append="save_merge"/> <Action name="sieveFilters" append="save_merge"/>
<Action name="accountWizard"/>
<Separator/> <Separator/>
<Action name="tools_automatic_archiving"/> <Action name="tools_automatic_archiving"/>
<Separator/> <Separator/>
......
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