diff --git a/src/KJotsMain.cpp b/src/KJotsMain.cpp --- a/src/KJotsMain.cpp +++ b/src/KJotsMain.cpp @@ -85,7 +85,7 @@ void KJotsMain::onQuit() { -// component->queryClose(); + component->queryClose(); deleteLater(); qApp->quit(); } diff --git a/src/kjotspartui.rc b/src/kjotspartui.rc --- a/src/kjotspartui.rc +++ b/src/kjotspartui.rc @@ -1,17 +1,18 @@ - + + - + @@ -42,8 +43,8 @@ &Go - - + + diff --git a/src/kjotstreeview.h b/src/kjotstreeview.h --- a/src/kjotstreeview.h +++ b/src/kjotstreeview.h @@ -35,11 +35,13 @@ void delayedInitialization(); QString captionForSelection(const QString &sep) const; +public Q_SLOTS: + void renameEntry(); + protected: void contextMenuEvent(QContextMenuEvent *event) override; protected Q_SLOTS: - void renameEntry(); void copyLinkAddress(); void changeColor(); diff --git a/src/kjotstreeview.cpp b/src/kjotstreeview.cpp --- a/src/kjotstreeview.cpp +++ b/src/kjotstreeview.cpp @@ -57,7 +57,7 @@ popup->addAction(m_xmlGuiClient->actionCollection()->action(QLatin1String("new_book"))); if (singleselection) { popup->addAction(m_xmlGuiClient->actionCollection()->action(QLatin1String("new_page"))); - popup->addAction(m_xmlGuiClient->actionCollection()->action(QLatin1String("rename_entry"))); + popup->addAction(m_xmlGuiClient->actionCollection()->action(QLatin1String(KStandardAction::name(KStandardAction::RenameFile)))); popup->addAction(m_xmlGuiClient->actionCollection()->action(QLatin1String("copy_link_address"))); popup->addAction(m_xmlGuiClient->actionCollection()->action(QLatin1String("change_color"))); @@ -93,7 +93,6 @@ void KJotsTreeView::delayedInitialization() { - connect(m_xmlGuiClient->actionCollection()->action(QLatin1String("rename_entry")), &QAction::triggered, this, &KJotsTreeView::renameEntry); connect(m_xmlGuiClient->actionCollection()->action(QLatin1String("copy_link_address")), &QAction::triggered, this, &KJotsTreeView::copyLinkAddress); connect(m_xmlGuiClient->actionCollection()->action(QLatin1String("change_color")), &QAction::triggered, this, &KJotsTreeView::changeColor); } @@ -125,46 +124,11 @@ void KJotsTreeView::renameEntry() { - QModelIndexList rows = selectionModel()->selectedRows(); - + const QModelIndexList rows = selectionModel()->selectedRows(); if (rows.size() != 1) { return; } - - QModelIndex idx = rows.at(0); - - QString title = idx.data().toString(); - - Item item = idx.data(KJotsModel::ItemRole).value(); - if (item.isValid()) { - Q_ASSERT(item.hasPayload()); - if (!item.hasPayload()) { - return; - } - - bool ok; - const QString name = QInputDialog::getText(this, i18n("Rename Page"), - i18n("Page title:"), QLineEdit::Normal, title, &ok); - - if (ok) { - model()->setData(idx, name, Qt::EditRole); - } - return; - } - - Collection col = idx.data(KJotsModel::CollectionRole).value(); - Q_ASSERT(col.isValid()); - if (!col.isValid()) { - return; - } - - bool ok; - const QString name = QInputDialog::getText(this, i18n("Rename Book"), - i18n("Book name:"), QLineEdit::Normal, title, &ok); - - if (ok) { - model()->setData(idx, name, Qt::EditRole); - } + edit(rows.first()); } void KJotsTreeView::copyLinkAddress() diff --git a/src/kjotsui.rc b/src/kjotsui.rc --- a/src/kjotsui.rc +++ b/src/kjotsui.rc @@ -1,17 +1,18 @@ - + + - + @@ -41,8 +42,8 @@ - - + + @@ -68,6 +69,7 @@ + diff --git a/src/kjotswidget.cpp b/src/kjotswidget.cpp --- a/src/kjotswidget.cpp +++ b/src/kjotswidget.cpp @@ -219,18 +219,12 @@ connect(action, &QAction::triggered, this, &KJotsWidget::prevBook); connect(this, &KJotsWidget::canGoPreviousBookChanged, action, &QAction::setEnabled); - action = actionCollection->addAction(QLatin1String("go_next_page")); - action->setText(i18n("Next Page")); - action->setIcon(QIcon::fromTheme(QLatin1String("go-next"))); - actionCollection->setDefaultShortcut(action, QKeySequence(Qt::CTRL + Qt::Key_PageDown)); - connect(action, &QAction::triggered, this, &KJotsWidget::nextPage); + action = KStandardAction::next(this, &KJotsWidget::nextPage, actionCollection); + actionCollection->setDefaultShortcut(action, QKeySequence(Qt::CTRL | Qt::Key_PageDown)); connect(this, &KJotsWidget::canGoNextPageChanged, action, &QAction::setEnabled); - action = actionCollection->addAction(QLatin1String("go_prev_page")); - action->setText(i18n("Previous Page")); - action->setIcon(QIcon::fromTheme(QLatin1String("go-previous"))); - actionCollection->setDefaultShortcut(action, QKeySequence(Qt::CTRL + Qt::Key_PageUp)); - connect(action, &QAction::triggered, this, &KJotsWidget::prevPage); + action = KStandardAction::prior(this, &KJotsWidget::prevPage, actionCollection); + actionCollection->setDefaultShortcut(action, QKeySequence(Qt::CTRL | Qt::Key_PageUp)); connect(this, &KJotsWidget::canGoPreviousPageChanged, action, &QAction::setEnabled); action = actionCollection->addAction(QLatin1String("new_page")); @@ -262,10 +256,7 @@ action->setIcon(QIcon::fromTheme(QLatin1String("edit-delete"))); connect(action, &QAction::triggered, this, &KJotsWidget::deleteMultiple); - action = actionCollection->addAction(QLatin1String("manual_save")); - action->setText(i18n("Manual Save")); - action->setIcon(QIcon::fromTheme(QLatin1String("document-save"))); - actionCollection->setDefaultShortcut(action, QKeySequence(Qt::CTRL + Qt::Key_S)); + KStandardAction::save( editor, &KJotsEdit::savePage, actionCollection); action = actionCollection->addAction(QLatin1String("auto_bullet")); action->setText(i18n("Auto Bullets")); @@ -290,10 +281,7 @@ action->setIcon(QIcon::fromTheme(QLatin1String("checkmark"))); action->setEnabled(false); - action = actionCollection->addAction(QLatin1String("rename_entry")); - action->setText(i18n("Rename...")); - action->setIcon(QIcon::fromTheme(QLatin1String("edit-rename"))); - actionCollection->setDefaultShortcut(action, QKeySequence(Qt::CTRL + Qt::Key_M)); + KStandardAction::renameFile(treeview, &KJotsTreeView::renameEntry, actionCollection); action = actionCollection->addAction(QLatin1String("insert_date")); action->setText(i18n("Insert Date")); @@ -489,15 +477,16 @@ // Actions for a single item selection. entryActions.insert(actionCollection->action(QLatin1String(KStandardAction::name(KStandardAction::Find)))); entryActions.insert(actionCollection->action(QLatin1String(KStandardAction::name(KStandardAction::Print)))); - entryActions.insert(actionCollection->action(QLatin1String("rename_entry"))); + entryActions.insert(actionCollection->action(QLatin1String(KStandardAction::name(KStandardAction::RenameFile)))); entryActions.insert(actionCollection->action(QLatin1String("change_color"))); entryActions.insert(actionCollection->action(QLatin1String("save_to"))); entryActions.insert(actionCollection->action(QLatin1String("copy_link_address"))); // Actions that are used only when a page is selected. pageActions.insert(actionCollection->action(QLatin1String(KStandardAction::name(KStandardAction::Cut)))); pageActions.insert(actionCollection->action(QLatin1String(KStandardAction::name(KStandardAction::Paste)))); pageActions.insert(actionCollection->action(QLatin1String(KStandardAction::name(KStandardAction::Replace)))); + pageActions.insert(actionCollection->action(QLatin1String(KStandardAction::name(KStandardAction::Save)))); pageActions.insert(actionCollection->action(QLatin1String("del_page"))); pageActions.insert(actionCollection->action(QLatin1String("insert_date"))); pageActions.insert(actionCollection->action(QLatin1String("auto_bullet"))); @@ -1639,10 +1628,10 @@ bool KJotsWidget::queryClose() { KJotsSettings::setSplitterSizes(m_splitter->sizes()); - KJotsSettings::self()->save(); m_orderProxy->saveOrder(); - + // TODO: we better wait for a result here! + editor->savePage(); return true; }