diff options
Diffstat (limited to 'src/mainwindow.cpp')
| -rw-r--r-- | src/mainwindow.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index b2c1fed1..f18cf1d2 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -159,7 +159,6 @@ SidePanel *MainWindow::sidePanel() void MainWindow::setupToolbar() { KToolBar *mainToolBar = new KToolBar( QString("MainToolBar"), this, Qt::TopToolBarArea); - mainToolBar->setContextMenuPolicy(Qt::PreventContextMenu); mainToolBar->setToolButtonStyle(Qt::ToolButtonIconOnly); mainToolBar->addAction( actionByName("history_back") ); mainToolBar->addAction( actionByName("history_forward") ); @@ -251,7 +250,6 @@ void MainWindow::setupActions() KStandardAction::home(this, SLOT(slotHome()), actionCollection()); KStandardAction::preferences(this, SLOT(slotPreferences()), actionCollection()); - KStandardAction::showMenubar(this, SLOT(slotShowMenubar(bool)), actionCollection()); // WEB Actions (NO KStandardActions..) a = KStandardAction::redisplay(m_view, SLOT(slotWebReload()), actionCollection()); @@ -342,7 +340,7 @@ void MainWindow::setupActions() connect(a, SIGNAL(triggered(bool)), m_view, SLOT(previousTab())); // clear private data action - a = new KAction(KIcon("edit-clear"), i18n("Clear Private Data"), this); + a = new KAction(KIcon("edit-clear"), i18n("Clear Private Data..."), this); actionCollection()->addAction(QLatin1String("clear_private_data"), a); connect(a, SIGNAL(triggered(bool)), this, SLOT(clearPrivateData())); } @@ -474,10 +472,9 @@ void MainWindow::slotUpdateConfiguration() defaultSettings->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled, ReKonfig::offlineStorageDatabaseEnabled()); defaultSettings->setAttribute(QWebSettings::OfflineWebApplicationCacheEnabled, ReKonfig::offlineWebApplicationCacheEnabled()); defaultSettings->setAttribute(QWebSettings::LocalStorageDatabaseEnabled, ReKonfig::localStorageDatabaseEnabled()); - /** - * Applies user defined CSS to all open webpages. If there no longer is a - * user defined CSS removes it from all open webpages. - */ + + // Applies user defined CSS to all open webpages. If there no longer is a + // user defined CSS removes it from all open webpages. defaultSettings->setUserStyleSheetUrl(ReKonfig::userCSS()); // ====== load Settings on main classes @@ -1033,7 +1030,7 @@ void MainWindow::slotAboutToShowBackMenu() QWebHistoryItem item = history->backItems(history->count()).at(i); KAction *action = new KAction(this); action->setData(-1*(historyCount - i - 1)); - QIcon icon = Application::instance()->icon(item.url()); + QIcon icon = Application::icon(item.url()); action->setIcon(icon); action->setText(item.title()); m_historyBackMenu->addAction(action); |