summaryrefslogtreecommitdiff
path: root/src/mainwindow.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainwindow.cpp')
-rw-r--r--src/mainwindow.cpp47
1 files changed, 3 insertions, 44 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 4e9c4b26..02102ae1 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -147,7 +147,6 @@ MainWindow::~MainWindow()
{
Application::instance()->removeMainWindow(this);
delete m_popup;
-// delete m_view;
}
@@ -381,11 +380,6 @@ void MainWindow::setupActions()
bmMenu->setIcon(KIcon("bookmarks"));
bmMenu->setDelayed(false);
actionCollection()->addAction(QLatin1String("bookmarksActionMenu"), bmMenu);
-
- // Add to favorites
- a = new KAction(KIcon("rating"), i18n("Add to Favorites"), this);
- actionCollection()->addAction(QLatin1String("add_to_favorites"), a);
- connect(a, SIGNAL(triggered(bool)), this, SLOT(addFavoriteLink()));
}
@@ -394,6 +388,7 @@ void MainWindow::setupTools()
KActionMenu *toolsMenu = new KActionMenu(KIcon("configure"), i18n("&Tools"), this);
toolsMenu->setDelayed(false);
+ toolsMenu->addAction(actionByName(KStandardAction::name(KStandardAction::Open)));
toolsMenu->addAction(actionByName(KStandardAction::name(KStandardAction::SaveAs)));
toolsMenu->addAction(actionByName(KStandardAction::name(KStandardAction::Print)));
toolsMenu->addAction(actionByName(KStandardAction::name(KStandardAction::Find)));
@@ -576,8 +571,8 @@ void MainWindow::slotUpdateWindowTitle(const QString &title)
void MainWindow::slotFileOpen()
{
QString filePath = KFileDialog::getOpenFileName(KUrl(),
- i18n("*.html *.htm *.svg *.png *.gif *.svgz|Web Resources (*.html *.htm *.svg *.png *.gif *.svgz)\n" \
- "*.*|All files (*.*)"),
+ i18n("*.html *.htm *.svg *.png *.gif *.svgz|Web Resources (*.html *.htm *.svg *.png *.gif *.svgz)\n"
+ "*.*|All files (*.*)"),
this,
i18n("Open Web Resource"));
@@ -1100,39 +1095,3 @@ void MainWindow::slotOpenActionUrl(QAction *action)
}
}
-
-
-void MainWindow::addFavoriteLink()
-{
- QString name = currentTab()->title();
- QString url = currentTab()->url().prettyUrl(KUrl::RemoveTrailingSlash);
-
- QStringList names = ReKonfig::previewNames();
- QStringList urls = ReKonfig::previewUrls();
-
-
- for (int i = 0; i < 8 && i < urls.size() ; ++i)
- {
- if(urls.at(i).isEmpty() || urls.at(i) == url)
- {
- names.replace(i, name);
- urls.replace(i, url);
- break;
- }
- if(i == 7)
- {
- names.prepend(name);
- if(names.count() > 8)
- names.removeLast();
-
- urls.prepend(url);
- if(urls.count() > 8)
- urls.removeLast();
-
- break;
- }
- }
-
- ReKonfig::setPreviewNames(names);
- ReKonfig::setPreviewUrls(urls);
-}