Differential D7851 Diff 20691 addons/filebrowser/katefilebrowser.cpp

Changeset View

Standalone View

View Options

addons/filebrowser/katefilebrowser.cpp

Show First 20 Lines • Show All 64 Lines • ▼ Show 20 Line(s)55{
65 mainLayout->addWidget(m_toolbar); 65​ mainLayout->addWidget(m_toolbar);
66 66​
67 // includes some actions, but not hooked into the shortcut dialog atm 67​ // includes some actions, but not hooked into the shortcut dialog atm
68 m_actionCollection = new KActionCollection(this); 68​ m_actionCollection = new KActionCollection(this);
69 m_actionCollection->addAssociatedWidget(this); 69​ m_actionCollection->addAssociatedWidget(this);
70 70​
71 KFilePlacesModel* model = new KFilePlacesModel(this); 71​ KFilePlacesModel* model = new KFilePlacesModel(this);
72 m_urlNavigator = new KUrlNavigator(model, QUrl::fromLocalFile(QDir::homePath()), this); 72​ m_urlNavigator = new KUrlNavigator(model, QUrl::fromLocalFile(QDir::homePath()), this);
73 connect(m_urlNavigator, SIGNAL(urlChanged(QUrl)), SLOT(updateDirOperator(QUrl))); 73​ connect(m_urlNavigator, &KUrlNavigator::urlChanged, this, &KateFileBrowser::updateDirOperator);
74 mainLayout->addWidget(m_urlNavigator); 74​ mainLayout->addWidget(m_urlNavigator);
75 75​
76 m_dirOperator = new KDirOperator(QUrl(), this); 76​ m_dirOperator = new KDirOperator(QUrl(), this);
77 m_dirOperator->setView(KFile::/* Simple */Detail); 77​ m_dirOperator->setView(KFile::/* Simple */Detail);
78 m_dirOperator->view()->setSelectionMode(QAbstractItemView::ExtendedSelection); 78​ m_dirOperator->view()->setSelectionMode(QAbstractItemView::ExtendedSelection);
79 m_dirOperator->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding)); 79​ m_dirOperator->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
80 mainLayout->addWidget(m_dirOperator); 80​ mainLayout->addWidget(m_dirOperator);
81 81​
82 // Mime filter for the KDirOperator 82​ // Mime filter for the KDirOperator
83 QStringList filter; 83​ QStringList filter;
84 filter << QStringLiteral("text/plain") << QStringLiteral("text/html") << QStringLiteral("inode/directory"); 84​ filter << QStringLiteral("text/plain") << QStringLiteral("text/html") << QStringLiteral("inode/directory");
85 m_dirOperator->setNewFileMenuSupportedMimeTypes(filter); 85​ m_dirOperator->setNewFileMenuSupportedMimeTypes(filter);
86 86​
87 setFocusProxy(m_dirOperator); 87​ setFocusProxy(m_dirOperator);
88 connect(m_dirOperator, SIGNAL(viewChanged(QAbstractItemView*)), 88​ connect(m_dirOperator, &KDirOperator::viewChanged, this, &KateFileBrowser::selectorViewChanged);
89 this, SLOT(selectorViewChanged(QAbstractItemView*))); 89​ connect(m_urlNavigator, &KUrlNavigator::returnPressed,
90 connect(m_urlNavigator, SIGNAL(returnPressed()), 90​ m_dirOperator, static_cast<void (KDirOperator::*)()>(&KDirOperator::setFocus));
91 m_dirOperator, SLOT(setFocus())); 91​
92 // now all actions exist in dir operator and we can use them in the toolbar 92​ // now all actions exist in dir operator and we can use them in the toolbar
93 setupActions(); 93​ setupActions();
94 setupToolbar(); 94​ setupToolbar();
95 95​
96 m_filter = new KHistoryComboBox(true, this); 96​ m_filter = new KHistoryComboBox(true, this);
97 m_filter->setMaxCount(10); 97​ m_filter->setMaxCount(10);
98 m_filter->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed)); 98​ m_filter->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed));
99 m_filter->lineEdit()->setPlaceholderText(i18n("Search")); 99​ m_filter->lineEdit()->setPlaceholderText(i18n("Search"));
100 mainLayout->addWidget(m_filter); 100​ mainLayout->addWidget(m_filter);
101 101​
102 connect(m_filter, SIGNAL(editTextChanged(QString)), 102​ connect(m_filter, &KHistoryComboBox::editTextChanged, this, &KateFileBrowser::slotFilterChange);
103 SLOT(slotFilterChange(QString))); 103​ connect(m_filter, static_cast<void (KHistoryComboBox::*)(const QString &)>(&KHistoryComboBox::returnPressed),
104 connect(m_filter, SIGNAL(returnPressed(QString)), 104​ m_filter, &KHistoryComboBox::addToHistory);
105 m_filter, SLOT(addToHistory(QString))); 105​ connect(m_filter, static_cast<void (KHistoryComboBox::*)(const QString &)>(&KHistoryComboBox::returnPressed),
106 connect(m_filter, SIGNAL(returnPressed(QString)), 106​ m_dirOperator, static_cast< void (KDirOperator::*)()>(&KDirOperator::setFocus));
107 m_dirOperator, SLOT(setFocus())); 107​ connect(m_dirOperator, &KDirOperator::urlEntered, this, &KateFileBrowser::updateUrlNavigator);
108 ​
109 connect(m_dirOperator, SIGNAL(urlEntered(QUrl)), ​
110 this, SLOT(updateUrlNavigator(QUrl))); ​
111 108​
112 // Connect the bookmark handler 109​ // Connect the bookmark handler
113 connect(m_bookmarkHandler, SIGNAL(openUrl(QString)), 110​ connect(m_bookmarkHandler, &KateBookmarkHandler::openUrl,
114 this, SLOT(setDir(QString))); 111​ this, static_cast<void (KateFileBrowser::*)(const QString&)>(&KateFileBrowser::setDir));
115 112​
116 m_filter->setWhatsThis(i18n("Enter a name filter to limit which files are displayed.")); 113​ m_filter->setWhatsThis(i18n("Enter a name filter to limit which files are displayed."));
117 114​
118 connect(m_dirOperator, SIGNAL(fileSelected(KFileItem)), this, SLOT(fileSelected(KFileItem))); 115​ connect(m_dirOperator, &KDirOperator::fileSelected, this, &KateFileBrowser::fileSelected);
119 connect(m_mainWindow, SIGNAL(viewChanged(KTextEditor::View *)), this, SLOT(autoSyncFolder())); 116​ connect(m_mainWindow, &KTextEditor::MainWindow::viewChanged, this, &KateFileBrowser::autoSyncFolder);
120} 117​}
121 118​
122KateFileBrowser::~KateFileBrowser() 119​KateFileBrowser::~KateFileBrowser()
123{ 120​{
124} 121​}
125//END Constroctor/Destrctor 122​//END Constroctor/Destrctor
126 123​
127//BEGIN Public Methods 124​//BEGIN Public Methods
▲ Show 20 Lines • Show All 174 Lines • ▼ Show 20 Line(s)295{
302 m_bookmarkHandler = new KateBookmarkHandler(this, acmBookmarks->menu()); 299​ m_bookmarkHandler = new KateBookmarkHandler(this, acmBookmarks->menu());
303 acmBookmarks->setShortcutContext(Qt::WidgetWithChildrenShortcut); 300​ acmBookmarks->setShortcutContext(Qt::WidgetWithChildrenShortcut);
304 301​
305 // action for synchronizing the dir operator with the current document path 302​ // action for synchronizing the dir operator with the current document path
306 QAction* syncFolder = new QAction(this); 303​ QAction* syncFolder = new QAction(this);
307 syncFolder->setShortcutContext(Qt::WidgetWithChildrenShortcut); 304​ syncFolder->setShortcutContext(Qt::WidgetWithChildrenShortcut);
308 syncFolder->setText(i18n("Current Document Folder")); 305​ syncFolder->setText(i18n("Current Document Folder"));
309 syncFolder->setIcon(QIcon::fromTheme(QStringLiteral("system-switch-user"))); 306​ syncFolder->setIcon(QIcon::fromTheme(QStringLiteral("system-switch-user")));
310 connect(syncFolder, SIGNAL(triggered()), this, SLOT(setActiveDocumentDir())); 307​ connect(syncFolder, &QAction::triggered, this, &KateFileBrowser::setActiveDocumentDir);
311 308​
312 m_actionCollection->addAction(QStringLiteral("sync_dir"), syncFolder); 309​ m_actionCollection->addAction(QStringLiteral("sync_dir"), syncFolder);
313 m_actionCollection->addAction(QStringLiteral("bookmarks"), acmBookmarks); 310​ m_actionCollection->addAction(QStringLiteral("bookmarks"), acmBookmarks);
314 311​
315 // section for settings menu 312​ // section for settings menu
316 KActionMenu *optionsMenu = new KActionMenu(QIcon::fromTheme(QStringLiteral("configure")), i18n("Options"), this); 313​ KActionMenu *optionsMenu = new KActionMenu(QIcon::fromTheme(QStringLiteral("configure")), i18n("Options"), this);
317 optionsMenu->setDelayed(false); 314​ optionsMenu->setDelayed(false);
318 optionsMenu->addAction(m_dirOperator->actionCollection()->action(QStringLiteral("short view"))); 315​ optionsMenu->addAction(m_dirOperator->actionCollection()->action(QStringLiteral("short view")));
319 optionsMenu->addAction(m_dirOperator->actionCollection()->action(QStringLiteral("detailed view"))); 316​ optionsMenu->addAction(m_dirOperator->actionCollection()->action(QStringLiteral("detailed view")));
320 optionsMenu->addAction(m_dirOperator->actionCollection()->action(QStringLiteral("tree view"))); 317​ optionsMenu->addAction(m_dirOperator->actionCollection()->action(QStringLiteral("tree view")));
321 optionsMenu->addAction(m_dirOperator->actionCollection()->action(QStringLiteral("detailed tree view"))); 318​ optionsMenu->addAction(m_dirOperator->actionCollection()->action(QStringLiteral("detailed tree view")));
322 optionsMenu->addSeparator(); 319​ optionsMenu->addSeparator();
323 optionsMenu->addAction(m_dirOperator->actionCollection()->action(QStringLiteral("show hidden"))); 320​ optionsMenu->addAction(m_dirOperator->actionCollection()->action(QStringLiteral("show hidden")));
324 321​
325 // action for synchronising the dir operator with the current document path 322​ // action for synchronising the dir operator with the current document path
326 m_autoSyncFolder = new QAction(this); 323​ m_autoSyncFolder = new QAction(this);
327 m_autoSyncFolder->setCheckable(true); 324​ m_autoSyncFolder->setCheckable(true);
328 m_autoSyncFolder->setText(i18n("Automatically synchronize with current document")); 325​ m_autoSyncFolder->setText(i18n("Automatically synchronize with current document"));
329 m_autoSyncFolder->setIcon(QIcon::fromTheme(QStringLiteral("system-switch-user"))); 326​ m_autoSyncFolder->setIcon(QIcon::fromTheme(QStringLiteral("system-switch-user")));
330 connect(m_autoSyncFolder, SIGNAL(triggered()), this, SLOT(autoSyncFolder())); 327​ connect(m_autoSyncFolder, &QAction::triggered, this, &KateFileBrowser::autoSyncFolder);
331 optionsMenu->addAction(m_autoSyncFolder); 328​ optionsMenu->addAction(m_autoSyncFolder);
332 329​
333 m_actionCollection->addAction(QStringLiteral("configure"), optionsMenu); 330​ m_actionCollection->addAction(QStringLiteral("configure"), optionsMenu);
334 331​
335 // 332​ //
336 // Remove all shortcuts due to shortcut clashes (e.g. F5: reload, Ctrl+B: bookmark) 333​ // Remove all shortcuts due to shortcut clashes (e.g. F5: reload, Ctrl+B: bookmark)
337 // BUGS: #188954, #236368 334​ // BUGS: #188954, #236368
338 // 335​ //
Show All 10 Lines