/***************************************************************************
- * 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 "dolphinmainwindow.h"
-#include "dolphinviewactionhandler.h"
-#include "dolphinremoteencoding.h"
#include <config-nepomuk.h>
-#ifdef HAVE_NEPOMUK
-#include "search/dolphinsearchoptionsconfigurator.h"
-#endif
#include "dolphinapplication.h"
+#include "dolphindockwidget.h"
#include "dolphincontextmenu.h"
-#include "dolphinnewmenu.h"
-#include "search/dolphinsearchbox.h"
-#include "settings/dolphinsettings.h"
-#include "settings/dolphinsettingsdialog.h"
+#include "dolphinnewfilemenu.h"
#include "dolphinviewcontainer.h"
+#include "mainwindowadaptor.h"
+#ifdef HAVE_NEPOMUK
+ #include "panels/filter/filterpanel.h"
+ #include <Nepomuk/ResourceManager>
+#endif
#include "panels/folders/folderspanel.h"
#include "panels/places/placespanel.h"
#include "panels/information/informationpanel.h"
-#include "mainwindowadaptor.h"
+#include "search/dolphinsearchinformation.h"
+#include "settings/dolphinsettings.h"
+#include "settings/dolphinsettingsdialog.h"
#include "statusbar/dolphinstatusbar.h"
-#include "viewproperties.h"
+#include "views/dolphinviewactionhandler.h"
+#include "views/dolphinremoteencoding.h"
+#include "views/draganddrophelper.h"
+#include "views/viewproperties.h"
#ifndef Q_OS_WIN
#include "panels/terminal/terminalpanel.h"
#include "dolphin_generalsettings.h"
#include "dolphin_iconsmodesettings.h"
-#include "draganddrophelper.h"
-#include <kaction.h>
-#include <kactioncollection.h>
-#include <kconfig.h>
-#include <kdesktopfile.h>
+#include <KAction>
+#include <KActionCollection>
+#include <KActionMenu>
+#include <KConfig>
+#include <KDesktopFile>
#include <kdeversion.h>
-#include <kfiledialog.h>
-#include <kfileplacesmodel.h>
-#include <kglobal.h>
-#include <klineedit.h>
+#include <kdualaction.h>
+#include <KFileDialog>
+#include <KFilePlacesModel>
+#include <KGlobal>
+#include <KLineEdit>
#include <ktoolbar.h>
-#include <kicon.h>
-#include <kiconloader.h>
-#include <kio/netaccess.h>
+#include <KIcon>
+#include <KIconLoader>
+#include <KIO/NetAccess>
#include <kinputdialog.h>
-#include <klocale.h>
-#include <kprotocolmanager.h>
-#include <kmenu.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
-#include <kfileitemlistproperties.h>
+#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 <KToggleAction>
+#include <KUrlNavigator>
+#include <KUrl>
+#include <KUrlComboBox>
#include <ktoolinvocation.h>
#include <QDBusMessage>
#include <QKeyEvent>
#include <QClipboard>
#include <QSplitter>
-#include <QDockWidget>
#include <kacceleratormanager.h>
/*
DolphinMainWindow::DolphinMainWindow(int id) :
KXmlGuiWindow(0),
- m_newMenu(0),
+ m_newFileMenu(0),
m_showMenuBar(0),
m_tabBar(0),
m_activeViewContainer(0),
m_centralWidgetLayout(0),
- m_searchBox(0),
-#ifdef HAVE_NEPOMUK
- m_searchOptionsConfigurator(0),
-#endif
m_id(id),
m_tabIndex(0),
m_viewTab(),
m_actionHandler(0),
m_remoteEncoding(0),
m_settingsDialog(0),
- m_captionStatJob(0)
+ m_lastHandleUrlStatJob(0),
+ m_filterDockIsTemporaryVisible(false)
{
+ // Workaround for a X11-issue in combination with KModifierInfo
+ // (see DolphinContextMenu::initializeModifierKeyInfo() for
+ // more information):
+ DolphinContextMenu::initializeModifierKeyInfo();
+
setObjectName("Dolphin#");
m_viewTab.append(ViewTab());
}
}
-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();
}
setActiveViewContainer(activeViewContainer);
+
+ const GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings();
+ if (generalSettings->modifiedStartupSettings()) {
+ // The startup settings have been changed by the user (see bug #254947).
+ // 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));
+ if (toggle) {
+ toggleSplitView();
+ }
+ }
}
void DolphinMainWindow::pasteIntoFolder()
emit selectionChanged(selection);
}
-void DolphinMainWindow::slotWheelMoved(int wheelDelta)
-{
- if (wheelDelta > 0) {
- activatePrevTab();
- } else {
- activateNextTab();
- }
-}
-
void DolphinMainWindow::slotRequestItemInfo(const KFileItem& item)
{
emit requestItemInfo(item);
void DolphinMainWindow::openNewTab()
{
+ const bool isUrlEditable = m_activeViewContainer->urlNavigator()->isUrlEditable();
+
openNewTab(m_activeViewContainer->url());
m_tabBar->setCurrentIndex(m_viewTab.count() - 1);
+ // The URL navigator of the new tab should have the same editable state
+ // as the current tab
KUrlNavigator* navigator = m_activeViewContainer->urlNavigator();
- if (navigator->isUrlEditable()) {
- // if a new tab is opened and the URL is editable, assure that
+ navigator->setUrlEditable(isUrlEditable);
+
+ if (isUrlEditable) {
+ // If a new tab is opened and the URL is editable, assure that
// the user can edit the URL without manually setting the focus
navigator->setFocus();
}
void DolphinMainWindow::openInNewTab()
{
const KFileItemList list = m_activeViewContainer->view()->selectedItems();
- if ((list.count() == 1) && list[0].isDir()) {
- openNewTab(m_activeViewContainer->view()->selectedUrls()[0]);
+ if (list.isEmpty()) {
+ openNewTab(m_activeViewContainer->url());
+ } else if ((list.count() == 1) && list[0].isDir()) {
+ openNewTab(list[0].url());
}
}
void DolphinMainWindow::openInNewWindow()
{
+ KUrl newWindowUrl;
+
const KFileItemList list = m_activeViewContainer->view()->selectedItems();
- if ((list.count() == 1) && list[0].isDir()) {
+ if (list.isEmpty()) {
+ newWindowUrl = m_activeViewContainer->url();
+ } else if ((list.count() == 1) && list[0].isDir()) {
+ newWindowUrl = list[0].url();
+ }
+
+ if (!newWindowUrl.isEmpty()) {
DolphinMainWindow* window = DolphinApplication::app()->createMainWindow();
- window->changeUrl(m_activeViewContainer->view()->selectedUrls()[0]);
+ window->changeUrl(newWindowUrl);
window->show();
}
}
dialog->setCaption(i18nc("@title:window", "Confirmation"));
dialog->setButtons(KDialog::Yes | KDialog::No | KDialog::Cancel);
dialog->setModal(true);
- dialog->showButtonSeparator(true);
dialog->setButtonGuiItem(KDialog::Yes, KStandardGuiItem::quit());
dialog->setButtonGuiItem(KDialog::No, KGuiItem(i18n("C&lose Current Tab"), KIcon("tab-close")));
dialog->setButtonGuiItem(KDialog::Cancel, KStandardGuiItem::cancel());
settings.save();
+ if (m_filterDockIsTemporaryVisible) {
+ QDockWidget* filterDock = findChild<QDockWidget*>("filterDock");
+ if (filterDock != 0) {
+ filterDock->hide();
+ }
+ m_filterDockIsTemporaryVisible = false;
+ }
+
KXmlGuiWindow::closeEvent(event);
}
void DolphinMainWindow::updateNewMenu()
{
- m_newMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->showHiddenFiles());
- m_newMenu->checkUpToDate();
- m_newMenu->setPopupFiles(activeViewContainer()->url());
+ m_newFileMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->showHiddenFiles());
+ m_newFileMenu->checkUpToDate();
+ m_newFileMenu->setPopupFiles(activeViewContainer()->url());
}
void DolphinMainWindow::createDirectory()
{
- m_newMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->showHiddenFiles());
- m_newMenu->setPopupFiles(activeViewContainer()->url());
- m_newMenu->createDirectory();
+ m_newFileMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->showHiddenFiles());
+ m_newFileMenu->setPopupFiles(activeViewContainer()->url());
+ m_newFileMenu->createDirectory();
}
void DolphinMainWindow::quit()
m_activeViewContainer->view()->paste();
}
+void DolphinMainWindow::find()
+{
+ m_activeViewContainer->setSearchModeEnabled(true);
+}
+
void DolphinMainWindow::updatePasteAction()
{
QAction* pasteAction = actionCollection()->action(KStandardAction::name(KStandardAction::Paste));
void DolphinMainWindow::stopLoading()
{
+ m_activeViewContainer->view()->stopLoading();
}
-void DolphinMainWindow::toggleFilterBarVisibility(bool show)
+void DolphinMainWindow::enableStopAction()
{
- m_activeViewContainer->showFilterBar(show);
+ actionCollection()->action("stop")->setEnabled(true);
+}
+
+void DolphinMainWindow::disableStopAction()
+{
+ actionCollection()->action("stop")->setEnabled(false);
+}
+
+void DolphinMainWindow::showFilterBar()
+{
+ m_activeViewContainer->setFilterBarVisible(true);
}
void DolphinMainWindow::toggleEditLocation()
// 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()
+{
+ GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings();
+
+ const bool newLockState = !generalSettings->lockPanels();
+ foreach (QObject* child, children()) {
+ DolphinDockWidget* dock = qobject_cast<DolphinDockWidget*>(child);
+ if (dock != 0) {
+ dock->setLocked(newLockState);
+ }
+ }
+
+ generalSettings->setLockPanels(newLockState);
}
void DolphinMainWindow::goBack()
{
clearStatusBar();
- m_activeViewContainer->urlNavigator()->goBack();
+
+ KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
+ urlNavigator->goBack();
+
+ if (urlNavigator->locationState().isEmpty()) {
+ // An empty location state indicates a redirection URL,
+ // which must be skipped too
+ urlNavigator->goBack();
+ }
}
void DolphinMainWindow::goForward()
KUrl urlA;
KUrl urlB;
- KUrl::List urls = m_viewTab[m_tabIndex].primaryView->view()->selectedUrls();
- switch (urls.count()) {
+ KFileItemList items = m_viewTab[m_tabIndex].primaryView->view()->selectedItems();
+
+ switch (items.count()) {
case 0: {
Q_ASSERT(m_viewTab[m_tabIndex].secondaryView != 0);
- urls = m_viewTab[m_tabIndex].secondaryView->view()->selectedUrls();
- Q_ASSERT(urls.count() == 2);
- urlA = urls[0];
- urlB = urls[1];
+ items = m_viewTab[m_tabIndex].secondaryView->view()->selectedItems();
+ Q_ASSERT(items.count() == 2);
+ urlA = items[0].url();
+ urlB = items[1].url();
break;
}
case 1: {
- urlA = urls[0];
+ urlA = items[0].url();
Q_ASSERT(m_viewTab[m_tabIndex].secondaryView != 0);
- urls = m_viewTab[m_tabIndex].secondaryView->view()->selectedUrls();
- Q_ASSERT(urls.count() == 1);
- urlB = urls[0];
+ items = m_viewTab[m_tabIndex].secondaryView->view()->selectedItems();
+ Q_ASSERT(items.count() == 1);
+ urlB = items[0].url();
break;
}
case 2: {
- urlA = urls[0];
- urlB = urls[1];
+ urlA = items[0].url();
+ urlB = items[1].url();
break;
}
void DolphinMainWindow::editSettings()
{
if (m_settingsDialog == 0) {
- const KUrl& url = activeViewContainer()->url();
+ const KUrl url = activeViewContainer()->url();
m_settingsDialog = new DolphinSettingsDialog(url, this);
m_settingsDialog->setAttribute(Qt::WA_DeleteOnClose);
m_settingsDialog->show();
if (tab.secondaryView != 0) {
const KUrl secondaryUrl = tab.secondaryView->url();
- window->toggleSplitView();
+ if (window->m_viewTab[0].secondaryView == 0) {
+ window->toggleSplitView();
+ }
window->m_viewTab[0].secondaryView->setUrl(secondaryUrl);
if (tab.primaryView->isActive()) {
window->m_viewTab[0].primaryView->setActive(true);
canDecode = KUrl::List::canDecode(event->mimeData());
}
-void DolphinMainWindow::searchItems()
+void DolphinMainWindow::handleUrl(const KUrl& url)
{
-#ifdef HAVE_NEPOMUK
- const KUrl nepomukSearchUrl = m_searchOptionsConfigurator->nepomukSearchUrl();
- m_activeViewContainer->setUrl(nepomukSearchUrl);
-#endif
-}
+ delete m_lastHandleUrlStatJob;
+ m_lastHandleUrlStatJob = 0;
-void DolphinMainWindow::showSearchOptions()
-{
-#ifdef HAVE_NEPOMUK
- m_searchOptionsConfigurator->show();
-#endif
+ if (url.isLocalFile() && QFileInfo(url.toLocalFile()).isDir()) {
+ activeViewContainer()->setUrl(url);
+ } else if (KProtocolManager::supportsListing(url)) {
+ // stat the URL to see if it is a dir or not
+ m_lastHandleUrlStatJob = KIO::stat(url, KIO::HideProgressInfo);
+ connect(m_lastHandleUrlStatJob, SIGNAL(result(KJob*)),
+ this, SLOT(slotHandleUrlStatFinished(KJob*)));
+
+ } else {
+ new KRun(url, this);
+ }
}
-void DolphinMainWindow::handleUrl(const KUrl& url)
+void DolphinMainWindow::slotHandleUrlStatFinished(KJob* job)
{
- if (KProtocolManager::supportsListing(url)) {
+ m_lastHandleUrlStatJob = 0;
+ const KIO::UDSEntry entry = static_cast<KIO::StatJob*>(job)->statResult();
+ const KUrl url = static_cast<KIO::StatJob*>(job)->url();
+ if (entry.isDir()) {
activeViewContainer()->setUrl(url);
} else {
new KRun(url, this);
}
}
-void DolphinMainWindow::slotCaptionStatFinished(KJob* job)
+void DolphinMainWindow::tabDropEvent(int tab, QDropEvent* event)
{
- m_captionStatJob = 0;
- const KIO::UDSEntry entry = static_cast<KIO::StatJob*>(job)->statResult();
- const QString name = entry.stringValue(KIO::UDSEntry::UDS_DISPLAY_NAME);
- setCaption(name);
+ const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
+ if (!urls.isEmpty() && tab != -1) {
+ const ViewTab& viewTab = m_viewTab[tab];
+ const KUrl destPath = viewTab.isPrimaryViewActive ? viewTab.primaryView->url() : viewTab.secondaryView->url();
+ DragAndDropHelper::instance().dropUrls(KFileItem(), destPath, event, m_tabBar);
+ }
}
void DolphinMainWindow::slotWriteStateChanged(bool isFolderWritable)
{
- newMenu()->setEnabled(isFolderWritable);
+ newFileMenu()->setEnabled(isFolderWritable);
+}
+
+void DolphinMainWindow::slotSearchModeChanged(bool enabled)
+{
+#ifdef HAVE_NEPOMUK
+ 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) {
+ return;
+ }
+
+ if (enabled) {
+ if (!filterDock->isVisible()) {
+ m_filterDockIsTemporaryVisible = true;
+ }
+ filterDock->show();
+ } else {
+ if (filterDock->isVisible() && m_filterDockIsTemporaryVisible) {
+ filterDock->hide();
+ }
+ m_filterDockIsTemporaryVisible = false;
+ }
+#else
+ Q_UNUSED(enabled);
+#endif
}
void DolphinMainWindow::openContextMenu(const KFileItem& item,
const KUrl& url,
const QList<QAction*>& customActions)
{
- DolphinContextMenu contextMenu(this, item, url);
- contextMenu.setCustomActions(customActions);
- contextMenu.open();
+ QPointer<DolphinContextMenu> contextMenu = new DolphinContextMenu(this, item, url);
+ contextMenu->setCustomActions(customActions);
+ const DolphinContextMenu::Command command = contextMenu->open();
+
+ switch (command) {
+ case DolphinContextMenu::OpenParentFolderInNewWindow: {
+ DolphinMainWindow* window = DolphinApplication::app()->createMainWindow();
+ window->changeUrl(item.url().upUrl());
+ window->show();
+ break;
+ }
+
+ case DolphinContextMenu::OpenParentFolderInNewTab:
+ openNewTab(item.url().upUrl());
+ break;
+
+ case DolphinContextMenu::None:
+ default:
+ break;
+ }
+
+ delete contextMenu;
}
void DolphinMainWindow::init()
setupActions();
- const KUrl& homeUrl = generalSettings->homeUrl();
+ const KUrl homeUrl(generalSettings->homeUrl());
setUrlAsCaption(homeUrl);
m_actionHandler = new DolphinViewActionHandler(actionCollection(), this);
connect(m_actionHandler, SIGNAL(actionBeingHandled()), SLOT(clearStatusBar()));
connect(this, SIGNAL(urlChanged(const KUrl&)),
m_remoteEncoding, SLOT(slotAboutToOpenUrl()));
-#ifdef HAVE_NEPOMUK
- m_searchOptionsConfigurator = new DolphinSearchOptionsConfigurator(this);
- m_searchOptionsConfigurator->hide();
- connect(m_searchOptionsConfigurator, SIGNAL(searchOptionsChanged()),
- this, SLOT(searchItems()));
- connect(this, SIGNAL(urlChanged(KUrl)), m_searchOptionsConfigurator, SLOT(setDirectory(KUrl)));
-#endif
-
m_tabBar = new KTabBar(this);
m_tabBar->setMovable(true);
m_tabBar->setTabsClosable(true);
this, SLOT(openNewTab()));
connect(m_tabBar, SIGNAL(testCanDecode(const QDragMoveEvent*, bool&)),
this, SLOT(slotTestCanDecode(const QDragMoveEvent*, bool&)));
- connect(m_tabBar, SIGNAL(wheelDelta(int)),
- this, SLOT(slotWheelMoved(int)));
connect(m_tabBar, SIGNAL(mouseMiddleClick(int)),
this, SLOT(closeTab(int)));
connect(m_tabBar, SIGNAL(tabMoved(int, int)),
this, SLOT(slotTabMoved(int, int)));
+ connect(m_tabBar, SIGNAL(receivedDropEvent(int, QDropEvent*)),
+ this, SLOT(tabDropEvent(int, QDropEvent*)));
m_tabBar->blockSignals(true); // signals get unblocked after at least 2 tabs are open
m_centralWidgetLayout = new QVBoxLayout(centralWidget);
m_centralWidgetLayout->setSpacing(0);
m_centralWidgetLayout->setMargin(0);
-#ifdef HAVE_NEPOMUK
- m_centralWidgetLayout->addWidget(m_searchOptionsConfigurator);
-#endif
m_centralWidgetLayout->addWidget(m_tabBar);
m_centralWidgetLayout->addWidget(m_viewTab[m_tabIndex].splitter, 1);
emit urlChanged(homeUrl);
setupGUI(Keys | Save | Create | ToolBar);
-
- m_searchBox->setParent(toolBar("searchToolBar"));
- m_searchBox->show();
- connect(m_searchBox, SIGNAL(requestSearchOptions()),
- this, SLOT(showSearchOptions()));
-#ifdef HAVE_NEPOMUK
- connect(m_searchBox, SIGNAL(searchTextChanged(QString)),
- m_searchOptionsConfigurator, SLOT(setCustomSearchQuery(QString)));
-#endif
-
stateChanged("new_file");
QClipboard* clipboard = QApplication::clipboard();
connect(clipboard, SIGNAL(dataChanged()),
this, SLOT(updatePasteAction()));
- updatePasteAction();
- updateGoActions();
if (generalSettings->splitView()) {
toggleSplitView();
}
+ updateEditActions();
updateViewActions();
+ updateGoActions();
QAction* showFilterBarAction = actionCollection()->action("show_filter_bar");
showFilterBarAction->setChecked(generalSettings->filterBar());
updateViewActions();
updateGoActions();
- const KUrl& url = m_activeViewContainer->url();
+ const KUrl url = m_activeViewContainer->url();
setUrlAsCaption(url);
- if (m_viewTab.count() > 1 && m_viewTab[m_tabIndex].secondaryView != 0) {
+ if (m_viewTab.count() > 1) {
m_tabBar->setTabText(m_tabIndex, tabName(url));
m_tabBar->setTabIcon(m_tabIndex, KIcon(KMimeType::iconNameForUrl(url)));
}
void DolphinMainWindow::setupActions()
{
// setup 'File' menu
- m_newMenu = new DolphinNewMenu(this, this);
- KMenu* menu = m_newMenu->menu();
+ m_newFileMenu = new DolphinNewFileMenu(this, this);
+ KMenu* menu = m_newFileMenu->menu();
menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
menu->setIcon(KIcon("document-new"));
connect(menu, SIGNAL(aboutToShow()),
// due to the long text, the text "Paste" is used:
paste->setIconText(i18nc("@action:inmenu Edit", "Paste"));
+ KStandardAction::find(this, SLOT(find()), actionCollection());
+
KAction* selectAll = actionCollection()->addAction("select_all");
selectAll->setText(i18nc("@action:inmenu Edit", "Select All"));
selectAll->setShortcut(Qt::CTRL + Qt::Key_A);
KStandardAction::home(this, SLOT(goHome()), actionCollection());
// setup 'Tools' menu
- KToggleAction* showSearchBar = actionCollection()->add<KToggleAction>("show_search_bar");
- showSearchBar->setText(i18nc("@action:inmenu Tools", "Show Search Bar"));
- showSearchBar->setShortcut(Qt::CTRL | Qt::Key_S);
- connect(showSearchBar, SIGNAL(triggered(bool)), this, SLOT(toggleFilterBarVisibility(bool)));
-
- KToggleAction* showFilterBar = actionCollection()->add<KToggleAction>("show_filter_bar");
+ KAction* showFilterBar = actionCollection()->addAction("show_filter_bar");
showFilterBar->setText(i18nc("@action:inmenu Tools", "Show Filter Bar"));
showFilterBar->setIcon(KIcon("view-filter"));
showFilterBar->setShortcut(Qt::CTRL | Qt::Key_I);
- connect(showFilterBar, SIGNAL(triggered(bool)), this, SLOT(toggleFilterBarVisibility(bool)));
+ connect(showFilterBar, SIGNAL(triggered()), this, SLOT(showFilterBar()));
KAction* compareFiles = actionCollection()->addAction("compare_files");
compareFiles->setText(i18nc("@action:inmenu Tools", "Compare Files"));
KStandardAction::preferences(this, SLOT(editSettings()), actionCollection());
// not in menu actions
+ QList<QKeySequence> nextTabKeys;
+ nextTabKeys.append(KStandardShortcut::tabNext().primary());
+ 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));
+
KAction* activateNextTab = actionCollection()->addAction("activate_next_tab");
activateNextTab->setText(i18nc("@action:inmenu", "Activate Next Tab"));
connect(activateNextTab, SIGNAL(triggered()), SLOT(activateNextTab()));
- activateNextTab->setShortcuts(QApplication::isRightToLeft() ? KStandardShortcut::tabPrev() :
- KStandardShortcut::tabNext());
+ activateNextTab->setShortcuts(QApplication::isRightToLeft() ? prevTabKeys : nextTabKeys);
KAction* activatePrevTab = actionCollection()->addAction("activate_prev_tab");
activatePrevTab->setText(i18nc("@action:inmenu", "Activate Previous Tab"));
connect(activatePrevTab, SIGNAL(triggered()), SLOT(activatePrevTab()));
- activatePrevTab->setShortcuts(QApplication::isRightToLeft() ? KStandardShortcut::tabNext() :
- KStandardShortcut::tabPrev());
+ activatePrevTab->setShortcuts(QApplication::isRightToLeft() ? nextTabKeys : prevTabKeys);
// for context menu
KAction* openInNewTab = actionCollection()->addAction("open_in_new_tab");
openInNewWindow->setText(i18nc("@action:inmenu", "Open in New Window"));
openInNewWindow->setIcon(KIcon("window-new"));
connect(openInNewWindow, SIGNAL(triggered()), this, SLOT(openInNewWindow()));
-
- // 'Search' toolbar
- m_searchBox = new DolphinSearchBox(this);
- connect(m_searchBox, SIGNAL(search(QString)), this, SLOT(searchItems()));
-
- KAction* search = new KAction(this);
- actionCollection()->addAction("search_bar", search);
- search->setText(i18nc("@action:inmenu", "Search Bar"));
- search->setDefaultWidget(m_searchBox);
- search->setShortcutConfigurable(false);
}
void DolphinMainWindow::setupDockWidgets()
{
- // setup "Information"
- QDockWidget* infoDock = new QDockWidget(i18nc("@title:window", "Information"));
+ const bool lock = DolphinSettings::instance().generalSettings()->lockPanels();
+
+ KDualAction* lockLayoutAction = actionCollection()->add<KDualAction>("lock_panels");
+ lockLayoutAction->setActiveText(i18nc("@action:inmenu Panels", "Unlock Panels"));
+ lockLayoutAction->setActiveIcon(KIcon("object-unlocked"));
+ lockLayoutAction->setInactiveText(i18nc("@action:inmenu Panels", "Lock Panels"));
+ lockLayoutAction->setInactiveIcon(KIcon("object-locked"));
+ lockLayoutAction->setActive(lock);
+ connect(lockLayoutAction, SIGNAL(triggered()), this, SLOT(togglePanelLockState()));
+
+ // Setup "Information"
+ DolphinDockWidget* infoDock = new DolphinDockWidget(i18nc("@title:window", "Information"));
+ infoDock->setLocked(lock);
infoDock->setObjectName("infoDock");
infoDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
Panel* infoPanel = new InformationPanel(infoDock);
+ infoPanel->setCustomContextMenuActions(QList<QAction*>() << lockLayoutAction);
connect(infoPanel, SIGNAL(urlActivated(KUrl)), this, SLOT(handleUrl(KUrl)));
infoDock->setWidget(infoPanel);
- KAction* infoAction = new KAction(this);
- infoAction->setText(i18nc("@title:window", "Information"));
- infoAction->setShortcut(Qt::Key_F11);
+ QAction* infoAction = infoDock->toggleViewAction();
infoAction->setIcon(KIcon("dialog-information"));
- actionCollection()->addAction("show_info_panel", infoAction);
- connect(infoAction, SIGNAL(triggered()), infoDock->toggleViewAction(), SLOT(trigger()));
+ infoAction->setShortcut(Qt::Key_F11);
+ addActionCloneToCollection(infoAction, "show_information_panel");
addDockWidget(Qt::RightDockWidgetArea, infoDock);
connect(this, SIGNAL(urlChanged(KUrl)),
connect(this, SIGNAL(requestItemInfo(KFileItem)),
infoPanel, SLOT(requestDelayedItemInfo(KFileItem)));
- // setup "Folders"
- QDockWidget* foldersDock = new QDockWidget(i18nc("@title:window", "Folders"));
+ // Setup "Folders"
+ DolphinDockWidget* foldersDock = new DolphinDockWidget(i18nc("@title:window", "Folders"));
+ foldersDock->setLocked(lock);
foldersDock->setObjectName("foldersDock");
foldersDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
FoldersPanel* foldersPanel = new FoldersPanel(foldersDock);
+ foldersPanel->setCustomContextMenuActions(QList<QAction*>() << lockLayoutAction);
foldersDock->setWidget(foldersPanel);
- KAction* foldersAction = new KAction(this);
- foldersAction->setText(i18nc("@title:window", "Folders"));
+ QAction* foldersAction = foldersDock->toggleViewAction();
foldersAction->setShortcut(Qt::Key_F7);
foldersAction->setIcon(KIcon("folder"));
- actionCollection()->addAction("show_folders_panel", foldersAction);
- connect(foldersAction, SIGNAL(triggered()), foldersDock->toggleViewAction(), SLOT(trigger()));
+ addActionCloneToCollection(foldersAction, "show_folders_panel");
addDockWidget(Qt::LeftDockWidgetArea, foldersDock);
connect(this, SIGNAL(urlChanged(KUrl)),
connect(foldersPanel, SIGNAL(changeUrl(KUrl, Qt::MouseButtons)),
this, SLOT(handlePlacesClick(KUrl, Qt::MouseButtons)));
- // setup "Terminal"
+ // Setup "Terminal"
#ifndef Q_OS_WIN
- QDockWidget* terminalDock = new QDockWidget(i18nc("@title:window Shell terminal", "Terminal"));
+ DolphinDockWidget* terminalDock = new DolphinDockWidget(i18nc("@title:window Shell terminal", "Terminal"));
+ terminalDock->setLocked(lock);
terminalDock->setObjectName("terminalDock");
terminalDock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea);
Panel* terminalPanel = new TerminalPanel(terminalDock);
+ terminalPanel->setCustomContextMenuActions(QList<QAction*>() << lockLayoutAction);
terminalDock->setWidget(terminalPanel);
connect(terminalPanel, SIGNAL(hideTerminalPanel()), terminalDock, SLOT(hide()));
- KAction* terminalAction = new KAction(this);
- terminalAction->setText(i18nc("@title:window Shell terminal", "Terminal"));
+ QAction* terminalAction = terminalDock->toggleViewAction();
terminalAction->setShortcut(Qt::Key_F4);
terminalAction->setIcon(KIcon("utilities-terminal"));
- actionCollection()->addAction("show_terminal_panel", terminalAction);
- connect(terminalAction, SIGNAL(triggered()), terminalDock->toggleViewAction(), SLOT(trigger()));
+ addActionCloneToCollection(terminalAction, "show_terminal_panel");
addDockWidget(Qt::BottomDockWidgetArea, terminalDock);
connect(this, SIGNAL(urlChanged(KUrl)),
terminalPanel, SLOT(setUrl(KUrl)));
#endif
+ // Setup "Filter"
+#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);
+ connect(this, SIGNAL(urlChanged(KUrl)),
+ filterPanel, SLOT(setUrl(KUrl)));
+#endif
+
const bool firstRun = DolphinSettings::instance().generalSettings()->firstRun();
if (firstRun) {
+ infoDock->hide();
foldersDock->hide();
#ifndef Q_OS_WIN
terminalDock->hide();
+#endif
+#ifdef HAVE_NEPOMUK
+ filterDock->hide();
#endif
}
- // setup "Places"
- QDockWidget* placesDock = new QDockWidget(i18nc("@title:window", "Places"));
+ // Setup "Places"
+ DolphinDockWidget* placesDock = new DolphinDockWidget(i18nc("@title:window", "Places"));
+ placesDock->setLocked(lock);
placesDock->setObjectName("placesDock");
placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
PlacesPanel* placesPanel = new PlacesPanel(placesDock);
- placesDock->setWidget(placesPanel);
+ 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);
+ placesDock->setWidget(placesPanel);
- KAction* placesAction = new KAction(this);
- placesAction->setText(i18nc("@title:window", "Places"));
+ QAction* placesAction = placesDock->toggleViewAction();
placesAction->setShortcut(Qt::Key_F9);
placesAction->setIcon(KIcon("bookmarks"));
- actionCollection()->addAction("show_places_panel", placesAction);
- connect(placesAction, SIGNAL(triggered()), placesDock->toggleViewAction(), SLOT(trigger()));
+ addActionCloneToCollection(placesAction, "show_places_panel");
addDockWidget(Qt::LeftDockWidgetArea, placesDock);
connect(placesPanel, SIGNAL(urlChanged(KUrl, Qt::MouseButtons)),
this, SLOT(handlePlacesClick(KUrl, Qt::MouseButtons)));
connect(this, SIGNAL(urlChanged(KUrl)),
placesPanel, SLOT(setUrl(KUrl)));
+
+ // Add actions into the "Panels" menu
+ KActionMenu* panelsMenu = new KActionMenu(i18nc("@action:inmenu View", "Panels"), this);
+ actionCollection()->addAction("panels", panelsMenu);
+ panelsMenu->setDelayed(false);
+ panelsMenu->addAction(placesAction);
+ panelsMenu->addAction(infoAction);
+ panelsMenu->addAction(foldersAction);
+#ifndef Q_OS_WIN
+ panelsMenu->addAction(terminalAction);
+#endif
+#ifdef HAVE_NEPOMUK
+ panelsMenu->addAction(filterAction);
+#endif
+ panelsMenu->addSeparator();
+ panelsMenu->addAction(lockLayoutAction);
}
void DolphinMainWindow::updateEditActions()
void DolphinMainWindow::updateGoActions()
{
QAction* goUpAction = actionCollection()->action(KStandardAction::name(KStandardAction::Up));
- const KUrl& currentUrl = m_activeViewContainer->url();
+ const KUrl currentUrl = m_activeViewContainer->url();
goUpAction->setEnabled(currentUrl.upUrl() != currentUrl);
}
this, SLOT(updateFilterBarAction(bool)));
connect(container, SIGNAL(writeStateChanged(bool)),
this, SLOT(slotWriteStateChanged(bool)));
+ connect(container, SIGNAL(searchModeChanged(bool)),
+ this, SLOT(slotSearchModeChanged(bool)));
DolphinView* view = container->view();
connect(view, SIGNAL(selectionChanged(KFileItemList)),
this, SLOT(openNewTab(const KUrl&)));
connect(view, SIGNAL(requestContextMenu(KFileItem, const KUrl&, const QList<QAction*>&)),
this, SLOT(openContextMenu(KFileItem, const KUrl&, const QList<QAction*>&)));
+ connect(view, SIGNAL(startedPathLoading(KUrl)),
+ this, SLOT(enableStopAction()));
+ connect(view, SIGNAL(finishedPathLoading(KUrl)),
+ this, SLOT(disableStopAction()));
const KUrlNavigator* navigator = container->urlNavigator();
connect(navigator, SIGNAL(urlChanged(const KUrl&)),
void DolphinMainWindow::setUrlAsCaption(const KUrl& url)
{
- delete m_captionStatJob;
- m_captionStatJob = 0;
-
- if (url.protocol() == QLatin1String("file")) {
- QString caption;
- if (url.equals(KUrl("file:///"))) {
- caption = '/';
- } else {
- caption = url.fileName();
- if (caption.isEmpty()) {
- caption = url.protocol();
- }
+ QString caption;
+ if (!url.isLocalFile()) {
+ caption.append(url.protocol() + " - ");
+ if (url.hasHost()) {
+ caption.append(url.host() + " - ");
}
-
- setCaption(caption);
- } else {
- m_captionStatJob = KIO::stat(url, KIO::HideProgressInfo);
- connect(m_captionStatJob, SIGNAL(result(KJob*)),
- this, SLOT(slotCaptionStatFinished(KJob*)));
}
+
+ const QString fileName = url.fileName().isEmpty() ? "/" : url.fileName();
+ caption.append(fileName);
+
+ setCaption(caption);
}
QString DolphinMainWindow::squeezedText(const QString& text) const
return fm.elidedText(text, Qt::ElideMiddle, fm.maxWidth() * 10);
}
+void DolphinMainWindow::addActionCloneToCollection(QAction* action, const QString& actionName)
+{
+ KAction* actionClone = actionCollection()->addAction(actionName);
+ actionClone->setText(action->text());
+ actionClone->setIcon(action->icon());
+ connect(actionClone, SIGNAL(triggered()), action, SLOT(trigger()));
+}
+
DolphinMainWindow::UndoUiInterface::UndoUiInterface() :
KIO::FileUndoManager::UiInterface()
{
projects / dolphin.git / blobdiff