/***************************************************************************
- * 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/search/searchpanel.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 "dolphin_searchsettings.h"
+
+#include <KAcceleratorManager>
+#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 <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 <kdualaction.h>
+#include <KFileDialog>
+#include <KFilePlacesModel>
+#include <KGlobal>
+#include <KLineEdit>
+#include <KToolBar>
+#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 <QDesktopWidget>
#include <QDBusMessage>
#include <QKeyEvent>
#include <QClipboard>
+#include <QToolButton>
#include <QSplitter>
-#include <QDockWidget>
-#include <kacceleratormanager.h>
+
+/*
+ * Menu shown when pressing the configure-button in the toolbar.
+ */
+class ToolBarMenu : public KMenu
+{
+public:
+ ToolBarMenu(QWidget* parent);
+ virtual ~ToolBarMenu();
+protected:
+ virtual void showEvent(QShowEvent* event);
+};
/*
* Remembers the tab configuration if a tab has been closed.
DolphinMainWindow::DolphinMainWindow(int id) :
KXmlGuiWindow(0),
- m_newMenu(0),
- m_showMenuBar(0),
+ m_newFileMenu(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_toolBarSpacer(0),
+ m_openToolBarMenuButton(0),
+ m_updateToolBarTimer(0),
+ m_lastHandleUrlStatJob(0),
+ m_searchDockIsTemporaryVisible(false)
{
+ // Workaround for a X11-issue in combination with KModifierInfo
+ // (see DolphinContextMenu::initializeModifierKeyInfo() for
+ // more information):
+ DolphinContextMenu::initializeModifierKeyInfo();
+
setObjectName("Dolphin#");
m_viewTab.append(ViewTab());
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();
}
}
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)
+ || (!splitView && activeTab.secondaryView);
+ if (toggle) {
+ toggleSplitView();
+ }
+ }
}
void DolphinMainWindow::pasteIntoFolder()
}
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();
}
emit selectionChanged(selection);
}
-void DolphinMainWindow::slotWheelMoved(int wheelDelta)
-{
- if (wheelDelta > 0) {
- activatePrevTab();
- } else {
- activateNextTab();
- }
-}
-
void DolphinMainWindow::slotRequestItemInfo(const KFileItem& item)
{
emit requestItemInfo(item);
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);
}
}
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();
}
ViewTab viewTab;
viewTab.splitter = new QSplitter(this);
viewTab.splitter->setChildrenCollapsible(false);
- viewTab.primaryView = new DolphinViewContainer(url, viewTab.splitter);
+ viewTab.primaryView = createViewContainer(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::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();
}
}
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;
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_searchDockIsTemporaryVisible) {
+ QDockWidget* searchDock = findChild<QDockWidget*>("searchDock");
+ if (searchDock) {
+ searchDock->hide();
+ }
+ 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::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()
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);
}
}
m_activeViewContainer->view()->paste();
}
+void DolphinMainWindow::find()
+{
+ m_activeViewContainer->setSearchModeEnabled(true);
+}
+
void DolphinMainWindow::updatePasteAction()
{
QAction* pasteAction = actionCollection()->action(KStandardAction::name(KStandardAction::Paste));
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) {
void DolphinMainWindow::stopLoading()
{
+ m_activeViewContainer->view()->stopLoading();
+}
+
+void DolphinMainWindow::enableStopAction()
+{
+ actionCollection()->action("stop")->setEnabled(true);
}
-void DolphinMainWindow::toggleFilterBarVisibility(bool show)
+void DolphinMainWindow::disableStopAction()
{
- m_activeViewContainer->showFilterBar(show);
+ 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) {
+ dock->setLocked(newLockState);
+ }
+ }
+
+ generalSettings->setLockPanels(newLockState);
+}
+
+void DolphinMainWindow::slotPlacesPanelVisibilityChanged(bool visible)
+{
+ const int tabCount = m_viewTab.count();
+ for (int i = 0; i < tabCount; ++i) {
+ ViewTab& tab = m_viewTab[i];
+ Q_ASSERT(tab.primaryView);
+ tab.primaryView->urlNavigator()->setPlacesSelectorVisible(!visible);
+ if (tab.secondaryView) {
+ tab.secondaryView->urlNavigator()->setPlacesSelectorVisible(!visible);
+ }
+ }
}
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()
{
- clearStatusBar();
m_activeViewContainer->urlNavigator()->goForward();
}
void DolphinMainWindow::goUp()
{
- clearStatusBar();
m_activeViewContainer->urlNavigator()->goUp();
}
+void DolphinMainWindow::goHome()
+{
+ m_activeViewContainer->urlNavigator()->goHome();
+}
+
void DolphinMainWindow::goBack(Qt::MouseButtons buttons)
{
// The default case (left button pressed) is handled in goBack().
}
}
-void DolphinMainWindow::goHome()
-{
- clearStatusBar();
- m_activeViewContainer->urlNavigator()->goHome();
-}
-
void DolphinMainWindow::compareFiles()
{
// The method is only invoked if exactly 2 files have
// - 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;
- 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];
+ Q_ASSERT(m_viewTab[m_tabIndex].secondaryView);
+ 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];
- Q_ASSERT(m_viewTab[m_tabIndex].secondaryView != 0);
- urls = m_viewTab[m_tabIndex].secondaryView->view()->selectedUrls();
- Q_ASSERT(urls.count() == 1);
- urlB = urls[0];
+ urlA = items[0].url();
+ Q_ASSERT(m_viewTab[m_tabIndex].secondaryView);
+ 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;
}
{
const bool visible = menuBar()->isVisible();
menuBar()->setVisible(!visible);
+ if (visible) {
+ createToolBarMenuButton();
+ } else {
+ deleteToolBarMenuButton();
+ }
}
void DolphinMainWindow::openTerminal()
void DolphinMainWindow::editSettings()
{
- if (m_settingsDialog == 0) {
- const KUrl& url = activeViewContainer()->url();
+ if (!m_settingsDialog) {
+ const KUrl url = activeViewContainer()->url();
m_settingsDialog = new DolphinSettingsDialog(url, this);
m_settingsDialog->setAttribute(Qt::WA_DeleteOnClose);
m_settingsDialog->show();
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);
canDecode = KUrl::List::canDecode(event->mimeData());
}
-void DolphinMainWindow::searchItems()
-{
-#ifdef HAVE_NEPOMUK
- const KUrl nepomukSearchUrl = m_searchOptionsConfigurator->nepomukSearchUrl();
- m_activeViewContainer->setUrl(nepomukSearchUrl);
-#endif
-}
-
-void DolphinMainWindow::showSearchOptions()
-{
-#ifdef HAVE_NEPOMUK
- m_searchOptionsConfigurator->show();
-#endif
-}
-
void DolphinMainWindow::handleUrl(const KUrl& url)
{
delete m_lastHandleUrlStatJob;
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() ) {
+ if (entry.isDir()) {
activeViewContainer()->setUrl(url);
} else {
new KRun(url, this);
}
}
-void DolphinMainWindow::slotCaptionStatFinished(KJob* job)
+void DolphinMainWindow::slotWriteStateChanged(bool isFolderWritable)
{
- 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);
+ newFileMenu()->setEnabled(isFolderWritable);
}
-void DolphinMainWindow::slotWriteStateChanged(bool isFolderWritable)
+void DolphinMainWindow::slotSearchModeChanged(bool enabled)
{
- newMenu()->setEnabled(isFolderWritable);
+#ifdef HAVE_NEPOMUK
+ const KUrl url = m_activeViewContainer->url();
+ const DolphinSearchInformation& searchInfo = DolphinSearchInformation::instance();
+ if (!searchInfo.isIndexingEnabled() || !searchInfo.isPathIndexed(url)) {
+ return;
+ }
+
+ QDockWidget* searchDock = findChild<QDockWidget*>("searchDock");
+ if (!searchDock) {
+ return;
+ }
+
+ if (enabled) {
+ if (!searchDock->isVisible()) {
+ m_searchDockIsTemporaryVisible = true;
+ }
+ searchDock->show();
+ } else {
+ if (searchDock->isVisible() && m_searchDockIsTemporaryVisible) {
+ searchDock->hide();
+ }
+ m_searchDockIsTemporaryVisible = false;
+ }
+
+ SearchPanel* searchPanel = qobject_cast<SearchPanel*>(searchDock->widget());
+ if (searchPanel) {
+ // Per default any search-operation triggered by the Search Panel is done
+ // "Everywhere".
+ SearchPanel::SearchMode searchMode = SearchPanel::Everywhere;
+
+ if (enabled && (SearchSettings::location() == QLatin1String("FromHere"))) {
+ // Only if the search-mode is enabled it is visible for the user whether
+ // a searching is done "Everywhere" or "From Here" (= current directory).
+ searchMode = SearchPanel::FromCurrentDir;
+ }
+ searchPanel->setSearchMode(searchMode);
+ }
+#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::updateToolBarMenu()
+{
+ KMenu* menu = qobject_cast<KMenu*>(sender());
+ Q_ASSERT(menu);
+
+ // All actions get cleared by KMenu::clear(). The sub-menus are deleted
+ // by connecting to the aboutToHide() signal from the parent-menu.
+ menu->clear();
+
+ const GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings();
+
+ KActionCollection* ac = actionCollection();
+
+ // Add "Edit" actions
+ bool added = addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Undo)), menu) |
+ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Find)), menu) |
+ addActionToMenu(ac->action("select_all"), menu) |
+ addActionToMenu(ac->action("invert_selection"), menu);
+
+ if (added) {
+ menu->addSeparator();
+ }
+
+ // Add "View" actions
+ if (!generalSettings->showZoomSlider()) {
+ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ZoomIn)), menu);
+ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ZoomOut)), menu);
+ menu->addSeparator();
+ }
+
+ added = addActionToMenu(ac->action("view_mode"), menu) |
+ addActionToMenu(ac->action("sort"), menu) |
+ addActionToMenu(ac->action("additional_info"), menu) |
+ addActionToMenu(ac->action("show_preview"), menu) |
+ addActionToMenu(ac->action("show_in_groups"), menu) |
+ addActionToMenu(ac->action("show_hidden_files"), menu);
+
+ if (added) {
+ menu->addSeparator();
+ }
+
+ added = addActionToMenu(ac->action("split_view"), menu) |
+ addActionToMenu(ac->action("reload"), menu) |
+ addActionToMenu(ac->action("view_properties"), menu);
+ if (added) {
+ menu->addSeparator();
+ }
+
+ addActionToMenu(ac->action("panels"), menu);
+ KMenu* locationBarMenu = new KMenu(i18nc("@action:inmenu", "Location Bar"), menu);
+ locationBarMenu->addAction(ac->action("editable_location"));
+ locationBarMenu->addAction(ac->action("replace_location"));
+ menu->addMenu(locationBarMenu);
+
+ menu->addSeparator();
+
+ // Add "Go" menu
+ KMenu* goMenu = new KMenu(i18nc("@action:inmenu", "Go"), menu);
+ connect(menu, SIGNAL(aboutToHide()), goMenu, SLOT(deleteLater()));
+ goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Back)));
+ goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Forward)));
+ goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Up)));
+ goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Home)));
+ goMenu->addAction(ac->action("closed_tabs"));
+ menu->addMenu(goMenu);
+
+ // Add "Tool" menu
+ KMenu* toolsMenu = new KMenu(i18nc("@action:inmenu", "Tools"), menu);
+ connect(menu, SIGNAL(aboutToHide()), toolsMenu, SLOT(deleteLater()));
+ toolsMenu->addAction(ac->action("show_filter_bar"));
+ toolsMenu->addAction(ac->action("compare_files"));
+ toolsMenu->addAction(ac->action("open_terminal"));
+ toolsMenu->addAction(ac->action("change_remote_encoding"));
+ menu->addMenu(toolsMenu);
+
+ // Add "Settings" menu entries
+ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::KeyBindings)), menu);
+ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ConfigureToolbars)), menu);
+ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Preferences)), menu);
+
+ // Add "Help" menu
+ KMenu* helpMenu = new KMenu(i18nc("@action:inmenu", "Help"), menu);
+ connect(menu, SIGNAL(aboutToHide()), helpMenu, SLOT(deleteLater()));
+ helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::HelpContents)));
+ helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::WhatsThis)));
+ helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::AboutApp)));
+ helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::AboutKDE)));
+ menu->addMenu(helpMenu);
+
+ menu->addSeparator();
+ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ShowMenubar)), menu);
+}
+
+void DolphinMainWindow::updateToolBar()
+{
+ if (!menuBar()->isVisible()) {
+ createToolBarMenuButton();
+ }
+}
+
+void DolphinMainWindow::slotToolBarSpacerDeleted()
+{
+ m_toolBarSpacer = 0;
+ m_updateToolBarTimer->start();
+}
+
+void DolphinMainWindow::slotToolBarMenuButtonDeleted()
+{
+ m_openToolBarMenuButton = 0;
+ m_updateToolBarTimer->start();
+}
+
+void DolphinMainWindow::slotToolBarIconSizeChanged(const QSize& iconSize)
+{
+ if (m_openToolBarMenuButton) {
+ m_openToolBarMenuButton->setIconSize(iconSize);
+ }
}
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(m_actionHandler, SIGNAL(createDirectory()), SLOT(createDirectory()));
- ViewProperties props(homeUrl);
- m_viewTab[m_tabIndex].primaryView = new DolphinViewContainer(homeUrl,
- m_viewTab[m_tabIndex].splitter);
+
+ m_viewTab[m_tabIndex].primaryView = createViewContainer(homeUrl, m_viewTab[m_tabIndex].splitter);
m_activeViewContainer = m_viewTab[m_tabIndex].primaryView;
connectViewSignals(m_activeViewContainer);
DolphinView* view = m_activeViewContainer->view();
- view->reload();
m_activeViewContainer->show();
m_actionHandler->setCurrentView(view);
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)),
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());
if (firstRun) {
- // assure a proper default size if Dolphin runs the first time
+ menuBar()->setVisible(false);
+ // Assure a proper default size if Dolphin runs the first time
resize(750, 500);
}
- m_showMenuBar->setChecked(!menuBar()->isHidden()); // workaround for bug #171080
+ const bool showMenu = !menuBar()->isHidden();
+ QAction* showMenuBarAction = actionCollection()->action(KStandardAction::name(KStandardAction::ShowMenubar));
+ showMenuBarAction->setChecked(showMenu); // workaround for bug #171080
+ if (!showMenu) {
+ createToolBarMenuButton();
+ }
}
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) {
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)));
}
emit urlChanged(url);
}
+DolphinViewContainer* DolphinMainWindow::createViewContainer(const KUrl& url, QWidget* parent)
+{
+ DolphinViewContainer* container = new DolphinViewContainer(url, parent);
+
+ // The places-selector from the URL navigator should only be shown
+ // if the places dock is invisible
+ QDockWidget* placesDock = findChild<QDockWidget*>("placesDock");
+ container->urlNavigator()->setPlacesSelectorVisible(!placesDock || !placesDock->isVisible());
+
+ return container;
+}
+
void DolphinMainWindow::setupActions()
{
// setup 'File' menu
- m_newMenu = new DolphinNewMenu(this, this);
- KMenu* menu = m_newMenu->menu();
+ 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"));
connect(menu, SIGNAL(aboutToShow()),
// 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());
// 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);
+ selectAll->setShortcut(Qt::CTRL | Qt::Key_A);
connect(selectAll, SIGNAL(triggered()), this, SLOT(selectAll()));
KAction* invertSelection = actionCollection()->addAction("invert_selection");
stop->setIcon(KIcon("process-stop"));
connect(stop, SIGNAL(triggered()), this, SLOT(stopLoading()));
- KToggleAction* showFullLocation = actionCollection()->add<KToggleAction>("editable_location");
- showFullLocation->setText(i18nc("@action:inmenu Navigation Bar", "Editable Location"));
- showFullLocation->setShortcut(Qt::CTRL | Qt::Key_L);
- connect(showFullLocation, SIGNAL(triggered()), this, SLOT(toggleEditLocation()));
+ KToggleAction* editableLocation = actionCollection()->add<KToggleAction>("editable_location");
+ editableLocation->setText(i18nc("@action:inmenu Navigation Bar", "Editable Location"));
+ editableLocation->setShortcut(Qt::CTRL | Qt::Key_L);
+ connect(editableLocation, SIGNAL(triggered()), this, SLOT(toggleEditLocation()));
KAction* replaceLocation = actionCollection()->addAction("replace_location");
replaceLocation->setText(i18nc("@action:inmenu Navigation Bar", "Replace Location"));
connect(m_recentTabsMenu->menu(), SIGNAL(triggered(QAction *)),
this, SLOT(restoreClosedTab(QAction *)));
- QAction* action = new QAction("Empty Recently Closed Tabs", m_recentTabsMenu);
+ QAction* action = new QAction(i18n("Empty Recently Closed Tabs"), m_recentTabsMenu);
action->setIcon(KIcon("edit-clear-list"));
action->setData(QVariant::fromValue(true));
m_recentTabsMenu->addAction(action);
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"));
connect(openTerminal, SIGNAL(triggered()), this, SLOT(openTerminal()));
// setup 'Settings' menu
- m_showMenuBar = KStandardAction::showMenubar(this, SLOT(toggleShowMenuBar()), actionCollection());
+ KStandardAction::showMenubar(this, SLOT(toggleShowMenuBar()), actionCollection());
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 "Search"
+#ifdef HAVE_NEPOMUK
+ 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)),
+ searchPanel, 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
+ searchDock->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)));
+ connect(placesDock, SIGNAL(visibilityChanged(bool)),
+ this, SLOT(slotPlacesPanelVisibilityChanged(bool)));
+
+ // 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(searchAction);
+#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);
}
+void DolphinMainWindow::createToolBarMenuButton()
+{
+ if (m_toolBarSpacer && m_openToolBarMenuButton) {
+ return;
+ }
+ Q_ASSERT(!m_toolBarSpacer);
+ Q_ASSERT(!m_openToolBarMenuButton);
+
+ m_toolBarSpacer = new QWidget(this);
+ m_toolBarSpacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+
+ m_openToolBarMenuButton = new QToolButton(this);
+ m_openToolBarMenuButton->setIcon(KIcon("configure"));
+ m_openToolBarMenuButton->setPopupMode(QToolButton::InstantPopup);
+ m_openToolBarMenuButton->setToolTip(i18nc("@info:tooltip", "Configure and control Dolphin"));
+
+ KMenu* toolBarMenu = new ToolBarMenu(m_openToolBarMenuButton);
+ connect(toolBarMenu, SIGNAL(aboutToShow()), this, SLOT(updateToolBarMenu()));
+
+ m_openToolBarMenuButton->setMenu(toolBarMenu);
+
+ toolBar()->addWidget(m_toolBarSpacer);
+ toolBar()->addWidget(m_openToolBarMenuButton);
+ connect(toolBar(), SIGNAL(iconSizeChanged(QSize)), this, SLOT(slotToolBarIconSizeChanged(QSize)));
+
+ // The added widgets are owned by the toolbar and may get deleted when e.g. the toolbar
+ // gets edited. In this case we must add them again. The adding is done asynchronously by
+ // m_updateToolBarTimer.
+ connect(m_toolBarSpacer, SIGNAL(destroyed()), this, SLOT(slotToolBarSpacerDeleted()));
+ connect(m_openToolBarMenuButton, SIGNAL(destroyed()), this, SLOT(slotToolBarMenuButtonDeleted()));
+ m_updateToolBarTimer = new QTimer(this);
+ m_updateToolBarTimer->setInterval(500);
+ connect(m_updateToolBarTimer, SIGNAL(timeout()), this, SLOT(updateToolBar()));
+}
+
+void DolphinMainWindow::deleteToolBarMenuButton()
+{
+ delete m_toolBarSpacer;
+ m_toolBarSpacer = 0;
+
+ delete m_openToolBarMenuButton;
+ m_openToolBarMenuButton = 0;
+
+ delete m_updateToolBarTimer;
+ m_updateToolBarTimer = 0;
+}
+
+bool DolphinMainWindow::addActionToMenu(QAction* action, KMenu* menu)
+{
+ Q_ASSERT(action);
+ Q_ASSERT(menu);
+
+ const KToolBar* toolBarWidget = toolBar();
+ foreach (const QWidget* widget, action->associatedWidgets()) {
+ if (widget == toolBarWidget) {
+ return false;
+ }
+ }
+
+ menu->addAction(action);
+ return true;
+}
+
void DolphinMainWindow::rememberClosedTab(int index)
{
KMenu* tabsMenu = m_recentTabsMenu->menu();
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 {
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::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"));
const int newWidth = (m_viewTab[tabIndex].primaryView->width() - splitter->handleWidth()) / 2;
const DolphinView* view = m_viewTab[tabIndex].primaryView->view();
- m_viewTab[tabIndex].secondaryView = new DolphinViewContainer(view->rootUrl(), 0);
+ m_viewTab[tabIndex].secondaryView = createViewContainer(view->rootUrl(), 0);
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();
}
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()
{
}
}
+ToolBarMenu::ToolBarMenu(QWidget* parent) :
+ KMenu(parent)
+{
+}
+
+ToolBarMenu::~ToolBarMenu()
+{
+}
+
+void ToolBarMenu::showEvent(QShowEvent* event)
+{
+ KMenu::showEvent(event);
+
+ // Adjust the position of the menu to be shown within the
+ // Dolphin window to reduce the cases that sub-menus might overlap
+ // the right screen border.
+ QPoint pos;
+ QWidget* button = parentWidget();
+ if (layoutDirection() == Qt::RightToLeft) {
+ pos = button->mapToGlobal(QPoint(0, button->height()));
+ } else {
+ pos = button->mapToGlobal(QPoint(button->width(), button->height()));
+ pos.rx() -= width();
+ }
+
+ // Assure that the menu is not shown outside the screen boundaries and
+ // that it does not overlap with the parent button.
+ const QRect screen = QApplication::desktop()->screenGeometry(QCursor::pos());
+ if (pos.x() < 0) {
+ pos.rx() = 0;
+ } else if (pos.x() + width() >= screen.width()) {
+ pos.rx() = screen.width() - width();
+ }
+
+ if (pos.y() < 0) {
+ pos.ry() = 0;
+ } else if (pos.y() + height() >= screen.height()) {
+ pos.ry() = button->mapToGlobal(QPoint(0, 0)).y() - height();
+ }
+
+ move(pos);
+}
+
#include "dolphinmainwindow.moc"
projects / dolphin.git / blobdiff