Merge branch 'Applications/17.12'

[dolphin.git] / src / panels / panel.cpp

diff --git a/src/panels/panel.cpp b/src/panels/panel.cpp
index 6d11422d8a6cbea1a1dc45cd29f46abc2408d0ed..348191c981de63da7b511d06157a12ce363f7e07 100644 (file)
--- a/src/panels/panel.cpp
+++ b/src/panels/panel.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2006 by Cvetoslav Ludmiloff <ludmiloff@gmail.com>       *
- *   Copyright (C) 2006-2010 by Peter Penz <peter.penz@gmx.at>             *
+ *   Copyright (C) 2006-2010 by Peter Penz <peter.penz19@gmail.com>        *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -19,11 +19,12 @@
  ***************************************************************************/
 
 #include "panel.h"
-#include <kurl.h>
+#include <QUrl>
 
 Panel::Panel(QWidget* parent) :
     QWidget(parent),
-    m_url(KUrl())
+    m_url(),
+    m_customContextMenuActions()
 {
 }
 
@@ -31,18 +32,38 @@ Panel::~Panel()
 {
 }
 
-KUrl Panel::url() const
+QUrl Panel::url() const
 {
     return m_url;
 }
 
-void Panel::setUrl(const KUrl& url)
+void Panel::setCustomContextMenuActions(const QList<QAction*>& actions)
 {
-    if (url.equals(m_url, KUrl::CompareWithoutTrailingSlash)) {
+    m_customContextMenuActions = actions;
+}
+
+QList<QAction*> Panel::customContextMenuActions() const
+{
+    return m_customContextMenuActions;
+}
+
+QSize Panel::sizeHint() const
+{
+    // The size hint will be requested already when starting Dolphin even
+    // if the panel is invisible. For performance reasons most panels delay
+    // the creation and initialization of widgets until a showEvent() is called.
+    // Because of this the size-hint of the embedded widgets cannot be used
+    // and a default size is provided:
+    return QSize(180, 180);
+}
+
+void Panel::setUrl(const QUrl& url)
+{
+    if (url.matches(m_url, QUrl::StripTrailingSlash)) {
         return;
     }
 
-    const KUrl oldUrl = m_url;
+    const QUrl oldUrl = m_url;
     m_url = url;
     const bool accepted = urlChanged();
     if (!accepted) {
@@ -50,4 +71,8 @@ void Panel::setUrl(const KUrl& url)
     }
 }
 
-#include "panel.moc"
+void Panel::readSettings()
+{
+
+}
+