From 58fcce8f0afee3bfff44d5a3c611fb5f0d415c54 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Sun, 20 Oct 2013 14:45:14 +0200
Subject: [PATCH] Some changes made.

---
 src/gui/basewebview.cpp       |  2 ++
 src/gui/feedmessageviewer.cpp | 34 +++++++++++++++++++++-------------
 src/gui/feedmessageviewer.h   |  2 ++
 src/gui/webbrowser.cpp        |  6 +++---
 4 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/src/gui/basewebview.cpp b/src/gui/basewebview.cpp
index f0e99ff1a..52336fc19 100644
--- a/src/gui/basewebview.cpp
+++ b/src/gui/basewebview.cpp
@@ -211,6 +211,7 @@ void BaseWebView::paintEvent(QPaintEvent *event) {
   QWebView::paintEvent(event);
 
   // Draw additional frame.
+  /*
   QPainter painter(this);
   QStyleOptionFrameV3 style_option;
   int frame_shape = QFrame::Sunken & QFrame::Shape_Mask;
@@ -224,6 +225,7 @@ void BaseWebView::paintEvent(QPaintEvent *event) {
   style_option.midLineWidth = 0;
 
   style()->drawControl(QStyle::CE_ShapedFrame, &style_option, &painter, this);
+  */
 }
 
 bool BaseWebView::increaseWebPageZoom() {
diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp
index ead1a8613..695885d89 100644
--- a/src/gui/feedmessageviewer.cpp
+++ b/src/gui/feedmessageviewer.cpp
@@ -1,7 +1,8 @@
 #include <QVBoxLayout>
-#include <QHBoxLayout>
 #include <QSplitter>
+#include <QToolBar>
 #include <QApplication>
+#include <QLineEdit>
 
 #include "gui/feedmessageviewer.h"
 #include "gui/webbrowser.h"
@@ -11,43 +12,50 @@
 
 FeedMessageViewer::FeedMessageViewer(QWidget *parent)
   : TabContent(parent),
+    m_toolBar(new QToolBar(tr("Toolbar for messages"), this)),
     m_messagesView(new MessagesView(this)),
     m_feedsView(new FeedsView(this)),
     m_messagesBrowser(new WebBrowser(this))
 {
+  m_messagesBrowser->setNavigationBarVisible(false);
   initializeViews();
 }
 
 void FeedMessageViewer::initializeViews() {
   // Instantiate needed components.
-  QHBoxLayout *vertical_layout = new QHBoxLayout(this);
-  QSplitter *vertical_splitter = new QSplitter(Qt::Horizontal, this);
+  QVBoxLayout *central_layout = new QVBoxLayout(this);
+  QSplitter *feed_splitter = new QSplitter(Qt::Horizontal, this);
   QSplitter *message_splitter = new QSplitter(Qt::Vertical, this);
 
   // Set layout properties.
-  vertical_layout->setMargin(0);
-  vertical_layout->setSpacing(0);
+  central_layout->setMargin(0);
+  central_layout->setSpacing(0);
 
   // Set views.
   m_feedsView->setFrameStyle(QFrame::NoFrame);
   m_messagesView->setFrameStyle(QFrame::NoFrame);
 
-  // setup splitters.
+  // Setup splitters.
   message_splitter->setHandleWidth(1);
   message_splitter->setChildrenCollapsible(false);
   message_splitter->setStretchFactor(0, 1);
   message_splitter->addWidget(m_messagesView);
   message_splitter->addWidget(m_messagesBrowser);
 
-  vertical_splitter->setHandleWidth(1);
-  vertical_splitter->setChildrenCollapsible(false);
-  vertical_splitter->setStretchFactor(0, 1);
-  vertical_splitter->addWidget(m_feedsView);
-  vertical_splitter->addWidget(message_splitter);
-  vertical_layout->addWidget(vertical_splitter);
+  feed_splitter->setHandleWidth(1);
+  feed_splitter->setChildrenCollapsible(false);
+  feed_splitter->setStretchFactor(0, 1);
+  feed_splitter->addWidget(m_feedsView);
+  feed_splitter->addWidget(message_splitter);
+
+  m_toolBar->addAction(QIcon::fromTheme("application-exit"), "aaa");
+
+  // Add toolbar and main feeds/messages widget to main layout.
+  central_layout->addWidget(m_toolBar);
+  central_layout->addWidget(feed_splitter);
 
   // Set layout as active.
-  setLayout(vertical_layout);
+  setLayout(central_layout);
 }
 
 FeedMessageViewer::~FeedMessageViewer() {
diff --git a/src/gui/feedmessageviewer.h b/src/gui/feedmessageviewer.h
index f26e94c62..511527b1e 100644
--- a/src/gui/feedmessageviewer.h
+++ b/src/gui/feedmessageviewer.h
@@ -7,6 +7,7 @@
 class WebBrowser;
 class FeedsView;
 class MessagesView;
+class QToolBar;
 
 class FeedMessageViewer : public TabContent {
     Q_OBJECT
@@ -21,6 +22,7 @@ class FeedMessageViewer : public TabContent {
     void initializeViews();
 
   private:
+    QToolBar *m_toolBar;
     MessagesView *m_messagesView;
     FeedsView *m_feedsView;
     WebBrowser *m_messagesBrowser;
diff --git a/src/gui/webbrowser.cpp b/src/gui/webbrowser.cpp
index 17656c5e2..4bef6cc8b 100644
--- a/src/gui/webbrowser.cpp
+++ b/src/gui/webbrowser.cpp
@@ -46,6 +46,7 @@ WebBrowser::WebBrowser(QWidget *parent)
   m_toolBar->layout()->setMargin(0);
   m_toolBar->setFloatable(false);
   m_toolBar->setMovable(false);
+  m_toolBar->setAllowedAreas(Qt::TopToolBarArea);
 
   // Modify action texts.
   m_actionBack->setText(tr("Back"));
@@ -60,16 +61,15 @@ WebBrowser::WebBrowser(QWidget *parent)
   // Add needed actions into toolbar.
   m_toolBar->addAction(m_actionBack);
   m_toolBar->addAction(m_actionForward);
-  m_toolBar->addSeparator();
   m_toolBar->addAction(m_actionReload);
   m_toolBar->addAction(m_actionStop);
   m_toolBar->addWidget(m_txtLocation);
+  //m_toolBar->setContentsMargins(0, 0, 0, -3);
 
   // Setup layout.
   m_layout->addWidget(m_toolBar);
   m_layout->addWidget(m_webView);
   m_layout->setMargin(0);
-  m_layout->setContentsMargins(0, -1, 0, 0);
 
   setTabOrder(m_txtLocation, m_toolBar);
   setTabOrder(m_toolBar, m_webView);
@@ -189,7 +189,7 @@ void WebBrowser::navigateToUrl(const QString &textual_url) {
 }
 
 WebBrowser::~WebBrowser() {
-  qDebug("Erasing WebBrowser instance.");
+  qDebug("Destroying WebBrowser instance.");
 
   // Remove this instance from the global list of web browsers.
   m_runningWebBrowsers.removeAll(this);