summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Ander Peñalba <jonan88@gmail.com>2010-08-30 10:48:54 +0200
committerJon Ander Peñalba <jonan88@gmail.com>2010-08-30 16:58:36 +0200
commita3fd9b3a4b0c965d9a460e059f73f1ce0d52cc66 (patch)
tree0a40c399393f013a04153959a03eb74caff22a3f
parentNew general panel class created and used by the bookmarks and history panel (diff)
downloadrekonq-a3fd9b3a4b0c965d9a460e059f73f1ce0d52cc66.tar.xz
Minor changes in the panels
-rw-r--r--src/bookmarks/bookmarkspanel.cpp1
-rw-r--r--src/history/historypanel.cpp25
-rw-r--r--src/panels/urlpanel.cpp2
3 files changed, 13 insertions, 15 deletions
diff --git a/src/bookmarks/bookmarkspanel.cpp b/src/bookmarks/bookmarkspanel.cpp
index 118074d0..0d912113 100644
--- a/src/bookmarks/bookmarkspanel.cpp
+++ b/src/bookmarks/bookmarkspanel.cpp
@@ -46,7 +46,6 @@ BookmarksPanel::BookmarksPanel(const QString &title, QWidget *parent, Qt::Window
, m_loadingState(false)
{
setObjectName("bookmarksPanel");
-
setVisible(ReKonfig::showBookmarksPanel());
}
diff --git a/src/history/historypanel.cpp b/src/history/historypanel.cpp
index 79efb2b1..c0097965 100644
--- a/src/history/historypanel.cpp
+++ b/src/history/historypanel.cpp
@@ -62,18 +62,6 @@ HistoryPanel::~HistoryPanel()
}
-void HistoryPanel::setup()
-{
- UrlPanel::setup();
- kDebug() << "History panel...";
-
- m_treeView->header()->hideSection(1);
-
- const UrlFilterProxyModel *proxy = static_cast<const UrlFilterProxyModel*>(m_treeView->model());
- m_treeView->expand(proxy->index(0, 0));
-}
-
-
void HistoryPanel::contextMenuItem(const QPoint &pos)
{
KMenu menu;
@@ -144,8 +132,19 @@ void HistoryPanel::openAll()
}
+void HistoryPanel::setup()
+{
+ UrlPanel::setup();
+ kDebug() << "History panel...";
+
+ m_treeView->header()->hideSection(1);
+
+ const UrlFilterProxyModel *proxy = static_cast<const UrlFilterProxyModel*>(m_treeView->model());
+ m_treeView->expand(proxy->index(0, 0));
+}
+
+
QAbstractItemModel* HistoryPanel::getModel()
{
return Application::historyManager()->historyTreeModel();
}
-
diff --git a/src/panels/urlpanel.cpp b/src/panels/urlpanel.cpp
index a4cfe682..887dacf7 100644
--- a/src/panels/urlpanel.cpp
+++ b/src/panels/urlpanel.cpp
@@ -64,7 +64,7 @@ UrlPanel::~UrlPanel()
void UrlPanel::showing(bool b)
{
- if(b && !_loaded)
+ if(!_loaded && b)
{
setup();
_loaded = true;