Fix wrong window titles

[dolphin.git] / src / panels / folders / folderspanel.cpp

diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp
index e455780e02c828d886a8188c1ce13ee5701ee823..01f338461f0d8990651ed615612cab5d239fa589 100644 (file)
--- a/src/panels/folders/folderspanel.cpp
+++ b/src/panels/folders/folderspanel.cpp
@@ -21,15 +21,16 @@
 
 #include "dolphin_folderspanelsettings.h"
 #include "dolphin_generalsettings.h"
 
 #include "dolphin_folderspanelsettings.h"
 #include "dolphin_generalsettings.h"

-#include "treeviewcontextmenu.h"

 #include "foldersitemlistwidget.h"
 #include "foldersitemlistwidget.h"

-
-#include <views/renamedialog.h>
-#include <kitemviews/kitemlistselectionmanager.h>
-#include <kitemviews/kfileitemlistview.h>
-#include <kitemviews/kitemlistcontainer.h>
-#include <kitemviews/kitemlistcontroller.h>
-#include <kitemviews/kfileitemmodel.h>
+#include "global.h"
+#include "kitemviews/kfileitemlistview.h"
+#include "kitemviews/kfileitemmodel.h"
+#include "kitemviews/kitemlistcontainer.h"
+#include "kitemviews/kitemlistcontroller.h"
+#include "kitemviews/kitemlistselectionmanager.h"
+#include "treeviewcontextmenu.h"
+#include "views/draganddrophelper.h"
+#include "views/renamedialog.h"

 
 #include <KJobWidgets>
 #include <KJobUiDelegate>
 
 #include <KJobWidgets>
 #include <KJobUiDelegate>


@@ -44,10 +45,6 @@
 #include <QPropertyAnimation>
 #include <QTimer>
 
 #include <QPropertyAnimation>
 #include <QTimer>
 

-#include <views/draganddrophelper.h>
-
-#include "global.h"
-

 FoldersPanel::FoldersPanel(QWidget* parent) :
     Panel(parent),
     m_updateCurrentItem(false),
 FoldersPanel::FoldersPanel(QWidget* parent) :
     Panel(parent),
     m_updateCurrentItem(false),


@@ -108,16 +105,13 @@ void FoldersPanel::rename(const KFileItem& item)
         m_controller->view()->editRole(index, "text");
     } else {
         RenameDialog* dialog = new RenameDialog(this, KFileItemList() << item);
         m_controller->view()->editRole(index, "text");
     } else {
         RenameDialog* dialog = new RenameDialog(this, KFileItemList() << item);

-        dialog->setAttribute(Qt::WA_DeleteOnClose);
-        dialog->show();
-        dialog->raise();
-        dialog->activateWindow();
+        dialog->open();

     }
 }
 
 bool FoldersPanel::urlChanged()
 {
     }
 }
 
 bool FoldersPanel::urlChanged()
 {

-    if (!url().isValid() || url().scheme().contains(QStringLiteral("search"))) {
+    if (!url().isValid() || url().scheme().contains(QLatin1String("search"))) {

         // Skip results shown by a search, as possible identical
         // directory names are useless without parent-path information.
         return false;
         // Skip results shown by a search, as possible identical
         // directory names are useless without parent-path information.
         return false;


@@ -184,7 +178,7 @@ void FoldersPanel::showEvent(QShowEvent* event)
         container->setEnabledFrame(false);
 
         QVBoxLayout* layout = new QVBoxLayout(this);
         container->setEnabledFrame(false);
 
         QVBoxLayout* layout = new QVBoxLayout(this);

-        layout->setMargin(0);
+        layout->setContentsMargins(0, 0, 0, 0);

         layout->addWidget(container);
     }
 
         layout->addWidget(container);
     }
 


@@ -220,12 +214,10 @@ void FoldersPanel::slotItemMiddleClicked(int index)
 
 void FoldersPanel::slotItemContextMenuRequested(int index, const QPointF& pos)
 {
 
 void FoldersPanel::slotItemContextMenuRequested(int index, const QPointF& pos)
 {

-    Q_UNUSED(pos);
-

     const KFileItem fileItem = m_model->fileItem(index);
 
     QPointer<TreeViewContextMenu> contextMenu = new TreeViewContextMenu(this, fileItem);
     const KFileItem fileItem = m_model->fileItem(index);
 
     QPointer<TreeViewContextMenu> contextMenu = new TreeViewContextMenu(this, fileItem);

-    contextMenu.data()->open();
+    contextMenu.data()->open(pos.toPoint());

     if (contextMenu.data()) {
         delete contextMenu.data();
     }
     if (contextMenu.data()) {
         delete contextMenu.data();
     }


@@ -233,10 +225,8 @@ void FoldersPanel::slotItemContextMenuRequested(int index, const QPointF& pos)
 
 void FoldersPanel::slotViewContextMenuRequested(const QPointF& pos)
 {
 
 void FoldersPanel::slotViewContextMenuRequested(const QPointF& pos)
 {

-    Q_UNUSED(pos);
-

     QPointer<TreeViewContextMenu> contextMenu = new TreeViewContextMenu(this, KFileItem());
     QPointer<TreeViewContextMenu> contextMenu = new TreeViewContextMenu(this, KFileItem());

-    contextMenu.data()->open();
+    contextMenu.data()->open(pos.toPoint());

     if (contextMenu.data()) {
         delete contextMenu.data();
     }
     if (contextMenu.data()) {
         delete contextMenu.data();
     }


@@ -268,7 +258,7 @@ void FoldersPanel::slotRoleEditingFinished(int index, const QByteArray& role, co
     if (role == "text") {
         const KFileItem item = m_model->fileItem(index);
         const QString newName = value.toString();
     if (role == "text") {
         const KFileItem item = m_model->fileItem(index);
         const QString newName = value.toString();

-        if (!newName.isEmpty() && newName != item.text() && newName != QLatin1String(".") && newName != QLatin1String("..")) {
+        if (!newName.isEmpty() && newName != item.text() && newName != QLatin1Char('.') && newName != QLatin1String("..")) {

             const QUrl oldUrl = item.url();
             QUrl newUrl = oldUrl.adjusted(QUrl::RemoveFilename);
             newUrl.setPath(newUrl.path() + KIO::encodeFileName(newName));
             const QUrl oldUrl = item.url();
             QUrl newUrl = oldUrl.adjusted(QUrl::RemoveFilename);
             newUrl.setPath(newUrl.path() + KIO::encodeFileName(newName));