diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/history.cpp | 1 | ||||
| -rw-r--r-- | src/modelmenu.cpp | 28 | ||||
| -rw-r--r-- | src/settings.cpp | 5 | ||||
| -rw-r--r-- | src/settings_general.ui | 2 |
4 files changed, 11 insertions, 25 deletions
diff --git a/src/history.cpp b/src/history.cpp index d67e65d0..3c63cb4e 100644 --- a/src/history.cpp +++ b/src/history.cpp @@ -1330,4 +1330,3 @@ void HistoryTreeModel::sourceRowsRemoved(const QModelIndex &parent, int start, i endRemoveRows(); } } - diff --git a/src/modelmenu.cpp b/src/modelmenu.cpp index 41c197f3..1aa5be16 100644 --- a/src/modelmenu.cpp +++ b/src/modelmenu.cpp @@ -155,15 +155,6 @@ void ModelMenu::createMenu(const QModelIndex &parent, int max, QMenu *parentMenu if (!menu) { -// QString title = parent.data().toString(); -// menu = new QMenu(title, this); -// QIcon icon = qvariant_cast<QIcon>(parent.data(Qt::DecorationRole)); -// menu->setIcon(icon); -// parentMenu->addMenu(menu); -// QVariant v; -// v.setValue(parent); -// menu->menuAction()->setData(v); -// connect(menu, SIGNAL(aboutToShow()), this, SLOT(aboutToShow())); return; } @@ -177,20 +168,11 @@ void ModelMenu::createMenu(const QModelIndex &parent, int max, QMenu *parentMenu for (int i = 0; i < end; ++i) { QModelIndex idx = m_model->index(i, 0, parent); -// if (m_model->hasChildren(idx)) -// { -// createMenu(idx, -1, menu); -// } -// else -// { - if (m_separatorRole != 0 - && idx.data(m_separatorRole).toBool()) - addSeparator(); - else - menu->addAction(makeAction(idx)); -// } - if (menu == this && i == m_firstSeparator - 1) - addSeparator(); + + if( !m_model->hasChildren(idx) && ( m_separatorRole == 0 || !idx.data(m_separatorRole).toBool() ) ) + { + menu->addAction(makeAction(idx)); + } } } diff --git a/src/settings.cpp b/src/settings.cpp index dda00a0e..47339ce4 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -50,6 +50,7 @@ #include <KPageWidgetItem> #include <KFontDialog> #include <KUrl> +#include <KShortcutsEditor> // Qt Includes #include <QtCore/QPointer> @@ -108,6 +109,10 @@ Private::Private(SettingsDialog *parent) kWarning() << webkitIconPath; KIcon webkitIcon = KIcon(QIcon(webkitIconPath)); pageItem->setIcon(webkitIcon); + + widget = new KShortcutsEditor(Application::instance()->mainWindow()->actionCollection(),parent); + pageItem = parent->addPage(widget , i18n("Shortcuts")); + pageItem->setIcon(KIcon("configure-shortcuts")); } diff --git a/src/settings_general.ui b/src/settings_general.ui index d6ce4e49..90136755 100644 --- a/src/settings_general.ui +++ b/src/settings_general.ui @@ -99,7 +99,7 @@ <item> <widget class="QCheckBox" name="kcfg_showUrlsPopup"> <property name="text"> - <string>show urls in popup hovering links</string> + <string>Show URLs of links in a popup</string> </property> </widget> </item> |