#include "dolphinremoteencoding.h"
#include <config-nepomuk.h>
+#ifdef HAVE_NEPOMUK
+#include "search/dolphinsearchoptionsconfigurator.h"
+#endif
#include "dolphinapplication.h"
#include "dolphinnewmenu.h"
+#include "search/dolphinsearchbox.h"
+#include "search/dolphinsearchoptionsconfigurator.h"
#include "settings/dolphinsettings.h"
#include "settings/dolphinsettingsdialog.h"
-#include "dolphinsearchbox.h"
-#include "dolphinstatusbar.h"
#include "dolphinviewcontainer.h"
#include "panels/folders/folderspanel.h"
#include "panels/places/placespanel.h"
#include "panels/information/informationpanel.h"
-#include "panels/information/metadatawidget.h"
#include "mainwindowadaptor.h"
+#include "statusbar/dolphinstatusbar.h"
#include "viewproperties.h"
#ifndef Q_OS_WIN
#include <QDBusMessage>
#include <QKeyEvent>
#include <QClipboard>
-#include <QLineEdit>
#include <QSplitter>
#include <QDockWidget>
#include <kacceleratormanager.h>
m_activeViewContainer(0),
m_centralWidgetLayout(0),
m_searchBox(0),
+#ifdef HAVE_NEPOMUK
+ m_searchOptionsConfigurator(0),
+#endif
m_id(id),
m_tabIndex(0),
m_viewTab(),
DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();
switch (command) {
case KIO::FileUndoManager::Copy:
- statusBar->setMessage(i18nc("@info:status", "Copy operation completed."),
+ statusBar->setMessage(i18nc("@info:status", "Successfully copied."),
DolphinStatusBar::OperationCompleted);
break;
case KIO::FileUndoManager::Move:
- statusBar->setMessage(i18nc("@info:status", "Move operation completed."),
+ statusBar->setMessage(i18nc("@info:status", "Successfully moved."),
DolphinStatusBar::OperationCompleted);
break;
case KIO::FileUndoManager::Link:
- statusBar->setMessage(i18nc("@info:status", "Link operation completed."),
+ statusBar->setMessage(i18nc("@info:status", "Successfully linked."),
DolphinStatusBar::OperationCompleted);
break;
case KIO::FileUndoManager::Trash:
- statusBar->setMessage(i18nc("@info:status", "Move to trash operation completed."),
+ statusBar->setMessage(i18nc("@info:status", "Successfully moved to trash."),
DolphinStatusBar::OperationCompleted);
break;
case KIO::FileUndoManager::Rename:
- statusBar->setMessage(i18nc("@info:status", "Renaming operation completed."),
+ statusBar->setMessage(i18nc("@info:status", "Successfully renamed."),
DolphinStatusBar::OperationCompleted);
break;
updateGoActions();
setUrlAsCaption(url);
if (m_viewTab.count() > 1) {
- m_tabBar->setTabText(m_tabIndex, tabName(url));
+ m_tabBar->setTabText(m_tabIndex, squeezedText(tabName(m_activeViewContainer->url())));
}
const QString iconName = KMimeType::iconNameForUrl(url);
m_tabBar->setTabIcon(m_tabIndex, KIcon(iconName));
compareFilesAction->setEnabled(false);
}
- m_activeViewContainer->updateStatusBar();
-
emit selectionChanged(selection);
}
const int index = urlNavigator->historyIndex();
QAction* backAction = actionCollection()->action("go_back");
+ backAction->setToolTip(i18nc("@info", "Go back"));
if (backAction != 0) {
backAction->setEnabled(index < urlNavigator->historySize() - 1);
}
QAction* forwardAction = actionCollection()->action("go_forward");
+ forwardAction->setToolTip(i18nc("@info", "Go forward"));
if (forwardAction != 0) {
forwardAction->setEnabled(index > 0);
}
if (m_viewTab.count() == 1) {
// Only one view is open currently and hence no tab is shown at
// all. Before creating a tab for 'url', provide a tab for the current URL.
- m_tabBar->addTab(icon, tabName(m_activeViewContainer->url()));
+ m_tabBar->addTab(icon, squeezedText(tabName(m_activeViewContainer->url())));
m_tabBar->blockSignals(false);
}
- m_tabBar->addTab(icon, tabName(url));
+ m_tabBar->addTab(icon, squeezedText(tabName(url)));
ViewTab viewTab;
viewTab.splitter = new QSplitter(this);
DolphinSettings& settings = DolphinSettings::instance();
GeneralSettings* generalSettings = settings.generalSettings();
- if ((m_viewTab.count() > 1) && generalSettings->confirmClosingMultipleTabs()) {
+ // Find out if Dolphin is closed directly by the user or
+ // by the session manager because the session is closed
+ bool closedByUser = true;
+ DolphinApplication *application = qobject_cast<DolphinApplication*>(qApp);
+ if (application && application->sessionSaving()) {
+ closedByUser = false;
+ }
+
+ if ((m_viewTab.count() > 1) && generalSettings->confirmClosingMultipleTabs() && closedByUser) {
// Ask the user if he really wants to quit and close all tabs.
// Open a confirmation dialog with 3 buttons:
// KDialog::Yes -> Quit
void DolphinMainWindow::updateNewMenu()
{
+ m_newMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->showHiddenFiles());
m_newMenu->slotCheckUpToDate();
m_newMenu->setPopupFiles(activeViewContainer()->url());
}
void DolphinMainWindow::createDirectory()
{
+ m_newMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->showHiddenFiles());
m_newMenu->setPopupFiles(activeViewContainer()->url());
m_newMenu->createDirectory();
}
// URL instead of all items of the view
KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
- QLineEdit* lineEdit = urlNavigator->editor()->lineEdit();
+ QLineEdit* lineEdit = urlNavigator->editor()->lineEdit(); // krazy:exclude=qclasses
const bool selectUrl = urlNavigator->isUrlEditable() &&
lineEdit->hasFocus();
if (selectUrl) {
navigator->setFocus();
// select the whole text of the combo box editor
- QLineEdit* lineEdit = navigator->editor()->lineEdit();
+ QLineEdit* lineEdit = navigator->editor()->lineEdit(); // krazy:exclude=qclasses
const QString text = lineEdit->text();
lineEdit->setSelection(0, text.length());
}
m_activeViewContainer->urlNavigator()->goUp();
}
+void DolphinMainWindow::goBack(Qt::MouseButtons buttons)
+{
+ // The default case (left button pressed) is handled in goBack().
+ if (buttons == Qt::MidButton) {
+ KUrlNavigator* urlNavigator = activeViewContainer()->urlNavigator();
+ openNewTab(urlNavigator->historyUrl(urlNavigator->historyIndex() + 1));
+ }
+}
+
+void DolphinMainWindow::goForward(Qt::MouseButtons buttons)
+{
+ // The default case (left button pressed) is handled in goForward().
+ if (buttons == Qt::MidButton) {
+ KUrlNavigator* urlNavigator = activeViewContainer()->urlNavigator();
+ openNewTab(urlNavigator->historyUrl(urlNavigator->historyIndex() - 1));
+ }
+}
+
+void DolphinMainWindow::goUp(Qt::MouseButtons buttons)
+{
+ // The default case (left button pressed) is handled in goUp().
+ if (buttons == Qt::MidButton) {
+ openNewTab(activeViewContainer()->url().upUrl());
+ }
+}
+
void DolphinMainWindow::goHome()
{
clearStatusBar();
m_tabIndex = index;
ViewTab& viewTab = m_viewTab[index];
- m_centralWidgetLayout->addWidget(viewTab.splitter);
+ m_centralWidgetLayout->addWidget(viewTab.splitter, 1);
viewTab.primaryView->show();
if (viewTab.secondaryView != 0) {
viewTab.secondaryView->show();
canDecode = KUrl::List::canDecode(event->mimeData());
}
-void DolphinMainWindow::searchItems(const KUrl& url)
+void DolphinMainWindow::searchItems()
{
- m_activeViewContainer->setUrl(url);
+#ifdef HAVE_NEPOMUK
+ const KUrl nepomukUrl = m_searchOptionsConfigurator->nepomukUrl();
+ m_activeViewContainer->setUrl(nepomukUrl);
+#endif
}
void DolphinMainWindow::slotTabMoved(int from, int to)
m_tabIndex = m_tabBar->currentIndex();
}
+void DolphinMainWindow::showSearchOptions()
+{
+#ifdef HAVE_NEPOMUK
+ m_searchOptionsConfigurator->show();
+#endif
+}
+
void DolphinMainWindow::init()
{
DolphinSettings& settings = DolphinSettings::instance();
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()));
+#endif
+
m_tabBar = new KTabBar(this);
m_tabBar->setMovable(true);
m_tabBar->setTabsClosable(true);
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);
+ m_centralWidgetLayout->addWidget(m_viewTab[m_tabIndex].splitter, 1);
setCentralWidget(centralWidget);
setupDockWidgets();
m_searchBox->setParent(toolBar("searchToolBar"));
m_searchBox->show();
+ connect(m_searchBox, SIGNAL(requestSearchOptions()),
+ this, SLOT(showSearchOptions()));
+ connect(m_searchBox, SIGNAL(searchTextChanged(QString)),
+ m_searchOptionsConfigurator, SLOT(setCustomSearchQuery(QString)));
stateChanged("new_file");
cutShortcut.remove(Qt::SHIFT + Qt::Key_Delete, KShortcut::KeepEmpty);
cut->setShortcut(cutShortcut);
KStandardAction::copy(this, SLOT(copy()), actionCollection());
- KStandardAction::paste(this, SLOT(paste()), actionCollection());
+ KAction* paste = KStandardAction::paste(this, SLOT(paste()), actionCollection());
+ // The text of the paste-action is modified dynamically by Dolphin
+ // (e. g. to "Paste One Folder"). To prevent that the size of the toolbar changes
+ // due to the long text, the text "Paste" is used:
+ paste->setIconText(i18nc("@action:inmenu Edit", "Paste"));
KAction* selectAll = actionCollection()->addAction("select_all");
selectAll->setText(i18nc("@action:inmenu Edit", "Select All"));
KAction* stop = actionCollection()->addAction("stop");
stop->setText(i18nc("@action:inmenu View", "Stop"));
+ stop->setToolTip(i18nc("@info", "Stop loading"));
stop->setIcon(KIcon("process-stop"));
connect(stop, SIGNAL(triggered()), this, SLOT(stopLoading()));
// setup 'Go' menu
KAction* backAction = KStandardAction::back(this, SLOT(goBack()), actionCollection());
+ connect(backAction, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), this, SLOT(goBack(Qt::MouseButtons)));
KShortcut backShortcut = backAction->shortcut();
backShortcut.setAlternate(Qt::Key_Backspace);
backAction->setShortcut(backShortcut);
m_recentTabsMenu->addSeparator();
m_recentTabsMenu->setEnabled(false);
- KStandardAction::forward(this, SLOT(goForward()), actionCollection());
- KStandardAction::up(this, SLOT(goUp()), actionCollection());
+ KAction* forwardAction = KStandardAction::forward(this, SLOT(goForward()), actionCollection());
+ connect(forwardAction, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), this, SLOT(goForward(Qt::MouseButtons)));
+
+ KAction* upAction = KStandardAction::up(this, SLOT(goUp()), actionCollection());
+ connect(upAction, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), this, SLOT(goUp(Qt::MouseButtons)));
+
KStandardAction::home(this, SLOT(goHome()), actionCollection());
// setup 'Tools' menu
KToggleAction* showFilterBar = actionCollection()->add<KToggleAction>("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)));
KAction* openTerminal = actionCollection()->addAction("open_terminal");
openTerminal->setText(i18nc("@action:inmenu Tools", "Open Terminal"));
- openTerminal->setIcon(KIcon("terminal"));
+ openTerminal->setIcon(KIcon("utilities-terminal"));
openTerminal->setShortcut(Qt::SHIFT | Qt::Key_F4);
connect(openTerminal, SIGNAL(triggered()), this, SLOT(openTerminal()));
// 'Search' toolbar
m_searchBox = new DolphinSearchBox(this);
- connect(m_searchBox, SIGNAL(search(KUrl)), this, SLOT(searchItems(KUrl)));
+ connect(m_searchBox, SIGNAL(search(QString)), this, SLOT(searchItems()));
KAction* search = new KAction(this);
actionCollection()->addAction("search_bar", search);
infoDock->setObjectName("infoDock");
infoDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
Panel* infoPanel = new InformationPanel(infoDock);
+ connect(infoPanel, SIGNAL(urlActivated(KUrl)), activeViewContainer(), SLOT(setUrl(KUrl)));
infoDock->setWidget(infoPanel);
QAction* infoAction = infoDock->toggleViewAction();
QAction* terminalAction = terminalDock->toggleViewAction();
terminalAction->setText(i18nc("@title:window Shell terminal", "Terminal"));
terminalAction->setShortcut(Qt::Key_F4);
- terminalAction->setIcon(KIcon("terminal"));
+ terminalAction->setIcon(KIcon("utilities-terminal"));
actionCollection()->addAction("show_terminal_panel", terminalDock->toggleViewAction());
addDockWidget(Qt::BottomDockWidgetArea, terminalDock);
const QString primaryPath = m_viewTab[index].primaryView->url().path();
const QString iconName = KMimeType::iconNameForUrl(primaryPath);
- const QFontMetrics fm = fontMetrics();
- const QString actionText = fm.elidedText(primaryPath, Qt::ElideMiddle, fm.maxWidth() * 20);
-
- QAction* action = new QAction(actionText, tabsMenu);
+ QAction* action = new QAction(squeezedText(primaryPath), tabsMenu);
ClosedTab closedTab;
closedTab.primaryUrl = m_viewTab[index].primaryView->url();
if (m_viewTab[m_tabIndex].secondaryView != 0) {
if (m_activeViewContainer == m_viewTab[m_tabIndex].secondaryView) {
splitAction->setText(i18nc("@action:intoolbar Close right view", "Close"));
+ splitAction->setToolTip(i18nc("@info", "Close right view"));
splitAction->setIcon(KIcon("view-right-close"));
} else {
splitAction->setText(i18nc("@action:intoolbar Close left view", "Close"));
+ splitAction->setToolTip(i18nc("@info", "Close left view"));
splitAction->setIcon(KIcon("view-left-close"));
}
} else {
splitAction->setText(i18nc("@action:intoolbar Split view", "Split"));
+ splitAction->setToolTip(i18nc("@info", "Split view"));
splitAction->setIcon(KIcon("view-right-new"));
}
}
{
QString name;
if (url.equals(KUrl("file:///"))) {
- name = "/";
+ name = '/';
} else {
name = url.fileName();
if (name.isEmpty()) {
caption = url.protocol();
}
}
-
+
setCaption(caption);
}
+QString DolphinMainWindow::squeezedText(const QString& text) const
+{
+ const QFontMetrics fm = fontMetrics();
+ return fm.elidedText(text, Qt::ElideMiddle, fm.maxWidth() * 10);
+}
+
DolphinMainWindow::UndoUiInterface::UndoUiInterface() :
KIO::FileUndoManager::UiInterface()
{
projects / dolphin.git / blobdiff