#include <kmenu.h>
#include <kmenubar.h>
#include <kmessagebox.h>
-#include <kurlnavigator.h>
#include <konq_fileitemcapabilities.h>
#include <konqmimedata.h>
-#include <kpropertiesdialog.h>
#include <kprotocolinfo.h>
-#include <ktoggleaction.h>
#include <krun.h>
#include <kshell.h>
#include <kstandarddirs.h>
#include <kstatusbar.h>
#include <kstandardaction.h>
#include <ktabbar.h>
+#include <ktoggleaction.h>
+#include <kurlnavigator.h>
#include <kurl.h>
#include <kurlcombobox.h>
+#include <QDBusMessage>
#include <QKeyEvent>
#include <QClipboard>
#include <QLineEdit>
updateEditActions();
Q_ASSERT(m_viewTab[m_tabIndex].primaryView != 0);
- int selectedUrlsCount = m_viewTab[m_tabIndex].primaryView->view()->selectedUrls().count();
+ int selectedUrlsCount = m_viewTab[m_tabIndex].primaryView->view()->selectedItemsCount();
if (m_viewTab[m_tabIndex].secondaryView != 0) {
- selectedUrlsCount += m_viewTab[m_tabIndex].secondaryView->view()->selectedUrls().count();
+ selectedUrlsCount += m_viewTab[m_tabIndex].secondaryView->view()->selectedItemsCount();
}
QAction* compareFilesAction = actionCollection()->action("compare_files");
compareFilesAction->setEnabled(false);
}
+ const bool activeViewHasSelection = (activeViewContainer()->view()->selectedItemsCount() > 0);
+ actionCollection()->action("quick_view")->setEnabled(activeViewHasSelection);
+
m_activeViewContainer->updateStatusBar();
emit selectionChanged(selection);
viewTab.primaryView->view()->reload();
m_viewTab.append(viewTab);
+
+ actionCollection()->action("close_tab")->setEnabled(true);
}
void DolphinMainWindow::toggleActiveView()
m_newMenu->setPopupFiles(activeViewContainer()->url());
}
-void DolphinMainWindow::properties()
-{
- const KFileItemList list = m_activeViewContainer->view()->selectedItems();
-
- KPropertiesDialog *dialog = new KPropertiesDialog(list, this);
- dialog->setAttribute(Qt::WA_DeleteOnClose);
- dialog->show();
- dialog->raise();
- dialog->activateWindow();
-}
-
void DolphinMainWindow::quit()
{
close();
m_viewTab[m_tabIndex].secondaryView->show();
setActiveViewContainer(m_viewTab[m_tabIndex].secondaryView);
- } else if (m_activeViewContainer == m_viewTab[m_tabIndex].primaryView) {
+ } else if (m_activeViewContainer == m_viewTab[m_tabIndex].secondaryView) {
// remove secondary view
m_viewTab[m_tabIndex].secondaryView->close();
m_viewTab[m_tabIndex].secondaryView->deleteLater();
setActiveViewContainer(m_viewTab[m_tabIndex].primaryView);
} else {
- // The secondary view is active, hence from a users point of view
+ // The primary view is active and should be closed. Hence from a users point of view
// the content of the secondary view should be moved to the primary view.
// From an implementation point of view it is more efficient to close
// the primary view and exchange the internal pointers afterwards.
m_activeViewContainer->urlNavigator()->goHome();
}
-void DolphinMainWindow::findFile()
-{
- KRun::run("kfind", m_activeViewContainer->url(), this);
-}
-
void DolphinMainWindow::compareFiles()
{
// The method is only invoked if exactly 2 files have
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();
if (index == m_tabIndex) {
// The tab that should be closed is the active tab. Activate the
// previous tab before closing the tab.
- setActiveTab((index > 0) ? index - 1 : 1);
+ m_tabBar->setCurrentIndex((index > 0) ? index - 1 : 1);
}
// delete tab
// closing the last tab is not possible
if (m_viewTab.count() == 1) {
m_tabBar->removeTab(0);
+ actionCollection()->action("close_tab")->setEnabled(false);
} else {
m_tabBar->blockSignals(false);
}
}
}
+void DolphinMainWindow::slotTestCanDecode(const QDragMoveEvent* event, bool& canDecode)
+{
+ canDecode = KUrl::List::canDecode(event->mimeData());
+}
+
void DolphinMainWindow::init()
{
DolphinSettings& settings = DolphinSettings::instance();
this, SLOT(openTabContextMenu(int, const QPoint&)));
connect(m_tabBar, SIGNAL(newTabRequest()),
this, SLOT(openNewTab()));
+ connect(m_tabBar, SIGNAL(testCanDecode(const QDragMoveEvent*, bool&)),
+ this, SLOT(slotTestCanDecode(const QDragMoveEvent*, bool&)));
m_tabBar->blockSignals(true); // signals get unblocked after at least 2 tabs are open
QWidget* centralWidget = new QWidget(this);
setupDockWidgets();
setupGUI(Keys | Save | Create | ToolBar);
- createGUI();
stateChanged("new_file");
- setAutoSaveSettings();
QClipboard* clipboard = QApplication::clipboard();
connect(clipboard, SIGNAL(dataChanged()),
}
updateViewActions();
+ QAction* showFilterBarAction = actionCollection()->action("show_filter_bar");
+ showFilterBarAction->setChecked(generalSettings->filterBar());
+
if (firstRun) {
// assure a proper default size if Dolphin runs the first time
resize(750, 500);
KAction* newTab = actionCollection()->addAction("new_tab");
newTab->setIcon(KIcon("tab-new"));
newTab->setText(i18nc("@action:inmenu File", "New Tab"));
- newTab->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_N);
+ newTab->setShortcut(KShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_N, Qt::CTRL | Qt::Key_T));
connect(newTab, SIGNAL(triggered()), this, SLOT(openNewTab()));
QAction* closeTab = new QAction(KIcon("tab-close"), i18nc("@action:inmenu File", "Close Tab"), this);
closeTab->setShortcut(Qt::CTRL | Qt::Key_W);
+ closeTab->setEnabled(false);
connect(closeTab, SIGNAL(triggered()), this, SLOT(closeTab()));
actionCollection()->addAction("close_tab", closeTab);
- KAction* properties = actionCollection()->addAction("properties");
- properties->setText(i18nc("@action:inmenu File", "Properties"));
- properties->setShortcut(Qt::ALT | Qt::Key_Return);
- connect(properties, SIGNAL(triggered()), this, SLOT(properties()));
-
KStandardAction::quit(this, SLOT(quit()), actionCollection());
// setup 'Edit' menu
KStandardAction::home(this, SLOT(goHome()), actionCollection());
// setup 'Tools' menu
- QAction* findFile = actionCollection()->addAction("find_file");
- findFile->setText(i18nc("@action:inmenu Tools", "Find File..."));
- findFile->setShortcut(Qt::CTRL | Qt::Key_F);
- findFile->setIcon(KIcon("edit-find"));
- connect(findFile, SIGNAL(triggered()), this, SLOT(findFile()));
-
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()));
+ 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()));
+
// setup 'Settings' menu
m_showMenuBar = KStandardAction::showMenubar(this, SLOT(toggleShowMenuBar()), actionCollection());
KStandardAction::preferences(this, SLOT(editSettings()), actionCollection());
{
QAction* splitAction = actionCollection()->action("split_view");
if (m_viewTab[m_tabIndex].secondaryView != 0) {
- if (m_activeViewContainer == m_viewTab[m_tabIndex].primaryView) {
+ if (m_activeViewContainer == m_viewTab[m_tabIndex].secondaryView) {
splitAction->setText(i18nc("@action:intoolbar Close right view", "Close"));
splitAction->setIcon(KIcon("view-right-close"));
} else {
projects / dolphin.git / blobdiff