#include "dolphinmainwindow.h"
#include "dolphinviewactionhandler.h"
+#include "dolphinremoteencoding.h"
#include <config-nepomuk.h>
#include "dolphinapplication.h"
-#include "dolphinfileplacesview.h"
#include "dolphinnewmenu.h"
-#include "dolphinsettings.h"
-#include "dolphinsettingsdialog.h"
-#include "dolphinstatusbar.h"
+#include "settings/dolphinsettings.h"
+#include "settings/dolphinsettingsdialog.h"
+#include "dolphinsearchbox.h"
#include "dolphinviewcontainer.h"
-#include "infosidebarpage.h"
-#include "metadatawidget.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 "treeviewsidebarpage.h"
+#include "statusbar/dolphinstatusbar.h"
#include "viewproperties.h"
#ifndef Q_OS_WIN
-#include "terminalsidebarpage.h"
+#include "panels/terminal/terminalpanel.h"
#endif
#include "dolphin_generalsettings.h"
#include <kfiledialog.h>
#include <kfileplacesmodel.h>
#include <kglobal.h>
+#include <klineedit.h>
+#include <ktoolbar.h>
#include <kicon.h>
#include <kiconloader.h>
#include <kio/netaccess.h>
#include <kmenu.h>
#include <kmenubar.h>
#include <kmessagebox.h>
-#include <konq_fileitemcapabilities.h>
+#include <kfileitemlistproperties.h>
#include <konqmimedata.h>
#include <kprotocolinfo.h>
#include <krun.h>
#include <kurlnavigator.h>
#include <kurl.h>
#include <kurlcombobox.h>
+#include <ktoolinvocation.h>
#include <QDBusMessage>
#include <QKeyEvent>
#include <QClipboard>
-#include <QLineEdit>
#include <QSplitter>
#include <QDockWidget>
+#include <kacceleratormanager.h>
+
+/*
+ * Remembers the tab configuration if a tab has been closed.
+ * Each closed tab can be restored by the menu
+ * "Go -> Recently Closed Tabs".
+ */
+struct ClosedTab
+{
+ KUrl primaryUrl;
+ KUrl secondaryUrl;
+ bool isSplit;
+};
+Q_DECLARE_METATYPE(ClosedTab)
DolphinMainWindow::DolphinMainWindow(int id) :
KXmlGuiWindow(0),
m_tabBar(0),
m_activeViewContainer(0),
m_centralWidgetLayout(0),
+ m_searchBox(0),
m_id(id),
m_tabIndex(0),
m_viewTab(),
- m_actionHandler(0)
+ m_actionHandler(0),
+ m_remoteEncoding(0),
+ m_settingsDialog(0)
{
setObjectName("Dolphin#");
updateEditActions();
updateViewActions();
updateGoActions();
- setCaption(url.fileName());
+ 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));
emit urlChanged(url);
}
}
compareFilesAction->setEnabled(false);
}
-#if defined(QUICK_VIEW)
- const bool activeViewHasSelection = (activeViewContainer()->view()->selectedItemsCount() > 0);
- actionCollection()->action("quick_view")->setEnabled(activeViewHasSelection);
-#endif
-
- m_activeViewContainer->updateStatusBar();
-
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 KUrl& url)
{
+ const KIcon icon = KIcon(KMimeType::iconNameForUrl(m_activeViewContainer->url()));
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(KIcon("folder"), tabName(m_activeViewContainer->url()));
+ m_tabBar->addTab(icon, squeezedText(tabName(m_activeViewContainer->url())));
m_tabBar->blockSignals(false);
}
- m_tabBar->addTab(KIcon("folder"), tabName(url));
+ m_tabBar->addTab(icon, squeezedText(tabName(url)));
ViewTab viewTab;
viewTab.splitter = new QSplitter(this);
+ viewTab.splitter->setChildrenCollapsible(false);
viewTab.primaryView = new DolphinViewContainer(this, viewTab.splitter, url);
viewTab.primaryView->setActive(false);
connectViewSignals(viewTab.primaryView);
void DolphinMainWindow::activateNextTab()
{
- if (m_viewTab.count() == 1 || m_tabBar->count() < 2) {
+ if ((m_viewTab.count() == 1) || (m_tabBar->count() < 2)) {
return;
}
void DolphinMainWindow::activatePrevTab()
{
- if (m_viewTab.count() == 1 || m_tabBar->count() < 2) {
+ if ((m_viewTab.count() == 1) || (m_tabBar->count() < 2)) {
return;
}
{
DolphinSettings& settings = DolphinSettings::instance();
GeneralSettings* generalSettings = settings.generalSettings();
+
+ if ((m_viewTab.count() > 1) && generalSettings->confirmClosingMultipleTabs()) {
+ // Ask the user if he really wants to quit and close all tabs.
+ // Open a confirmation dialog with 3 buttons:
+ // KDialog::Yes -> Quit
+ // KDialog::No -> Close only the current tab
+ // KDialog::Cancel -> do nothing
+ KDialog *dialog = new KDialog(this, Qt::Dialog);
+ 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());
+ dialog->setDefaultButton(KDialog::Yes);
+
+ bool doNotAskAgainCheckboxResult = false;
+
+ const int result = KMessageBox::createKMessageBox(dialog,
+ QMessageBox::Warning,
+ i18n("You have multiple tabs open in this window, are you sure you want to quit?"),
+ QStringList(),
+ i18n("Do not ask again"),
+ &doNotAskAgainCheckboxResult,
+ KMessageBox::Notify);
+
+ if (doNotAskAgainCheckboxResult) {
+ generalSettings->setConfirmClosingMultipleTabs(false);
+ }
+
+ switch (result) {
+ case KDialog::Yes:
+ // Quit
+ break;
+ case KDialog::No:
+ // Close only the current tab
+ closeTab();
+ default:
+ event->ignore();
+ return;
+ }
+ }
+
generalSettings->setFirstRun(false);
settings.save();
void DolphinMainWindow::saveProperties(KConfigGroup& group)
{
- // TODO: remember tabs
- DolphinViewContainer* cont = m_viewTab[m_tabIndex].primaryView;
- group.writeEntry("Primary Url", cont->url().url());
- group.writeEntry("Primary Editable Url", cont->isUrlEditable());
+ const int tabCount = m_viewTab.count();
+ group.writeEntry("Tab Count", tabCount);
+ group.writeEntry("Active Tab Index", m_tabBar->currentIndex());
- cont = m_viewTab[m_tabIndex].secondaryView;
- if (cont != 0) {
- group.writeEntry("Secondary Url", cont->url().url());
- group.writeEntry("Secondary Editable Url", cont->isUrlEditable());
+ for (int i = 0; i < tabCount; ++i) {
+ const DolphinViewContainer* cont = m_viewTab[i].primaryView;
+ group.writeEntry(tabProperty("Primary URL", i), cont->url().url());
+ group.writeEntry(tabProperty("Primary Editable", i), cont->isUrlEditable());
+
+ cont = m_viewTab[i].secondaryView;
+ if (cont != 0) {
+ group.writeEntry(tabProperty("Secondary URL", i), cont->url().url());
+ group.writeEntry(tabProperty("Secondary Editable", i), cont->isUrlEditable());
+ }
}
}
void DolphinMainWindow::readProperties(const KConfigGroup& group)
{
- // TODO: read tabs
- DolphinViewContainer* cont = m_viewTab[m_tabIndex].primaryView;
+ const int tabCount = group.readEntry("Tab Count", 1);
+ for (int i = 0; i < tabCount; ++i) {
+ DolphinViewContainer* cont = m_viewTab[i].primaryView;
- cont->setUrl(group.readEntry("Primary Url"));
- bool editable = group.readEntry("Primary Editable Url", false);
- cont->urlNavigator()->setUrlEditable(editable);
+ cont->setUrl(group.readEntry(tabProperty("Primary URL", i)));
+ const bool editable = group.readEntry(tabProperty("Primary Editable", i), false);
+ cont->urlNavigator()->setUrlEditable(editable);
- cont = m_viewTab[m_tabIndex].secondaryView;
- const QString secondaryUrl = group.readEntry("Secondary Url");
- if (!secondaryUrl.isEmpty()) {
- if (cont == 0) {
- // a secondary view should be shown, but no one is available
- // currently -> create a new view
+ cont = m_viewTab[i].secondaryView;
+ const QString secondaryUrl = group.readEntry(tabProperty("Secondary URL", i));
+ if (!secondaryUrl.isEmpty()) {
+ if (cont == 0) {
+ // 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);
+ }
+
+ cont->setUrl(secondaryUrl);
+ const bool editable = group.readEntry(tabProperty("Secondary Editable", i), false);
+ cont->urlNavigator()->setUrlEditable(editable);
+ } else if (cont != 0) {
+ // no secondary view should be shown, but the default setting shows
+ // one already -> close the view
toggleSplitView();
- cont = m_viewTab[m_tabIndex].secondaryView;
- Q_ASSERT(cont != 0);
}
- cont->setUrl(secondaryUrl);
- bool editable = group.readEntry("Secondary Editable Url", false);
- cont->urlNavigator()->setUrlEditable(editable);
- } else if (cont != 0) {
- // no secondary view should be shown, but the default setting shows
- // one already -> close the view
- toggleSplitView();
+ // openNewTab() needs to be called only tabCount - 1 times
+ if (i != tabCount - 1) {
+ openNewTab();
+ }
}
+
+ const int index = group.readEntry("Active Tab Index", 0);
+ m_tabBar->setCurrentIndex(index);
}
void DolphinMainWindow::updateNewMenu()
m_newMenu->setPopupFiles(activeViewContainer()->url());
}
+void DolphinMainWindow::createDirectory()
+{
+ m_newMenu->setPopupFiles(activeViewContainer()->url());
+ m_newMenu->createDirectory();
+}
+
void DolphinMainWindow::quit()
{
close();
}
}
+void DolphinMainWindow::restoreClosedTab(QAction* action)
+{
+ if (action->data().toBool()) {
+ // clear all actions except the "Empty Recently Closed Tabs"
+ // action and the separator
+ QList<QAction*> actions = m_recentTabsMenu->menu()->actions();
+ const int count = actions.size();
+ for (int i = 2; i < count; ++i) {
+ m_recentTabsMenu->menu()->removeAction(actions.at(i));
+ }
+ } else {
+ const ClosedTab closedTab = action->data().value<ClosedTab>();
+ openNewTab(closedTab.primaryUrl);
+ m_tabBar->setCurrentIndex(m_viewTab.count() - 1);
+
+ if (closedTab.isSplit) {
+ // create secondary view
+ toggleSplitView();
+ m_viewTab[m_tabIndex].secondaryView->setUrl(closedTab.secondaryUrl);
+ }
+
+ m_recentTabsMenu->removeAction(action);
+ }
+
+ if (m_recentTabsMenu->menu()->actions().count() == 2) {
+ m_recentTabsMenu->setEnabled(false);
+ }
+}
+
void DolphinMainWindow::slotUndoTextChanged(const QString& text)
{
QAction* undoAction = actionCollection()->action(KStandardAction::name(KStandardAction::Undo));
// 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());
}
KRun::runCommand(command, "Kompare", "kompare", this);
}
-void DolphinMainWindow::quickView()
-{
- const KUrl::List urls = activeViewContainer()->view()->selectedUrls();
- Q_ASSERT(urls.count() > 0);
-
- QDBusMessage msg = QDBusMessage::createMethodCall("org.kde.plasma", "/Previewer", "", "openFile");
- foreach (const KUrl& url, urls) {
- msg.setArguments(QList<QVariant>() << url.prettyUrl());
- QDBusConnection::sessionBus().send(msg);
- }
-}
-
void DolphinMainWindow::toggleShowMenuBar()
{
const bool visible = menuBar()->isVisible();
menuBar()->setVisible(!visible);
}
+void DolphinMainWindow::openTerminal()
+{
+ QString dir(QDir::homePath());
+
+ // If the given directory is not local, it can still be the URL of an
+ // ioslave using UDS_LOCAL_PATH which to be converted first.
+ KUrl url = KIO::NetAccess::mostLocalUrl(m_activeViewContainer->url(), this);
+
+ //If the URL is local after the above conversion, set the directory.
+ if (url.isLocalFile()) {
+ dir = url.toLocalFile();
+ }
+
+ KToolInvocation::invokeTerminal(QString(), dir);
+}
+
void DolphinMainWindow::editSettings()
{
- DolphinSettingsDialog* dialog = new DolphinSettingsDialog(this);
- dialog->setAttribute(Qt::WA_DeleteOnClose);
- dialog->show();
+ if (m_settingsDialog == 0) {
+ const KUrl& url = activeViewContainer()->url();
+ m_settingsDialog = new DolphinSettingsDialog(url, this);
+ m_settingsDialog->setAttribute(Qt::WA_DeleteOnClose);
+ m_settingsDialog->show();
+ } else {
+ m_settingsDialog->raise();
+ }
}
void DolphinMainWindow::setActiveTab(int index)
Q_ASSERT(index >= 0);
Q_ASSERT(index < m_viewTab.count());
if (m_viewTab.count() == 1) {
- // the last tab may never get closed
+ // the last tab may never get closed
return;
}
// previous tab before closing the tab.
m_tabBar->setCurrentIndex((index > 0) ? index - 1 : 1);
}
+ rememberClosedTab(index);
// delete tab
m_viewTab[index].primaryView->deleteLater();
QAction* closeTabAction = menu.addAction(KIcon("tab-close"), i18nc("@action:inmenu", "Close Tab"));
closeTabAction->setShortcut(actionCollection()->action("close_tab")->shortcut());
-
QAction* selectedAction = menu.exec(pos);
if (selectedAction == newTabAction) {
const ViewTab& tab = m_viewTab[index];
canDecode = KUrl::List::canDecode(event->mimeData());
}
+void DolphinMainWindow::searchItems(const KUrl& url)
+{
+ m_activeViewContainer->setUrl(url);
+}
+
+void DolphinMainWindow::slotTabMoved(int from, int to)
+{
+ m_viewTab.move(from, to);
+ m_tabIndex = m_tabBar->currentIndex();
+}
+
void DolphinMainWindow::init()
{
DolphinSettings& settings = DolphinSettings::instance();
setAcceptDrops(true);
m_viewTab[m_tabIndex].splitter = new QSplitter(this);
+ m_viewTab[m_tabIndex].splitter->setChildrenCollapsible(false);
setupActions();
const KUrl& homeUrl = generalSettings->homeUrl();
- setCaption(homeUrl.fileName());
+ setUrlAsCaption(homeUrl);
m_actionHandler = new DolphinViewActionHandler(actionCollection(), this);
connect(m_actionHandler, SIGNAL(actionBeingHandled()), SLOT(clearStatusBar()));
+ connect(m_actionHandler, SIGNAL(createDirectory()), SLOT(createDirectory()));
ViewProperties props(homeUrl);
m_viewTab[m_tabIndex].primaryView = new DolphinViewContainer(this,
m_viewTab[m_tabIndex].splitter,
m_activeViewContainer->show();
m_actionHandler->setCurrentView(view);
+ m_remoteEncoding = new DolphinRemoteEncoding(this, m_actionHandler);
+ connect(this, SIGNAL(urlChanged(const KUrl&)),
+ m_remoteEncoding, SLOT(slotAboutToOpenUrl()));
+
m_tabBar = new KTabBar(this);
- m_tabBar->setCloseButtonEnabled(true);
+ m_tabBar->setMovable(true);
+ m_tabBar->setTabsClosable(true);
connect(m_tabBar, SIGNAL(currentChanged(int)),
this, SLOT(setActiveTab(int)));
- connect(m_tabBar, SIGNAL(closeRequest(int)),
+ connect(m_tabBar, SIGNAL(tabCloseRequested(int)),
this, SLOT(closeTab(int)));
connect(m_tabBar, SIGNAL(contextMenu(int, const QPoint&)),
this, SLOT(openTabContextMenu(int, const QPoint&)));
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)));
+
m_tabBar->blockSignals(true); // signals get unblocked after at least 2 tabs are open
QWidget* centralWidget = new QWidget(this);
setupGUI(Keys | Save | Create | ToolBar);
+ m_searchBox->setParent(toolBar("searchToolBar"));
+ m_searchBox->show();
+
stateChanged("new_file");
QClipboard* clipboard = QApplication::clipboard();
updateGoActions();
const KUrl& url = m_activeViewContainer->url();
- setCaption(url.fileName());
- if (m_viewTab.count() > 1) {
+ setUrlAsCaption(url);
+ if (m_viewTab.count() > 1 && m_viewTab[m_tabIndex].secondaryView != 0) {
m_tabBar->setTabText(m_tabIndex, tabName(url));
+ m_tabBar->setTabIcon(m_tabIndex, KIcon(KMimeType::iconNameForUrl(url)));
}
emit urlChanged(url);
KAction* newTab = actionCollection()->addAction("new_tab");
newTab->setIcon(KIcon("tab-new"));
newTab->setText(i18nc("@action:inmenu File", "New Tab"));
- newTab->setShortcut(KShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_N, Qt::CTRL | Qt::Key_T));
+ newTab->setShortcut(KShortcut(Qt::CTRL | Qt::Key_T, Qt::CTRL | Qt::SHIFT | Qt::Key_N));
connect(newTab, SIGNAL(triggered()), this, SLOT(openNewTab()));
- QAction* closeTab = actionCollection()->addAction("close_tab");
+ KAction* closeTab = actionCollection()->addAction("close_tab");
closeTab->setIcon(KIcon("tab-close"));
closeTab->setText(i18nc("@action:inmenu File", "Close Tab"));
closeTab->setShortcut(Qt::CTRL | Qt::Key_W);
backShortcut.setAlternate(Qt::Key_Backspace);
backAction->setShortcut(backShortcut);
+ m_recentTabsMenu = new KActionMenu(i18n("Recently Closed Tabs"), this);
+ m_recentTabsMenu->setIcon(KIcon("edit-undo"));
+ actionCollection()->addAction("closed_tabs", m_recentTabsMenu);
+ connect(m_recentTabsMenu->menu(), SIGNAL(triggered(QAction *)),
+ this, SLOT(restoreClosedTab(QAction *)));
+
+ QAction* action = new QAction("Empty Recently Closed Tabs", m_recentTabsMenu);
+ action->setIcon(KIcon("edit-clear-list"));
+ action->setData(QVariant::fromValue(true));
+ m_recentTabsMenu->addAction(action);
+ m_recentTabsMenu->addSeparator();
+ m_recentTabsMenu->setEnabled(false);
+
KStandardAction::forward(this, SLOT(goForward()), actionCollection());
KStandardAction::up(this, SLOT(goUp()), actionCollection());
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");
showFilterBar->setText(i18nc("@action:inmenu Tools", "Show Filter Bar"));
showFilterBar->setShortcut(Qt::CTRL | Qt::Key_I);
compareFiles->setEnabled(false);
connect(compareFiles, SIGNAL(triggered()), this, SLOT(compareFiles()));
- // disabled Quick View
-#if defined(QUICK_VIEW)
- KAction* quickView = actionCollection()->addAction("quick_view");
- quickView->setText(i18nc("@action:inmenu Tools", "Quick View"));
- quickView->setIcon(KIcon("view-preview"));
- quickView->setShortcut(Qt::CTRL + Qt::Key_Return);
- quickView->setEnabled(false);
- connect(quickView, SIGNAL(triggered()), this, SLOT(quickView()));
-#endif
+ KAction* openTerminal = actionCollection()->addAction("open_terminal");
+ openTerminal->setText(i18nc("@action:inmenu Tools", "Open Terminal"));
+ openTerminal->setIcon(KIcon("utilities-terminal"));
+ openTerminal->setShortcut(Qt::SHIFT | Qt::Key_F4);
+ connect(openTerminal, SIGNAL(triggered()), this, SLOT(openTerminal()));
// setup 'Settings' menu
m_showMenuBar = KStandardAction::showMenubar(this, SLOT(toggleShowMenuBar()), actionCollection());
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(KUrl)), this, SLOT(searchItems(KUrl)));
+
+ 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()
QDockWidget* infoDock = new QDockWidget(i18nc("@title:window", "Information"));
infoDock->setObjectName("infoDock");
infoDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
- SidebarPage* infoWidget = new InfoSidebarPage(infoDock);
- infoDock->setWidget(infoWidget);
+ Panel* infoPanel = new InformationPanel(infoDock);
+ infoDock->setWidget(infoPanel);
- infoDock->toggleViewAction()->setText(i18nc("@title:window", "Information"));
- infoDock->toggleViewAction()->setShortcut(Qt::Key_F11);
+ QAction* infoAction = infoDock->toggleViewAction();
+ infoAction->setText(i18nc("@title:window", "Information"));
+ infoAction->setShortcut(Qt::Key_F11);
+ infoAction->setIcon(KIcon("dialog-information"));
actionCollection()->addAction("show_info_panel", infoDock->toggleViewAction());
addDockWidget(Qt::RightDockWidgetArea, infoDock);
connect(this, SIGNAL(urlChanged(KUrl)),
- infoWidget, SLOT(setUrl(KUrl)));
+ infoPanel, SLOT(setUrl(KUrl)));
connect(this, SIGNAL(selectionChanged(KFileItemList)),
- infoWidget, SLOT(setSelection(KFileItemList)));
+ infoPanel, SLOT(setSelection(KFileItemList)));
connect(this, SIGNAL(requestItemInfo(KFileItem)),
- infoWidget, SLOT(requestDelayedItemInfo(KFileItem)));
-
- // setup "Tree View"
- QDockWidget* treeViewDock = new QDockWidget(i18nc("@title:window", "Folders"));
- treeViewDock->setObjectName("treeViewDock");
- treeViewDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
- TreeViewSidebarPage* treeWidget = new TreeViewSidebarPage(treeViewDock);
- treeViewDock->setWidget(treeWidget);
-
- treeViewDock->toggleViewAction()->setText(i18nc("@title:window", "Folders"));
- treeViewDock->toggleViewAction()->setShortcut(Qt::Key_F7);
- actionCollection()->addAction("show_folders_panel", treeViewDock->toggleViewAction());
-
- addDockWidget(Qt::LeftDockWidgetArea, treeViewDock);
+ infoPanel, SLOT(requestDelayedItemInfo(KFileItem)));
+
+ // setup "Folders"
+ QDockWidget* foldersDock = new QDockWidget(i18nc("@title:window", "Folders"));
+ foldersDock->setObjectName("foldersDock");
+ foldersDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
+ FoldersPanel* foldersPanel = new FoldersPanel(foldersDock);
+ foldersDock->setWidget(foldersPanel);
+
+ QAction* foldersAction = foldersDock->toggleViewAction();
+ foldersAction->setText(i18nc("@title:window", "Folders"));
+ foldersAction->setShortcut(Qt::Key_F7);
+ foldersAction->setIcon(KIcon("folder"));
+ actionCollection()->addAction("show_folders_panel", foldersDock->toggleViewAction());
+
+ addDockWidget(Qt::LeftDockWidgetArea, foldersDock);
connect(this, SIGNAL(urlChanged(KUrl)),
- treeWidget, SLOT(setUrl(KUrl)));
- connect(treeWidget, SIGNAL(changeUrl(KUrl, Qt::MouseButtons)),
+ foldersPanel, SLOT(setUrl(KUrl)));
+ connect(foldersPanel, SIGNAL(changeUrl(KUrl, Qt::MouseButtons)),
this, SLOT(handlePlacesClick(KUrl, Qt::MouseButtons)));
- connect(treeWidget, SIGNAL(changeSelection(KFileItemList)),
+ connect(foldersPanel, SIGNAL(changeSelection(KFileItemList)),
this, SLOT(changeSelection(KFileItemList)));
// setup "Terminal"
QDockWidget* terminalDock = new QDockWidget(i18nc("@title:window Shell terminal", "Terminal"));
terminalDock->setObjectName("terminalDock");
terminalDock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea);
- SidebarPage* terminalWidget = new TerminalSidebarPage(terminalDock);
- terminalDock->setWidget(terminalWidget);
+ Panel* terminalPanel = new TerminalPanel(terminalDock);
+ terminalDock->setWidget(terminalPanel);
- connect(terminalWidget, SIGNAL(hideTerminalSidebarPage()), terminalDock, SLOT(hide()));
+ connect(terminalPanel, SIGNAL(hideTerminalPanel()), terminalDock, SLOT(hide()));
- terminalDock->toggleViewAction()->setText(i18nc("@title:window Shell terminal", "Terminal"));
- terminalDock->toggleViewAction()->setShortcut(Qt::Key_F4);
+ QAction* terminalAction = terminalDock->toggleViewAction();
+ terminalAction->setText(i18nc("@title:window Shell terminal", "Terminal"));
+ terminalAction->setShortcut(Qt::Key_F4);
+ terminalAction->setIcon(KIcon("utilities-terminal"));
actionCollection()->addAction("show_terminal_panel", terminalDock->toggleViewAction());
addDockWidget(Qt::BottomDockWidgetArea, terminalDock);
connect(this, SIGNAL(urlChanged(KUrl)),
- terminalWidget, SLOT(setUrl(KUrl)));
+ terminalPanel, SLOT(setUrl(KUrl)));
#endif
const bool firstRun = DolphinSettings::instance().generalSettings()->firstRun();
if (firstRun) {
- treeViewDock->hide();
+ foldersDock->hide();
#ifndef Q_OS_WIN
terminalDock->hide();
#endif
placesDock->setObjectName("placesDock");
placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
- DolphinFilePlacesView* placesView = new DolphinFilePlacesView(placesDock);
- placesDock->setWidget(placesView);
- placesView->setModel(DolphinSettings::instance().placesModel());
- placesView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ PlacesPanel* placesPanel = new PlacesPanel(placesDock);
+ placesDock->setWidget(placesPanel);
+ placesPanel->setModel(DolphinSettings::instance().placesModel());
+ placesPanel->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- placesDock->toggleViewAction()->setText(i18nc("@title:window", "Places"));
- placesDock->toggleViewAction()->setShortcut(Qt::Key_F9);
+ QAction* placesAction = placesDock->toggleViewAction();
+ placesAction->setText(i18nc("@title:window", "Places"));
+ placesAction->setShortcut(Qt::Key_F9);
+ placesAction->setIcon(KIcon("bookmarks"));
actionCollection()->addAction("show_places_panel", placesDock->toggleViewAction());
addDockWidget(Qt::LeftDockWidgetArea, placesDock);
- connect(placesView, SIGNAL(urlChanged(KUrl, Qt::MouseButtons)),
+ connect(placesPanel, SIGNAL(urlChanged(KUrl, Qt::MouseButtons)),
this, SLOT(handlePlacesClick(KUrl, Qt::MouseButtons)));
connect(this, SIGNAL(urlChanged(KUrl)),
- placesView, SLOT(setUrl(KUrl)));
+ placesPanel, SLOT(setUrl(KUrl)));
}
void DolphinMainWindow::updateEditActions()
QAction* cutAction = col->action(KStandardAction::name(KStandardAction::Cut));
QAction* deleteWithTrashShortcut = col->action("delete_shortcut"); // see DolphinViewActionHandler
- KonqFileItemCapabilities capabilities(list);
+ KFileItemListProperties capabilities(list);
const bool enableMoveToTrash = capabilities.isLocal() && capabilities.supportsMoving();
renameAction->setEnabled(capabilities.supportsMoving());
goUpAction->setEnabled(currentUrl.upUrl() != currentUrl);
}
+void DolphinMainWindow::rememberClosedTab(int index)
+{
+ KMenu* tabsMenu = m_recentTabsMenu->menu();
+
+ const QString primaryPath = m_viewTab[index].primaryView->url().path();
+ const QString iconName = KMimeType::iconNameForUrl(primaryPath);
+
+ QAction* action = new QAction(squeezedText(primaryPath), tabsMenu);
+
+ ClosedTab closedTab;
+ closedTab.primaryUrl = m_viewTab[index].primaryView->url();
+
+ if (m_viewTab[index].secondaryView != 0) {
+ closedTab.secondaryUrl = m_viewTab[index].secondaryView->url();
+ closedTab.isSplit = true;
+ } else {
+ closedTab.isSplit = false;
+ }
+
+ action->setData(QVariant::fromValue(closedTab));
+ action->setIcon(KIcon(iconName));
+
+ // add the closed tab menu entry after the separator and
+ // "Empty Recently Closed Tabs" entry
+ if (tabsMenu->actions().size() == 2) {
+ tabsMenu->addAction(action);
+ } else {
+ tabsMenu->insertAction(tabsMenu->actions().at(2), action);
+ }
+
+ // assure that only up to 8 closed tabs are shown in the menu
+ if (tabsMenu->actions().size() > 8) {
+ tabsMenu->removeAction(tabsMenu->actions().last());
+ }
+ actionCollection()->action("closed_tabs")->setEnabled(true);
+ KAcceleratorManager::manage(tabsMenu);
+}
+
void DolphinMainWindow::clearStatusBar()
{
m_activeViewContainer->statusBar()->clear();
{
QString name;
if (url.equals(KUrl("file:///"))) {
- name = "/";
+ name = '/';
} else {
name = url.fileName();
if (name.isEmpty()) {
name = url.protocol();
+ } else {
+ // Make sure that a '&' inside the directory name is displayed correctly
+ // and not misinterpreted as a keyboard shortcut in QTabBar::setTabText()
+ name.replace('&', "&&");
}
}
return name;
m_viewTab[tabIndex].secondaryView->show();
}
+QString DolphinMainWindow::tabProperty(const QString& property, int tabIndex) const
+{
+ return "Tab " + QString::number(tabIndex) + ' ' + property;
+}
+
+void DolphinMainWindow::setUrlAsCaption(const KUrl& url)
+{
+ QString caption;
+ if (url.equals(KUrl("file:///"))) {
+ caption = '/';
+ } else {
+ caption = url.fileName();
+ if (caption.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