/***************************************************************************
- * Copyright (C) 2006 by Peter Penz <peter.penz@gmx.at> *
+ * Copyright (C) 2006 by Peter Penz <peter.penz19@gmail.com> *
* Copyright (C) 2006 by Stefan Monov <logixoul@gmail.com> *
* Copyright (C) 2006 by Cvetoslav Ludmiloff <ludmiloff@gmail.com> *
* *
#include "dolphinviewcontainer.h"
#include "mainwindowadaptor.h"
#ifdef HAVE_NEPOMUK
- #include "panels/filter/filterpanel.h"
- #include <nepomuk/resourcemanager.h>
+ #include "panels/search/searchpanel.h"
+ #include <Nepomuk/ResourceManager>
#endif
#include "panels/folders/folderspanel.h"
#include "panels/places/placespanel.h"
#include "panels/information/informationpanel.h"
+#include "search/dolphinsearchinformation.h"
#include "settings/dolphinsettings.h"
#include "settings/dolphinsettingsdialog.h"
#include "statusbar/dolphinstatusbar.h"
#include "dolphin_generalsettings.h"
#include "dolphin_iconsmodesettings.h"
-#include <kaction.h>
-#include <kactioncollection.h>
-#include <kactionmenu.h>
-#include <kconfig.h>
-#include <kdesktopfile.h>
+#include <KAction>
+#include <KActionCollection>
+#include <KActionMenu>
+#include <KConfig>
+#include <KDesktopFile>
#include <kdeversion.h>
#include <kdualaction.h>
-#include <kfiledialog.h>
-#include <kfileplacesmodel.h>
-#include <kglobal.h>
-#include <klineedit.h>
+#include <KFileDialog>
+#include <KFilePlacesModel>
+#include <KGlobal>
+#include <KLineEdit>
#include <ktoolbar.h>
-#include <kicon.h>
-#include <kiconloader.h>
-#include <kio/netaccess.h>
-#include <kinputdialog.h>
-#include <klocale.h>
-#include <kprotocolmanager.h>
-#include <kmenu.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
-#include <kfileitemlistproperties.h>
+#include <KIcon>
+#include <KIconLoader>
+#include <KIO/NetAccess>
+#include <KInputDialog>
+#include <KLocale>
+#include <KProtocolManager>
+#include <KMenu>
+#include <KMenuBar>
+#include <KMessageBox>
+#include <KFileItemListProperties>
#include <konqmimedata.h>
-#include <kprotocolinfo.h>
-#include <krun.h>
-#include <kshell.h>
-#include <kstandarddirs.h>
+#include <KProtocolInfo>
+#include <KRun>
+#include <KShell>
+#include <KStandardDirs>
#include <kstatusbar.h>
-#include <kstandardaction.h>
+#include <KStandardAction>
#include <ktabbar.h>
-#include <ktoggleaction.h>
-#include <kurlnavigator.h>
-#include <kurl.h>
-#include <kurlcombobox.h>
-#include <ktoolinvocation.h>
+#include <KToggleAction>
+#include <KUrlNavigator>
+#include <KUrl>
+#include <KUrlComboBox>
+#include <KToolInvocation>
#include <QDBusMessage>
#include <QKeyEvent>
m_remoteEncoding(0),
m_settingsDialog(0),
m_lastHandleUrlStatJob(0),
- m_filterDockIsTemporaryVisible(false)
+ m_searchDockIsTemporaryVisible(false)
{
// Workaround for a X11-issue in combination with KModifierInfo
// (see DolphinContextMenu::initializeModifierKeyInfo() for
return;
}
+ if (dirs.count() == 1) {
+ m_activeViewContainer->setUrl(dirs.first());
+ return;
+ }
+
const int oldOpenTabsCount = m_viewTab.count();
const GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings();
const int tabCount = m_viewTab.count();
for (int i = 0; i < tabCount; ++i) {
m_viewTab[i].primaryView->view()->markUrlsAsSelected(files);
- if (m_viewTab[i].secondaryView != 0) {
+ if (m_viewTab[i].secondaryView) {
m_viewTab[i].secondaryView->view()->markUrlsAsSelected(files);
}
}
}
-void DolphinMainWindow::toggleViews()
-{
- if (m_viewTab[m_tabIndex].primaryView == 0) {
- return;
- }
-
- // move secondary view from the last position of the splitter
- // to the first position
- m_viewTab[m_tabIndex].splitter->insertWidget(0, m_viewTab[m_tabIndex].secondaryView);
-
- DolphinViewContainer* container = m_viewTab[m_tabIndex].primaryView;
- m_viewTab[m_tabIndex].primaryView = m_viewTab[m_tabIndex].secondaryView;
- m_viewTab[m_tabIndex].secondaryView = container;
-}
-
void DolphinMainWindow::showCommand(CommandType command)
{
DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();
void DolphinMainWindow::refreshViews()
{
- Q_ASSERT(m_viewTab[m_tabIndex].primaryView != 0);
+ Q_ASSERT(m_viewTab[m_tabIndex].primaryView);
// remember the current active view, as because of
// the refreshing the active view might change to
const int tabCount = m_viewTab.count();
for (int i = 0; i < tabCount; ++i) {
m_viewTab[i].primaryView->refresh();
- if (m_viewTab[i].secondaryView != 0) {
+ if (m_viewTab[i].secondaryView) {
m_viewTab[i].secondaryView->refresh();
}
}
// Synchronize the split-view setting with the active view:
const bool splitView = generalSettings->splitView();
const ViewTab& activeTab = m_viewTab[m_tabIndex];
- const bool toggle = ( splitView && (activeTab.secondaryView == 0))
- || (!splitView && (activeTab.secondaryView != 0));
+ const bool toggle = ( splitView && !activeTab.secondaryView)
+ || (!splitView && activeTab.secondaryView);
if (toggle) {
toggleSplitView();
}
}
DolphinViewContainer* view = activeViewContainer();
- if (view != 0) {
+ if (view) {
view->setUrl(url);
updateEditActions();
updateViewActions();
{
updateEditActions();
- Q_ASSERT(m_viewTab[m_tabIndex].primaryView != 0);
+ Q_ASSERT(m_viewTab[m_tabIndex].primaryView);
int selectedUrlsCount = m_viewTab[m_tabIndex].primaryView->view()->selectedItemsCount();
- if (m_viewTab[m_tabIndex].secondaryView != 0) {
+ if (m_viewTab[m_tabIndex].secondaryView) {
selectedUrlsCount += m_viewTab[m_tabIndex].secondaryView->view()->selectedItemsCount();
}
QAction* backAction = actionCollection()->action("go_back");
backAction->setToolTip(i18nc("@info", "Go back"));
- if (backAction != 0) {
+ if (backAction) {
backAction->setEnabled(index < urlNavigator->historySize() - 1);
}
QAction* forwardAction = actionCollection()->action("go_forward");
forwardAction->setToolTip(i18nc("@info", "Go forward"));
- if (forwardAction != 0) {
+ if (forwardAction) {
forwardAction->setEnabled(index > 0);
}
}
viewTab.primaryView = new DolphinViewContainer(url, viewTab.splitter);
viewTab.primaryView->setActive(false);
connectViewSignals(viewTab.primaryView);
- viewTab.primaryView->view()->reload();
m_viewTab.append(viewTab);
m_viewTab[tabIndex].isPrimaryViewActive = false;
}
- if (focusWidget != 0) {
+ if (focusWidget) {
// The DolphinViewContainer grabbed the keyboard focus. As the tab is opened
// in background, assure that the previous focused widget gets the focus back.
focusWidget->setFocus();
void DolphinMainWindow::toggleActiveView()
{
- if (m_viewTab[m_tabIndex].secondaryView == 0) {
+ if (!m_viewTab[m_tabIndex].secondaryView) {
// only one view is available
return;
}
- Q_ASSERT(m_activeViewContainer != 0);
- Q_ASSERT(m_viewTab[m_tabIndex].primaryView != 0);
+ Q_ASSERT(m_activeViewContainer);
+ Q_ASSERT(m_viewTab[m_tabIndex].primaryView);
DolphinViewContainer* left = m_viewTab[m_tabIndex].primaryView;
DolphinViewContainer* right = m_viewTab[m_tabIndex].secondaryView;
settings.save();
- if (m_filterDockIsTemporaryVisible) {
- QDockWidget* filterDock = findChild<QDockWidget*>("filterDock");
- if (filterDock != 0) {
- filterDock->hide();
+ if (m_searchDockIsTemporaryVisible) {
+ QDockWidget* searchDock = findChild<QDockWidget*>("searchDock");
+ if (searchDock) {
+ searchDock->hide();
}
- m_filterDockIsTemporaryVisible = false;
+ m_searchDockIsTemporaryVisible = false;
}
KXmlGuiWindow::closeEvent(event);
cont->urlNavigator()->isUrlEditable());
cont = m_viewTab[i].secondaryView;
- if (cont != 0) {
+ if (cont) {
group.writeEntry(tabProperty("Secondary URL", i), cont->url().url());
group.writeEntry(tabProperty("Secondary Editable", i),
cont->urlNavigator()->isUrlEditable());
cont = m_viewTab[i].secondaryView;
const QString secondaryUrl = group.readEntry(tabProperty("Secondary URL", i));
if (!secondaryUrl.isEmpty()) {
- if (cont == 0) {
+ if (!cont) {
// a secondary view should be shown, but no one is available
// currently -> create a new view
toggleSplitView();
cont = m_viewTab[i].secondaryView;
- Q_ASSERT(cont != 0);
+ Q_ASSERT(cont);
}
cont->setUrl(secondaryUrl);
const bool editable = group.readEntry(tabProperty("Secondary Editable", i), false);
cont->urlNavigator()->setUrlEditable(editable);
- } else if (cont != 0) {
+ } else if (cont) {
// no secondary view should be shown, but the default setting shows
// one already -> close the view
toggleSplitView();
void DolphinMainWindow::slotUndoAvailable(bool available)
{
QAction* undoAction = actionCollection()->action(KStandardAction::name(KStandardAction::Undo));
- if (undoAction != 0) {
+ if (undoAction) {
undoAction->setEnabled(available);
}
}
void DolphinMainWindow::slotUndoTextChanged(const QString& text)
{
QAction* undoAction = actionCollection()->action(KStandardAction::name(KStandardAction::Undo));
- if (undoAction != 0) {
+ if (undoAction) {
undoAction->setText(text);
}
}
void DolphinMainWindow::toggleSplitView()
{
- if (m_viewTab[m_tabIndex].secondaryView == 0) {
+ if (!m_viewTab[m_tabIndex].secondaryView) {
createSecondaryView(m_tabIndex);
setActiveViewContainer(m_viewTab[m_tabIndex].secondaryView);
} else if (m_activeViewContainer == m_viewTab[m_tabIndex].secondaryView) {
// select the whole text of the combo box editor
QLineEdit* lineEdit = navigator->editor()->lineEdit(); // krazy:exclude=qclasses
- const QString text = lineEdit->text();
- lineEdit->setSelection(0, text.length());
+ lineEdit->selectAll();
}
void DolphinMainWindow::togglePanelLockState()
const bool newLockState = !generalSettings->lockPanels();
foreach (QObject* child, children()) {
DolphinDockWidget* dock = qobject_cast<DolphinDockWidget*>(child);
- if (dock != 0) {
+ if (dock) {
dock->setLocked(newLockState);
}
}
// - both in the secondary view
// - one in the primary view and the other in the secondary
// view
- Q_ASSERT(m_viewTab[m_tabIndex].primaryView != 0);
+ Q_ASSERT(m_viewTab[m_tabIndex].primaryView);
KUrl urlA;
KUrl urlB;
switch (items.count()) {
case 0: {
- Q_ASSERT(m_viewTab[m_tabIndex].secondaryView != 0);
+ Q_ASSERT(m_viewTab[m_tabIndex].secondaryView);
items = m_viewTab[m_tabIndex].secondaryView->view()->selectedItems();
Q_ASSERT(items.count() == 2);
urlA = items[0].url();
case 1: {
urlA = items[0].url();
- Q_ASSERT(m_viewTab[m_tabIndex].secondaryView != 0);
+ Q_ASSERT(m_viewTab[m_tabIndex].secondaryView);
items = m_viewTab[m_tabIndex].secondaryView->view()->selectedItems();
Q_ASSERT(items.count() == 1);
urlB = items[0].url();
void DolphinMainWindow::editSettings()
{
- if (m_settingsDialog == 0) {
+ if (!m_settingsDialog) {
const KUrl url = activeViewContainer()->url();
m_settingsDialog = new DolphinSettingsDialog(url, this);
m_settingsDialog->setAttribute(Qt::WA_DeleteOnClose);
ViewTab& hiddenTab = m_viewTab[m_tabIndex];
hiddenTab.isPrimaryViewActive = hiddenTab.primaryView->isActive();
hiddenTab.primaryView->setActive(false);
- if (hiddenTab.secondaryView != 0) {
+ if (hiddenTab.secondaryView) {
hiddenTab.secondaryView->setActive(false);
}
QSplitter* splitter = m_viewTab[m_tabIndex].splitter;
ViewTab& viewTab = m_viewTab[index];
m_centralWidgetLayout->addWidget(viewTab.splitter, 1);
viewTab.primaryView->show();
- if (viewTab.secondaryView != 0) {
+ if (viewTab.secondaryView) {
viewTab.secondaryView->show();
}
viewTab.splitter->show();
// delete tab
m_viewTab[index].primaryView->deleteLater();
- if (m_viewTab[index].secondaryView != 0) {
+ if (m_viewTab[index].secondaryView) {
m_viewTab[index].secondaryView->deleteLater();
}
m_viewTab[index].splitter->deleteLater();
QAction* selectedAction = menu.exec(pos);
if (selectedAction == newTabAction) {
const ViewTab& tab = m_viewTab[index];
- Q_ASSERT(tab.primaryView != 0);
- const KUrl url = (tab.secondaryView != 0) && tab.secondaryView->isActive() ?
+ Q_ASSERT(tab.primaryView);
+ const KUrl url = tab.secondaryView && tab.secondaryView->isActive() ?
tab.secondaryView->url() : tab.primaryView->url();
openNewTab(url);
m_tabBar->setCurrentIndex(m_viewTab.count() - 1);
} else if (selectedAction == detachTabAction) {
const ViewTab& tab = m_viewTab[index];
- Q_ASSERT(tab.primaryView != 0);
+ Q_ASSERT(tab.primaryView);
const KUrl primaryUrl = tab.primaryView->url();
DolphinMainWindow* window = DolphinApplication::app()->createMainWindow();
window->changeUrl(primaryUrl);
- if (tab.secondaryView != 0) {
+ if (tab.secondaryView) {
const KUrl secondaryUrl = tab.secondaryView->url();
- window->toggleSplitView();
+ if (!window->m_viewTab[0].secondaryView) {
+ window->toggleSplitView();
+ }
window->m_viewTab[0].secondaryView->setUrl(secondaryUrl);
if (tab.primaryView->isActive()) {
window->m_viewTab[0].primaryView->setActive(true);
void DolphinMainWindow::slotSearchModeChanged(bool enabled)
{
#ifdef HAVE_NEPOMUK
- if (Nepomuk::ResourceManager::instance()->init() != 0) {
- // Currently the Filter Panel only works with Nepomuk enabled
+ const KUrl url = m_activeViewContainer->url();
+ const DolphinSearchInformation& searchInfo = DolphinSearchInformation::instance();
+ if (!searchInfo.isIndexingEnabled() || !searchInfo.isPathIndexed(url)) {
return;
}
- QDockWidget* filterDock = findChild<QDockWidget*>("filterDock");
- if ((filterDock == 0) || !filterDock->isEnabled()) {
+ QDockWidget* searchDock = findChild<QDockWidget*>("searchDock");
+ if (!searchDock) {
return;
}
if (enabled) {
- if (!filterDock->isVisible()) {
- m_filterDockIsTemporaryVisible = true;
+ if (!searchDock->isVisible()) {
+ m_searchDockIsTemporaryVisible = true;
}
- filterDock->show();
+ searchDock->show();
} else {
- if (filterDock->isVisible() && m_filterDockIsTemporaryVisible) {
- filterDock->hide();
+ if (searchDock->isVisible() && m_searchDockIsTemporaryVisible) {
+ searchDock->hide();
}
- m_filterDockIsTemporaryVisible = false;
+ m_searchDockIsTemporaryVisible = false;
}
#else
Q_UNUSED(enabled);
m_activeViewContainer = m_viewTab[m_tabIndex].primaryView;
connectViewSignals(m_activeViewContainer);
DolphinView* view = m_activeViewContainer->view();
- view->reload();
m_activeViewContainer->show();
m_actionHandler->setCurrentView(view);
void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContainer)
{
- Q_ASSERT(viewContainer != 0);
+ Q_ASSERT(viewContainer);
Q_ASSERT((viewContainer == m_viewTab[m_tabIndex].primaryView) ||
(viewContainer == m_viewTab[m_tabIndex].secondaryView));
if (m_activeViewContainer == viewContainer) {
void DolphinMainWindow::setupActions()
{
// setup 'File' menu
- m_newFileMenu = new DolphinNewFileMenu(this, this);
+ m_newFileMenu = new DolphinNewFileMenu(this);
KMenu* menu = m_newFileMenu->menu();
menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
menu->setIcon(KIcon("document-new"));
// doesn't work
KAction* cut = KStandardAction::cut(this, SLOT(cut()), actionCollection());
KShortcut cutShortcut = cut->shortcut();
- cutShortcut.remove(Qt::SHIFT + Qt::Key_Delete, KShortcut::KeepEmpty);
+ cutShortcut.remove(Qt::SHIFT | Qt::Key_Delete, KShortcut::KeepEmpty);
cut->setShortcut(cutShortcut);
KStandardAction::copy(this, SLOT(copy()), actionCollection());
KAction* paste = KStandardAction::paste(this, SLOT(paste()), actionCollection());
KAction* selectAll = actionCollection()->addAction("select_all");
selectAll->setText(i18nc("@action:inmenu Edit", "Select All"));
- selectAll->setShortcut(Qt::CTRL + Qt::Key_A);
+ selectAll->setShortcut(Qt::CTRL | Qt::Key_A);
connect(selectAll, SIGNAL(triggered()), this, SLOT(selectAll()));
KAction* invertSelection = actionCollection()->addAction("invert_selection");
// not in menu actions
QList<QKeySequence> nextTabKeys;
nextTabKeys.append(KStandardShortcut::tabNext().primary());
- nextTabKeys.append(QKeySequence(Qt::CTRL + Qt::Key_Tab));
+ nextTabKeys.append(QKeySequence(Qt::CTRL | Qt::Key_Tab));
QList<QKeySequence> prevTabKeys;
prevTabKeys.append(KStandardShortcut::tabPrev().primary());
- prevTabKeys.append(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_Tab));
+ prevTabKeys.append(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_Tab));
KAction* activateNextTab = actionCollection()->addAction("activate_next_tab");
activateNextTab->setText(i18nc("@action:inmenu", "Activate Next Tab"));
terminalPanel, SLOT(setUrl(KUrl)));
#endif
- // Setup "Filter"
+ // Setup "Search"
#ifdef HAVE_NEPOMUK
- DolphinDockWidget* filterDock = new DolphinDockWidget(i18nc("@title:window", "Filter"));
- filterDock->setLocked(lock);
- filterDock->setObjectName("filterDock");
- filterDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
- Panel* filterPanel = new FilterPanel(filterDock);
- filterPanel->setCustomContextMenuActions(QList<QAction*>() << lockLayoutAction);
- connect(filterPanel, SIGNAL(urlActivated(KUrl)), this, SLOT(handleUrl(KUrl)));
- filterDock->setWidget(filterPanel);
-
- QAction* filterAction = filterDock->toggleViewAction();
- filterAction->setShortcut(Qt::Key_F12);
- filterAction->setIcon(KIcon("view-filter"));
- addActionCloneToCollection(filterAction, "show_filter_panel");
- addDockWidget(Qt::RightDockWidgetArea, filterDock);
+ DolphinDockWidget* searchDock = new DolphinDockWidget(i18nc("@title:window", "Search"));
+ searchDock->setLocked(lock);
+ searchDock->setObjectName("searchDock");
+ searchDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
+ Panel* searchPanel = new SearchPanel(searchDock);
+ searchPanel->setCustomContextMenuActions(QList<QAction*>() << lockLayoutAction);
+ connect(searchPanel, SIGNAL(urlActivated(KUrl)), this, SLOT(handleUrl(KUrl)));
+ searchDock->setWidget(searchPanel);
+
+ QAction* searchAction = searchDock->toggleViewAction();
+ searchAction->setShortcut(Qt::Key_F12);
+ searchAction->setIcon(KIcon("system-search"));
+ addActionCloneToCollection(searchAction, "show_search_panel");
+ addDockWidget(Qt::RightDockWidgetArea, searchDock);
connect(this, SIGNAL(urlChanged(KUrl)),
- filterPanel, SLOT(setUrl(KUrl)));
+ searchPanel, SLOT(setUrl(KUrl)));
#endif
const bool firstRun = DolphinSettings::instance().generalSettings()->firstRun();
terminalDock->hide();
#endif
#ifdef HAVE_NEPOMUK
- filterDock->hide();
+ searchDock->hide();
#endif
}
placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
PlacesPanel* placesPanel = new PlacesPanel(placesDock);
+ QAction* separator = new QAction(placesPanel);
+ separator->setSeparator(true);
+ QList<QAction*> placesActions;
+ placesActions.append(separator);
+ placesActions.append(lockLayoutAction);
+ placesPanel->addActions(placesActions);
placesPanel->setModel(DolphinSettings::instance().placesModel());
placesPanel->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- connect(placesPanel, SIGNAL(lockChangeRequested(bool)), this, SLOT(slotPanelLockChangeRequested(bool)));
placesDock->setWidget(placesPanel);
QAction* placesAction = placesDock->toggleViewAction();
panelsMenu->addAction(terminalAction);
#endif
#ifdef HAVE_NEPOMUK
- panelsMenu->addAction(filterAction);
+ panelsMenu->addAction(searchAction);
#endif
panelsMenu->addSeparator();
panelsMenu->addAction(lockLayoutAction);
ClosedTab closedTab;
closedTab.primaryUrl = m_viewTab[index].primaryView->url();
- if (m_viewTab[index].secondaryView != 0) {
+ if (m_viewTab[index].secondaryView) {
closedTab.secondaryUrl = m_viewTab[index].secondaryView->url();
closedTab.isSplit = true;
} else {
void DolphinMainWindow::updateSplitAction()
{
QAction* splitAction = actionCollection()->action("split_view");
- if (m_viewTab[m_tabIndex].secondaryView != 0) {
+ if (m_viewTab[m_tabIndex].secondaryView) {
if (m_activeViewContainer == m_viewTab[m_tabIndex].secondaryView) {
splitAction->setText(i18nc("@action:intoolbar Close right view", "Close"));
splitAction->setToolTip(i18nc("@info", "Close right view"));
splitter->addWidget(m_viewTab[tabIndex].secondaryView);
splitter->setSizes(QList<int>() << newWidth << newWidth);
connectViewSignals(m_viewTab[tabIndex].secondaryView);
- m_viewTab[tabIndex].secondaryView->view()->reload();
m_viewTab[tabIndex].secondaryView->setActive(false);
m_viewTab[tabIndex].secondaryView->show();
}
projects / dolphin.git / blobdiff