summaryrefslogtreecommitdiff
path: root/src/mainwindow.cpp
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-05-18 01:52:30 +0200
committerAndrea Diamantini <adjam7@gmail.com>2010-05-18 01:52:30 +0200
commit86fb9120221cff8d7fbc605c71f6418fa6f81833 (patch)
treee71e37b0423f07e0ec1642afd6bce409cfc014ba /src/mainwindow.cpp
parentAdd option to choose new tab page as home page (diff)
downloadrekonq-86fb9120221cff8d7fbc605c71f6418fa6f81833.tar.xz
Moved setEncoding action to be a local page settings as it seems
more useful
Diffstat (limited to 'src/mainwindow.cpp')
-rw-r--r--src/mainwindow.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 84d79c40..527e5020 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -499,6 +499,8 @@ void MainWindow::setupTools()
zoomAction->setDefaultWidget(zoomWidget);
toolsMenu->addAction(zoomAction);
+ toolsMenu->addAction(actionByName(QL1S("encodings")));
+
toolsMenu->addSeparator();
toolsMenu->addAction(actionByName(QL1S("private_browsing")));
@@ -521,8 +523,6 @@ void MainWindow::setupTools()
toolsMenu->addSeparator();
- toolsMenu->addAction(actionByName(QL1S("encodings")));
-
helpMenu()->setIcon(KIcon("help-browser"));
toolsMenu->addAction(helpMenu()->menuAction());
toolsMenu->addAction(actionByName(KStandardAction::name(KStandardAction::Preferences)));
@@ -1286,8 +1286,7 @@ void MainWindow::setEncoding(QAction *qa)
QString currentCodec = qa->text().toLatin1();
currentCodec = currentCodec.remove('&');
kDebug() << currentCodec;
- QWebSettings::globalSettings()->setDefaultTextEncoding(currentCodec);
- ReKonfig::setDefaultEncoding(currentCodec);
+ currentTab()->page()->settings()->setDefaultTextEncoding(currentCodec);
}
@@ -1301,7 +1300,7 @@ void MainWindow::populateEncodingMenu()
}
codecs.sort();
- QString currentCodec = ReKonfig::defaultEncoding();
+ QString currentCodec = currentTab()->page()->settings()->defaultTextEncoding();
kDebug() << "Current Codec: " << currentCodec;
m_encodingMenu->clear();