Moved setEncoding action to be a local page settings as it seems

more useful

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();