#include "dolphinviewcontainer.h"
#include "mainwindowadaptor.h"
#ifdef HAVE_NEPOMUK
- #include "panels/filter/filterpanel.h"
+ #include "panels/search/searchpanel.h"
#include <Nepomuk/ResourceManager>
#endif
#include "panels/folders/folderspanel.h"
#include "dolphin_generalsettings.h"
#include "dolphin_iconsmodesettings.h"
+#include "dolphin_searchsettings.h"
+#include <KAcceleratorManager>
#include <KAction>
#include <KActionCollection>
#include <KActionMenu>
#include <KFilePlacesModel>
#include <KGlobal>
#include <KLineEdit>
-#include <ktoolbar.h>
+#include <KToolBar>
#include <KIcon>
#include <KIconLoader>
#include <KIO/NetAccess>
#include <QDBusMessage>
#include <QKeyEvent>
#include <QClipboard>
+#include <QToolButton>
#include <QSplitter>
-#include <kacceleratormanager.h>
/*
* Remembers the tab configuration if a tab has been closed.
DolphinMainWindow::DolphinMainWindow(int id) :
KXmlGuiWindow(0),
m_newFileMenu(0),
- m_showMenuBar(0),
m_tabBar(0),
m_activeViewContainer(0),
m_centralWidgetLayout(0),
m_actionHandler(0),
m_remoteEncoding(0),
m_settingsDialog(0),
+ m_toolBarSpacer(0),
+ m_openToolBarMenuButton(0),
+ m_toolBarMenu(),
+ m_updateToolBarTimer(0),
m_lastHandleUrlStatJob(0),
- m_filterDockIsTemporaryVisible(false)
+ m_searchDockIsTemporaryVisible(false)
{
// Workaround for a X11-issue in combination with KModifierInfo
// (see DolphinContextMenu::initializeModifierKeyInfo() for
return;
}
+ if (dirs.count() == 1) {
+ m_activeViewContainer->setUrl(dirs.first());
+ return;
+ }
+
const int oldOpenTabsCount = m_viewTab.count();
const GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings();
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);
settings.save();
- if (m_filterDockIsTemporaryVisible) {
- QDockWidget* filterDock = findChild<QDockWidget*>("filterDock");
- if (filterDock) {
- filterDock->hide();
+ if (m_searchDockIsTemporaryVisible) {
+ QDockWidget* searchDock = findChild<QDockWidget*>("searchDock");
+ if (searchDock) {
+ searchDock->hide();
}
- m_filterDockIsTemporaryVisible = false;
+ m_searchDockIsTemporaryVisible = false;
}
KXmlGuiWindow::closeEvent(event);
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();
}
}
-void DolphinMainWindow::goHome()
-{
- clearStatusBar();
- m_activeViewContainer->urlNavigator()->goHome();
-}
-
void DolphinMainWindow::compareFiles()
{
// The method is only invoked if exactly 2 files have
{
const bool visible = menuBar()->isVisible();
menuBar()->setVisible(!visible);
+ if (visible) {
+ createToolBarMenuButton();
+ } else {
+ deleteToolBarMenuButton();
+ }
}
void DolphinMainWindow::openTerminal()
return;
}
- QDockWidget* filterDock = findChild<QDockWidget*>("filterDock");
- if (!filterDock) {
+ QDockWidget* searchDock = findChild<QDockWidget*>("searchDock");
+ if (!searchDock) {
return;
}
if (enabled) {
- if (!filterDock->isVisible()) {
- m_filterDockIsTemporaryVisible = true;
+ if (!searchDock->isVisible()) {
+ m_searchDockIsTemporaryVisible = true;
}
- filterDock->show();
+ searchDock->show();
} else {
- if (filterDock->isVisible() && m_filterDockIsTemporaryVisible) {
- filterDock->hide();
+ if (searchDock->isVisible() && m_searchDockIsTemporaryVisible) {
+ searchDock->hide();
}
- m_filterDockIsTemporaryVisible = false;
+ m_searchDockIsTemporaryVisible = false;
+ }
+
+ 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);
delete contextMenu;
}
+void DolphinMainWindow::openToolBarMenu()
+{
+ const int height = m_openToolBarMenuButton->height();
+ const QPoint pos = m_openToolBarMenuButton->mapToGlobal(QPoint(0, height));
+
+ m_toolBarMenu = new KMenu(m_openToolBarMenuButton);
+ m_toolBarMenu.data()->setAttribute(Qt::WA_DeleteOnClose);
+ connect(m_toolBarMenu.data(), SIGNAL(aboutToShow()), this, SLOT(updateToolBarMenu()));
+
+ m_toolBarMenu.data()->exec(pos);
+}
+
+void DolphinMainWindow::updateToolBarMenu()
+{
+ KMenu* menu = m_toolBarMenu.data();
+ if (!menu) {
+ return;
+ }
+
+ 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);
+ 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("closed_tabs"));
+ menu->addMenu(goMenu);
+
+ // Add "Tool" menu
+ KMenu* toolsMenu = new KMenu(i18nc("@action:inmenu", "Tools"), menu);
+ 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);
+ 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::init()
{
DolphinSettings& settings = DolphinSettings::instance();
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);
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)
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
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"));
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
KAction* showFilterBar = actionCollection()->addAction("show_filter_bar");
showFilterBar->setText(i18nc("@action:inmenu Tools", "Show Filter Bar"));
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
terminalPanel, SLOT(setUrl(KUrl)));
#endif
- // Setup "Filter"
+ // Setup "Search"
#ifdef HAVE_NEPOMUK
- DolphinDockWidget* filterDock = new DolphinDockWidget(i18nc("@title:window", "Filter"));
- filterDock->setLocked(lock);
- filterDock->setObjectName("filterDock");
- filterDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
- Panel* filterPanel = new FilterPanel(filterDock);
- filterPanel->setCustomContextMenuActions(QList<QAction*>() << lockLayoutAction);
- connect(filterPanel, SIGNAL(urlActivated(KUrl)), this, SLOT(handleUrl(KUrl)));
- filterDock->setWidget(filterPanel);
-
- QAction* filterAction = filterDock->toggleViewAction();
- filterAction->setShortcut(Qt::Key_F12);
- filterAction->setIcon(KIcon("view-filter"));
- addActionCloneToCollection(filterAction, "show_filter_panel");
- addDockWidget(Qt::RightDockWidgetArea, filterDock);
+ DolphinDockWidget* searchDock = new DolphinDockWidget(i18nc("@title:window", "Search"));
+ searchDock->setLocked(lock);
+ searchDock->setObjectName("searchDock");
+ searchDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
+ Panel* searchPanel = new SearchPanel(searchDock);
+ searchPanel->setCustomContextMenuActions(QList<QAction*>() << lockLayoutAction);
+ connect(searchPanel, SIGNAL(urlActivated(KUrl)), this, SLOT(handleUrl(KUrl)));
+ searchDock->setWidget(searchPanel);
+
+ QAction* searchAction = searchDock->toggleViewAction();
+ searchAction->setShortcut(Qt::Key_F12);
+ searchAction->setIcon(KIcon("system-search"));
+ addActionCloneToCollection(searchAction, "show_search_panel");
+ addDockWidget(Qt::RightDockWidgetArea, searchDock);
connect(this, SIGNAL(urlChanged(KUrl)),
- filterPanel, SLOT(setUrl(KUrl)));
+ searchPanel, SLOT(setUrl(KUrl)));
#endif
const bool firstRun = DolphinSettings::instance().generalSettings()->firstRun();
terminalDock->hide();
#endif
#ifdef HAVE_NEPOMUK
- filterDock->hide();
+ searchDock->hide();
#endif
}
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);
panelsMenu->addAction(terminalAction);
#endif
#ifdef HAVE_NEPOMUK
- panelsMenu->addAction(filterAction);
+ panelsMenu->addAction(searchAction);
#endif
panelsMenu->addSeparator();
panelsMenu->addAction(lockLayoutAction);
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"));
+
+ // Instead of using QPushButton::setMenu() the opening of the menu is done manually
+ // to prevent the "clutter" of the down-arrow drawn by the style.
+ connect(m_openToolBarMenuButton, SIGNAL(clicked()), this, SLOT(openToolBarMenu()));
+
+ toolBar()->addWidget(m_toolBarSpacer);
+ toolBar()->addWidget(m_openToolBarMenuButton);
+
+ // 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();
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();
}
projects / dolphin.git / blobdiff