summaryrefslogtreecommitdiff
path: root/src/mainwindow.h
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-04-26 16:49:01 +0200
committerAndrea Diamantini <adjam7@gmail.com>2010-04-26 16:49:01 +0200
commit6146088fe9873d0d0822a0db8401794d702609cf (patch)
tree6acb6d43309f3be3b90654b1bf68cea37f659bbe /src/mainwindow.h
parentSVN_SILENT made messages (.desktop file) (diff)
parentEncodings management (diff)
downloadrekonq-6146088fe9873d0d0822a0db8401794d702609cf.tar.xz
Merge branch 'ENCODINGS'
Diffstat (limited to 'src/mainwindow.h')
-rw-r--r--src/mainwindow.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 5c525e26..7129de80 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -157,6 +157,10 @@ private slots:
void aboutToShowBackMenu();
void openActionUrl(QAction *action);
+ // encodings
+ void setEncoding(QAction *);
+ void populateEncodingMenu();
+
private:
MainView *m_view;
FindBar *m_findBar;
@@ -167,7 +171,8 @@ private:
KAction *m_stopReloadAction;
KMenu *m_historyBackMenu;
-
+ KMenu *m_encodingMenu;
+
KToolBar *m_mainBar;
KToolBar *m_bmBar;