Changeset View
Changeset View
Standalone View
Standalone View
src/views/dolphinview.cpp
| Show All 25 Lines | |||||
| 26 | #include "dolphinnewfilemenuobserver.h" | 26 | #include "dolphinnewfilemenuobserver.h" | ||
| 27 | #include "draganddrophelper.h" | 27 | #include "draganddrophelper.h" | ||
| 28 | #include "kitemviews/kfileitemlistview.h" | 28 | #include "kitemviews/kfileitemlistview.h" | ||
| 29 | #include "kitemviews/kfileitemmodel.h" | 29 | #include "kitemviews/kfileitemmodel.h" | ||
| 30 | #include "kitemviews/kitemlistcontainer.h" | 30 | #include "kitemviews/kitemlistcontainer.h" | ||
| 31 | #include "kitemviews/kitemlistcontroller.h" | 31 | #include "kitemviews/kitemlistcontroller.h" | ||
| 32 | #include "kitemviews/kitemlistheader.h" | 32 | #include "kitemviews/kitemlistheader.h" | ||
| 33 | #include "kitemviews/kitemlistselectionmanager.h" | 33 | #include "kitemviews/kitemlistselectionmanager.h" | ||
| 34 | #include "renamedialog.h" | | |||
| 35 | #include "versioncontrol/versioncontrolobserver.h" | 34 | #include "versioncontrol/versioncontrolobserver.h" | ||
| 36 | #include "viewproperties.h" | 35 | #include "viewproperties.h" | ||
| 37 | #include "views/tooltips/tooltipmanager.h" | 36 | #include "views/tooltips/tooltipmanager.h" | ||
| 38 | #include "zoomlevelinfo.h" | 37 | #include "zoomlevelinfo.h" | ||
| 39 | 38 | | |||
| 40 | #ifdef HAVE_BALOO | 39 | #ifdef HAVE_BALOO | ||
| 41 | #include <Baloo/IndexerConfig> | 40 | #include <Baloo/IndexerConfig> | ||
| 42 | #endif | 41 | #endif | ||
| 43 | #include <KColorScheme> | 42 | #include <KColorScheme> | ||
| 44 | #include <KDesktopFile> | 43 | #include <KDesktopFile> | ||
| 45 | #include <KDirModel> | 44 | #include <KDirModel> | ||
| 46 | #include <KFileItemListProperties> | 45 | #include <KFileItemListProperties> | ||
| 47 | #include <KFormat> | 46 | #include <KFormat> | ||
| 48 | #include <KIO/CopyJob> | 47 | #include <KIO/CopyJob> | ||
| 49 | #include <KIO/DeleteJob> | 48 | #include <KIO/DeleteJob> | ||
| 50 | #include <KIO/DropJob> | 49 | #include <KIO/DropJob> | ||
| 51 | #include <KIO/JobUiDelegate> | 50 | #include <KIO/JobUiDelegate> | ||
| 52 | #include <KIO/Paste> | 51 | #include <KIO/Paste> | ||
| 53 | #include <KIO/PasteJob> | 52 | #include <KIO/PasteJob> | ||
| 54 | #include <KIO/PreviewJob> | 53 | #include <KIO/PreviewJob> | ||
| 54 | #include <KIO/RenameFileDialog> | ||||
| 55 | #include <KJobWidgets> | 55 | #include <KJobWidgets> | ||
| 56 | #include <KLocalizedString> | 56 | #include <KLocalizedString> | ||
| 57 | #include <KMessageBox> | 57 | #include <KMessageBox> | ||
| 58 | #include <KProtocolManager> | 58 | #include <KProtocolManager> | ||
| 59 | 59 | | |||
| 60 | #include <QAbstractItemView> | 60 | #include <QAbstractItemView> | ||
| 61 | #include <QApplication> | 61 | #include <QApplication> | ||
| 62 | #include <QClipboard> | 62 | #include <QClipboard> | ||
| ▲ Show 20 Lines • Show All 567 Lines • ▼ Show 20 Line(s) | 629 | if (items.count() == 1 && GeneralSettings::renameInline()) { | |||
| 630 | const int index = m_model->index(items.first()); | 630 | const int index = m_model->index(items.first()); | ||
| 631 | m_view->editRole(index, "text"); | 631 | m_view->editRole(index, "text"); | ||
| 632 | 632 | | |||
| 633 | hideToolTip(); | 633 | hideToolTip(); | ||
| 634 | 634 | | |||
| 635 | connect(m_view, &DolphinItemListView::roleEditingFinished, | 635 | connect(m_view, &DolphinItemListView::roleEditingFinished, | ||
| 636 | this, &DolphinView::slotRoleEditingFinished); | 636 | this, &DolphinView::slotRoleEditingFinished); | ||
| 637 | } else { | 637 | } else { | ||
| 638 | RenameDialog* dialog = new RenameDialog(this, items); | 638 | KIO::RenameFileDialog* dialog = new KIO::RenameFileDialog(this, items); | ||
| 639 | connect(dialog, &RenameDialog::renamingFinished, this, &DolphinView::slotRenameDialogRenamingFinished); | 639 | connect(dialog, SIGNAL(renamingFinished()), SLOT(slotRenameDialogRenamingFinished())); | ||
broulik: Why not keep the new connect syntax? | |||||
| 640 | 640 | | |||
| 641 | dialog->show(); | 641 | dialog->show(); | ||
| 642 | dialog->raise(); | 642 | dialog->raise(); | ||
| 643 | dialog->activateWindow(); | 643 | dialog->activateWindow(); | ||
| 644 | } | 644 | } | ||
| 645 | 645 | | |||
| 646 | // Assure that the current index remains visible when KFileItemModel | 646 | // Assure that the current index remains visible when KFileItemModel | ||
| 647 | // will notify the view about changed items (which might result in | 647 | // will notify the view about changed items (which might result in | ||
| ▲ Show 20 Lines • Show All 1191 Lines • Show Last 20 Lines | |||||
Why not keep the new connect syntax?