* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
-#include <config-kmetadata.h>
#include "dolphinmainwindow.h"
-#include "bookmarkssidebarpage.h"
+#include "config-nepomuk.h"
+
#include "dolphinapplication.h"
#include "dolphinnewmenu.h"
#include "dolphinsettings.h"
#include "dolphinsettingsdialog.h"
#include "dolphinstatusbar.h"
+#include "dolphinviewcontainer.h"
#include "infosidebarpage.h"
#include "metadatawidget.h"
#include "mainwindowadaptor.h"
+#include "terminalsidebarpage.h"
#include "treeviewsidebarpage.h"
#include "kurlnavigator.h"
#include "viewpropertiesdialog.h"
#include <kaction.h>
#include <kactioncollection.h>
-#include <kbookmarkmanager.h>
#include <kconfig.h>
#include <kdesktopfile.h>
#include <kdeversion.h>
#include <kstandardaction.h>
#include <kurl.h>
-#include <QCloseEvent>
-#include <QClipboard>
-#include <QSplitter>
-#include <QDockWidget>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QClipboard>
+#include <QtGui/QSplitter>
+#include <QtGui/QDockWidget>
DolphinMainWindow::DolphinMainWindow(int id) :
- KMainWindow(0),
+ KXmlGuiWindow(0),
m_newMenu(0),
m_splitter(0),
- m_activeView(0),
+ m_activeViewContainer(0),
m_id(id)
{
setObjectName("Dolphin");
- m_view[PrimaryIdx] = 0;
- m_view[SecondaryIdx] = 0;
+ m_viewContainer[PrimaryView] = 0;
+ m_viewContainer[SecondaryView] = 0;
new MainWindowAdaptor(this);
QDBusConnection::sessionBus().registerObject(QString("/dolphin/MainWindow%1").arg(m_id), this);
DolphinApplication::app()->removeMainWindow(this);
}
-void DolphinMainWindow::setActiveView(DolphinView* view)
+void DolphinMainWindow::toggleViews()
{
- Q_ASSERT((view == m_view[PrimaryIdx]) || (view == m_view[SecondaryIdx]));
- if (m_activeView == view) {
+ if (m_viewContainer[SecondaryView] == 0) {
return;
}
- m_activeView = view;
+ // move secondary view from the last position of the splitter
+ // to the first position
+ m_splitter->insertWidget(0, m_viewContainer[SecondaryView]);
- updateHistory();
- updateEditActions();
- updateViewActions();
- updateGoActions();
+ DolphinViewContainer* container = m_viewContainer[PrimaryView];
+ m_viewContainer[PrimaryView] = m_viewContainer[SecondaryView];
+ m_viewContainer[SecondaryView] = container;
+}
- setCaption(m_activeView->url().fileName());
+void DolphinMainWindow::rename(const KUrl& oldUrl, const KUrl& newUrl)
+{
+ clearStatusBar();
+ KonqOperations::rename(this, oldUrl, newUrl);
+ m_undoCommandTypes.append(KonqUndoManager::RENAME);
+}
- emit activeViewChanged();
+void DolphinMainWindow::refreshViews()
+{
+ Q_ASSERT(m_viewContainer[PrimaryView] != 0);
+
+ // remember the current active view, as because of
+ // the refreshing the active view might change to
+ // the secondary view
+ DolphinViewContainer* activeViewContainer = m_activeViewContainer;
+
+ m_viewContainer[PrimaryView]->view()->refresh();
+ if (m_viewContainer[SecondaryView] != 0) {
+ m_viewContainer[SecondaryView]->view()->refresh();
+ }
+
+ setActiveViewContainer(activeViewContainer);
}
void DolphinMainWindow::dropUrls(const KUrl::List& urls,
if (shiftPressed && controlPressed) {
// shortcut for 'Link Here' is used
action = Qt::LinkAction;
- }
- else if (shiftPressed) {
+ } else if (shiftPressed) {
// shortcut for 'Move Here' is used
action = Qt::MoveAction;
- }
- else if (controlPressed) {
+ } else if (controlPressed) {
// shortcut for 'Copy Here' is used
action = Qt::CopyAction;
- }
- else {
+ } else {
// open a context menu which offers the following actions:
// - Move Here
// - Copy Here
QAction* activatedAction = popup.exec(QCursor::pos());
if (activatedAction == moveAction) {
action = Qt::MoveAction;
- }
- else if (activatedAction == copyAction) {
+ } else if (activatedAction == copyAction) {
action = Qt::CopyAction;
- }
- else if (activatedAction == linkAction) {
+ } else if (activatedAction == linkAction) {
action = Qt::LinkAction;
- }
- else {
+ } else {
return;
}
}
switch (action) {
- case Qt::MoveAction:
- moveUrls(urls, destination);
- break;
+ case Qt::MoveAction:
+ moveUrls(urls, destination);
+ break;
- case Qt::CopyAction:
- copyUrls(urls, destination);
- break;
+ case Qt::CopyAction:
+ copyUrls(urls, destination);
+ break;
- case Qt::LinkAction:
- linkUrls(urls, destination);
- break;
+ case Qt::LinkAction:
+ linkUrls(urls, destination);
+ break;
- default:
- break;
+ default:
+ break;
}
}
-void DolphinMainWindow::rename(const KUrl& oldUrl, const KUrl& newUrl)
-{
- clearStatusBar();
- KonqOperations::rename(this, oldUrl, newUrl);
- m_undoCommandTypes.append(KonqUndoManager::RENAME);
-}
-
-void DolphinMainWindow::refreshViews()
-{
- const bool split = DolphinSettings::instance().generalSettings()->splitView();
- const bool isPrimaryViewActive = (m_activeView == m_view[PrimaryIdx]);
- KUrl url;
- for (int i = PrimaryIdx; i <= SecondaryIdx; ++i) {
- if (m_view[i] != 0) {
- url = m_view[i]->url();
-
- // delete view instance...
- m_view[i]->close();
- m_view[i]->deleteLater();
- m_view[i] = 0;
- }
-
- if (split || (i == PrimaryIdx)) {
- // ... and recreate it
- ViewProperties props(url);
- m_view[i] = new DolphinView(this,
- m_splitter,
- url,
- props.viewMode(),
- props.showHiddenFiles());
- connectViewSignals(i);
- m_view[i]->reload();
- m_view[i]->show();
- }
- }
-
- m_activeView = isPrimaryViewActive ? m_view[PrimaryIdx] : m_view[SecondaryIdx];
- Q_ASSERT(m_activeView != 0);
-
- updateViewActions();
- emit activeViewChanged();
-}
-
void DolphinMainWindow::changeUrl(const KUrl& url)
{
- if (activeView() != 0) {
- activeView()->setUrl(url);
+ if (activeViewContainer() != 0) {
+ activeViewContainer()->setUrl(url);
updateEditActions();
updateViewActions();
updateGoActions();
void DolphinMainWindow::changeSelection(const KFileItemList& selection)
{
- activeView()->changeSelection(selection);
+ activeViewContainer()->view()->changeSelection(selection);
}
void DolphinMainWindow::slotViewModeChanged()
{
KToggleAction* showHiddenFilesAction =
static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));
- showHiddenFilesAction->setChecked(m_activeView->showHiddenFiles());
+ const DolphinView* view = m_activeViewContainer->view();
+ showHiddenFilesAction->setChecked(view->showHiddenFiles());
+}
+
+void DolphinMainWindow::slotCategorizedSortingChanged()
+{
+ KToggleAction* categorizedSortingAction =
+ static_cast<KToggleAction*>(actionCollection()->action("categorized"));
+ const DolphinView* view = m_activeViewContainer->view();
+ categorizedSortingAction->setChecked(view->categorizedSorting());
+ categorizedSortingAction->setEnabled(view->supportsCategorizedSorting());
}
void DolphinMainWindow::slotSortingChanged(DolphinView::Sorting sorting)
{
QAction* action = 0;
switch (sorting) {
- case DolphinView::SortByName:
- action = actionCollection()->action("by_name");
- break;
- case DolphinView::SortBySize:
- action = actionCollection()->action("by_size");
- break;
- case DolphinView::SortByDate:
- action = actionCollection()->action("by_date");
- break;
- case DolphinView::SortByPermissions:
- action = actionCollection()->action("by_permissions");
- break;
- case DolphinView::SortByOwner:
- action = actionCollection()->action("by_owner");
- break;
- case DolphinView::SortByGroup:
- action = actionCollection()->action("by_group");
- break;
- default:
- break;
+ case DolphinView::SortByName:
+ action = actionCollection()->action("by_name");
+ break;
+ case DolphinView::SortBySize:
+ action = actionCollection()->action("by_size");
+ break;
+ case DolphinView::SortByDate:
+ action = actionCollection()->action("by_date");
+ break;
+ case DolphinView::SortByPermissions:
+ action = actionCollection()->action("by_permissions");
+ break;
+ case DolphinView::SortByOwner:
+ action = actionCollection()->action("by_owner");
+ break;
+ case DolphinView::SortByGroup:
+ action = actionCollection()->action("by_group");
+ break;
+ case DolphinView::SortByType:
+ action = actionCollection()->action("by_type");
+ default:
+ break;
}
if (action != 0) {
{
QAction* action = 0;
switch (info) {
- case KFileItemDelegate::FriendlyMimeType:
- action = actionCollection()->action("show_mime_info");
- break;
- case KFileItemDelegate::Size:
- action = actionCollection()->action("show_size_info");
- break;
- case KFileItemDelegate::ModificationTime:
- action = actionCollection()->action("show_date_info");
- break;
- case KFileItemDelegate::NoInformation:
- default:
- action = actionCollection()->action("clear_info");
- break;
+ case KFileItemDelegate::FriendlyMimeType:
+ action = actionCollection()->action("show_mime_info");
+ break;
+ case KFileItemDelegate::Size:
+ action = actionCollection()->action("show_size_info");
+ break;
+ case KFileItemDelegate::ModificationTime:
+ action = actionCollection()->action("show_date_info");
+ break;
+ case KFileItemDelegate::NoInformation:
+ default:
+ action = actionCollection()->action("clear_info");
+ break;
}
if (action != 0) {
QActionGroup* group = toggleAction->actionGroup();
Q_ASSERT(group != 0);
- group->setEnabled(m_activeView->mode() == DolphinView::IconsView);
+ const DolphinView* view = m_activeViewContainer->view();
+ group->setEnabled(view->mode() == DolphinView::IconsView);
}
}
{
updateEditActions();
- Q_ASSERT(m_view[PrimaryIdx] != 0);
- int selectedUrlsCount = m_view[PrimaryIdx]->selectedUrls().count();
- if (m_view[SecondaryIdx] != 0) {
- selectedUrlsCount += m_view[SecondaryIdx]->selectedUrls().count();
+ Q_ASSERT(m_viewContainer[PrimaryView] != 0);
+ int selectedUrlsCount = m_viewContainer[PrimaryView]->view()->selectedUrls().count();
+ if (m_viewContainer[SecondaryView] != 0) {
+ selectedUrlsCount += m_viewContainer[SecondaryView]->view()->selectedUrls().count();
}
QAction* compareFilesAction = actionCollection()->action("compare_files");
compareFilesAction->setEnabled(selectedUrlsCount == 2);
- m_activeView->updateStatusBar();
+ m_activeViewContainer->updateStatusBar();
emit selectionChanged(selection);
}
+void DolphinMainWindow::slotRequestItemInfo(const KUrl& url)
+{
+ emit requestItemInfo(url);
+}
+
void DolphinMainWindow::slotHistoryChanged()
{
updateHistory();
DolphinApplication::app()->createMainWindow()->show();
}
+void DolphinMainWindow::toggleActiveView()
+{
+ if (m_activeViewContainer == m_viewContainer[PrimaryView]) {
+ setActiveViewContainer(m_viewContainer[SecondaryView]);
+ } else {
+ setActiveViewContainer(m_viewContainer[PrimaryView]);
+ }
+}
+
void DolphinMainWindow::closeEvent(QCloseEvent* event)
{
DolphinSettings& settings = DolphinSettings::instance();
settings.save();
- // TODO: I assume there will be a generic way in KDE 4 to store the docks
- // of the main window. In the meantime they are stored manually:
- QString filename = KStandardDirs::locateLocal("data", KGlobal::mainComponent().componentName());
- filename.append("/panels_layout");
- QFile file(filename);
- if (file.open(QIODevice::WriteOnly)) {
- QByteArray data = saveState();
- file.write(data);
- file.close();
- }
-
- KMainWindow::closeEvent(event);
+ KXmlGuiWindow::closeEvent(event);
}
void DolphinMainWindow::saveProperties(KConfig* config)
{
KConfigGroup primaryView = config->group("Primary view");
- primaryView.writeEntry("Url", m_view[PrimaryIdx]->url().url());
- primaryView.writeEntry("Editable Url", m_view[PrimaryIdx]->isUrlEditable());
- if (m_view[SecondaryIdx] != 0) {
+ primaryView.writeEntry("Url", m_viewContainer[PrimaryView]->url().url());
+ primaryView.writeEntry("Editable Url", m_viewContainer[PrimaryView]->isUrlEditable());
+ if (m_viewContainer[SecondaryView] != 0) {
KConfigGroup secondaryView = config->group("Secondary view");
- secondaryView.writeEntry("Url", m_view[SecondaryIdx]->url().url());
- secondaryView.writeEntry("Editable Url", m_view[SecondaryIdx]->isUrlEditable());
+ secondaryView.writeEntry("Url", m_viewContainer[SecondaryView]->url().url());
+ secondaryView.writeEntry("Editable Url", m_viewContainer[SecondaryView]->isUrlEditable());
}
}
void DolphinMainWindow::readProperties(KConfig* config)
{
- const KConfigGroup primaryView = config->group("Primary view");
- m_view[PrimaryIdx]->setUrl(primaryView.readEntry("Url"));
- m_view[PrimaryIdx]->setUrlEditable(primaryView.readEntry("Editable Url", false));
+ const KConfigGroup primaryViewGroup = config->group("Primary view");
+ m_viewContainer[PrimaryView]->setUrl(primaryViewGroup.readEntry("Url"));
+ bool editable = primaryViewGroup.readEntry("Editable Url", false);
+ m_viewContainer[PrimaryView]->urlNavigator()->setUrlEditable(editable);
+
if (config->hasGroup("Secondary view")) {
- const KConfigGroup secondaryView = config->group("Secondary view");
- if (m_view[SecondaryIdx] == 0) {
+ const KConfigGroup secondaryViewGroup = config->group("Secondary view");
+ if (m_viewContainer[PrimaryView] == 0) {
toggleSplitView();
}
- m_view[SecondaryIdx]->setUrl(secondaryView.readEntry("Url"));
- m_view[SecondaryIdx]->setUrlEditable(secondaryView.readEntry("Editable Url", false));
- }
- else if (m_view[SecondaryIdx] != 0) {
+ m_viewContainer[PrimaryView]->setUrl(secondaryViewGroup.readEntry("Url"));
+ editable = secondaryViewGroup.readEntry("Editable Url", false);
+ m_viewContainer[PrimaryView]->urlNavigator()->setUrlEditable(editable);
+ } else if (m_viewContainer[SecondaryView] != 0) {
toggleSplitView();
}
}
void DolphinMainWindow::updateNewMenu()
{
m_newMenu->slotCheckUpToDate();
- m_newMenu->setPopupFiles(activeView()->url());
+ m_newMenu->setPopupFiles(activeViewContainer()->url());
}
void DolphinMainWindow::rename()
{
clearStatusBar();
- m_activeView->renameSelectedItems();
+ m_activeViewContainer->renameSelectedItems();
}
void DolphinMainWindow::moveToTrash()
{
clearStatusBar();
- const KUrl::List selectedUrls = m_activeView->selectedUrls();
+ const KUrl::List selectedUrls = m_activeViewContainer->view()->selectedUrls();
KonqOperations::del(this, KonqOperations::TRASH, selectedUrls);
m_undoCommandTypes.append(KonqUndoManager::TRASH);
}
{
clearStatusBar();
- const KUrl::List list = m_activeView->selectedUrls();
+ const KUrl::List list = m_activeViewContainer->view()->selectedUrls();
const bool del = KonqOperations::askDeleteConfirmation(list,
- KonqOperations::DEL,
- KonqOperations::DEFAULT_CONFIRMATION,
- this);
+ KonqOperations::DEL,
+ KonqOperations::DEFAULT_CONFIRMATION,
+ this);
if (del) {
KIO::Job* job = KIO::del(list);
void DolphinMainWindow::properties()
{
- const KFileItemList list = m_activeView->selectedItems();
- new KPropertiesDialog(list, this);
+ const KFileItemList list = m_activeViewContainer->view()->selectedItems();
+ KPropertiesDialog dialog(list, this);
+ dialog.exec();
}
void DolphinMainWindow::quit()
void DolphinMainWindow::slotHandleJobError(KJob* job)
{
if (job->error() != 0) {
- DolphinStatusBar* statusBar = m_activeView->statusBar();
+ DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();
statusBar->setMessage(job->errorString(),
DolphinStatusBar::Error);
}
void DolphinMainWindow::slotDeleteFileFinished(KJob* job)
{
if (job->error() == 0) {
- DolphinStatusBar* statusBar = m_activeView->statusBar();
+ DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();
statusBar->setMessage(i18n("Delete operation completed."),
DolphinStatusBar::OperationCompleted);
}
if (available && (m_undoCommandTypes.count() > 0)) {
const KonqUndoManager::CommandType command = m_undoCommandTypes.takeFirst();
- DolphinStatusBar* statusBar = m_activeView->statusBar();
+ DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();
switch (command) {
- case KonqUndoManager::COPY:
- statusBar->setMessage(i18n("Copy operation completed."),
- DolphinStatusBar::OperationCompleted);
- break;
- case KonqUndoManager::MOVE:
- statusBar->setMessage(i18n("Move operation completed."),
- DolphinStatusBar::OperationCompleted);
- break;
- case KonqUndoManager::LINK:
- statusBar->setMessage(i18n("Link operation completed."),
- DolphinStatusBar::OperationCompleted);
- break;
- case KonqUndoManager::TRASH:
- statusBar->setMessage(i18n("Move to trash operation completed."),
- DolphinStatusBar::OperationCompleted);
- break;
- case KonqUndoManager::RENAME:
- statusBar->setMessage(i18n("Renaming operation completed."),
- DolphinStatusBar::OperationCompleted);
- break;
-
- case KonqUndoManager::MKDIR:
- statusBar->setMessage(i18n("Created directory."),
- DolphinStatusBar::OperationCompleted);
- break;
-
- default:
- break;
+ case KonqUndoManager::COPY:
+ statusBar->setMessage(i18n("Copy operation completed."),
+ DolphinStatusBar::OperationCompleted);
+ break;
+ case KonqUndoManager::MOVE:
+ statusBar->setMessage(i18n("Move operation completed."),
+ DolphinStatusBar::OperationCompleted);
+ break;
+ case KonqUndoManager::LINK:
+ statusBar->setMessage(i18n("Link operation completed."),
+ DolphinStatusBar::OperationCompleted);
+ break;
+ case KonqUndoManager::TRASH:
+ statusBar->setMessage(i18n("Move to trash operation completed."),
+ DolphinStatusBar::OperationCompleted);
+ break;
+ case KonqUndoManager::RENAME:
+ statusBar->setMessage(i18n("Renaming operation completed."),
+ DolphinStatusBar::OperationCompleted);
+ break;
+
+ case KonqUndoManager::MKDIR:
+ statusBar->setMessage(i18n("Created folder."),
+ DolphinStatusBar::OperationCompleted);
+ break;
+
+ default:
+ break;
}
}
void DolphinMainWindow::cut()
{
QMimeData* mimeData = new QMimeData();
- const KUrl::List kdeUrls = m_activeView->selectedUrls();
+ const KUrl::List kdeUrls = m_activeViewContainer->view()->selectedUrls();
const KUrl::List mostLocalUrls;
KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, true);
QApplication::clipboard()->setMimeData(mimeData);
void DolphinMainWindow::copy()
{
QMimeData* mimeData = new QMimeData();
- const KUrl::List kdeUrls = m_activeView->selectedUrls();
+ const KUrl::List kdeUrls = m_activeViewContainer->view()->selectedUrls();
const KUrl::List mostLocalUrls;
KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, false);
const KUrl::List sourceUrls = KUrl::List::fromMimeData(mimeData);
// per default the pasting is done into the current Url of the view
- KUrl destUrl(m_activeView->url());
+ KUrl destUrl(m_activeViewContainer->url());
// check whether the pasting should be done into a selected directory
- KUrl::List selectedUrls = m_activeView->selectedUrls();
+ KUrl::List selectedUrls = m_activeViewContainer->view()->selectedUrls();
if (selectedUrls.count() == 1) {
const KFileItem fileItem(S_IFDIR,
KFileItem::Unknown,
if (KonqMimeData::decodeIsCutSelection(mimeData)) {
moveUrls(sourceUrls, destUrl);
clipboard->clear();
- }
- else {
+ } else {
copyUrls(sourceUrls, destUrl);
}
}
pasteAction->setEnabled(true);
pasteAction->setText(i18np("Paste One File", "Paste %1 Files", urls.count()));
- }
- else {
+ } else {
pasteAction->setEnabled(false);
pasteAction->setText(i18n("Paste"));
}
if (pasteAction->isEnabled()) {
- KUrl::List urls = m_activeView->selectedUrls();
+ KUrl::List urls = m_activeViewContainer->view()->selectedUrls();
const uint count = urls.count();
if (count > 1) {
// pasting should not be allowed when more than one file
// is selected
pasteAction->setEnabled(false);
- }
- else if (count == 1) {
+ } else if (count == 1) {
// Only one file is selected. Pasting is only allowed if this
// file is a directory.
// TODO: this doesn't work with remote protocols; instead we need a
- // m_activeView->selectedFileItems() to get the real KFileItems
+ // m_activeViewContainer->selectedFileItems() to get the real KFileItems
const KFileItem fileItem(S_IFDIR,
KFileItem::Unknown,
urls.first(),
void DolphinMainWindow::selectAll()
{
clearStatusBar();
- m_activeView->selectAll();
+ m_activeViewContainer->view()->selectAll();
}
void DolphinMainWindow::invertSelection()
{
clearStatusBar();
- m_activeView->invertSelection();
+ m_activeViewContainer->view()->invertSelection();
}
void DolphinMainWindow::setIconsView()
{
- m_activeView->setMode(DolphinView::IconsView);
+ m_activeViewContainer->view()->setMode(DolphinView::IconsView);
}
void DolphinMainWindow::setDetailsView()
{
- m_activeView->setMode(DolphinView::DetailsView);
+ m_activeViewContainer->view()->setMode(DolphinView::DetailsView);
}
void DolphinMainWindow::setColumnView()
{
- m_activeView->setMode(DolphinView::ColumnView);
+ m_activeViewContainer->view()->setMode(DolphinView::ColumnView);
}
void DolphinMainWindow::sortByName()
{
- m_activeView->setSorting(DolphinView::SortByName);
+ m_activeViewContainer->view()->setSorting(DolphinView::SortByName);
}
void DolphinMainWindow::sortBySize()
{
- m_activeView->setSorting(DolphinView::SortBySize);
+ m_activeViewContainer->view()->setSorting(DolphinView::SortBySize);
}
void DolphinMainWindow::sortByDate()
{
- m_activeView->setSorting(DolphinView::SortByDate);
+ m_activeViewContainer->view()->setSorting(DolphinView::SortByDate);
}
void DolphinMainWindow::sortByPermissions()
{
- m_activeView->setSorting(DolphinView::SortByPermissions);
+ m_activeViewContainer->view()->setSorting(DolphinView::SortByPermissions);
}
void DolphinMainWindow::sortByOwner()
{
- m_activeView->setSorting(DolphinView::SortByOwner);
+ m_activeViewContainer->view()->setSorting(DolphinView::SortByOwner);
}
void DolphinMainWindow::sortByGroup()
{
- m_activeView->setSorting(DolphinView::SortByGroup);
+ m_activeViewContainer->view()->setSorting(DolphinView::SortByGroup);
+}
+
+void DolphinMainWindow::sortByType()
+{
+ m_activeViewContainer->view()->setSorting(DolphinView::SortByType);
}
void DolphinMainWindow::toggleSortOrder()
{
- const Qt::SortOrder order = (m_activeView->sortOrder() == Qt::AscendingOrder) ?
+ DolphinView* view = m_activeViewContainer->view();
+ const Qt::SortOrder order = (view->sortOrder() == Qt::AscendingOrder) ?
Qt::DescendingOrder :
Qt::AscendingOrder;
- m_activeView->setSortOrder(order);
+ view->setSortOrder(order);
+}
+
+void DolphinMainWindow::toggleSortCategorization()
+{
+ DolphinView* view = m_activeViewContainer->view();
+ const bool categorizedSorting = view->categorizedSorting();
+ view->setCategorizedSorting(!categorizedSorting);
}
void DolphinMainWindow::clearInfo()
{
- m_activeView->setAdditionalInfo(KFileItemDelegate::NoInformation);
+ m_activeViewContainer->view()->setAdditionalInfo(KFileItemDelegate::NoInformation);
}
void DolphinMainWindow::showMimeInfo()
{
clearStatusBar();
- m_activeView->setAdditionalInfo(KFileItemDelegate::FriendlyMimeType);
+ m_activeViewContainer->view()->setAdditionalInfo(KFileItemDelegate::FriendlyMimeType);
}
void DolphinMainWindow::showSizeInfo()
{
clearStatusBar();
- m_activeView->setAdditionalInfo(KFileItemDelegate::Size);
+ m_activeViewContainer->view()->setAdditionalInfo(KFileItemDelegate::Size);
}
void DolphinMainWindow::showDateInfo()
{
clearStatusBar();
- m_activeView->setAdditionalInfo(KFileItemDelegate::ModificationTime);
+ m_activeViewContainer->view()->setAdditionalInfo(KFileItemDelegate::ModificationTime);
}
void DolphinMainWindow::toggleSplitView()
{
- if (m_view[SecondaryIdx] == 0) {
- const int newWidth = (m_view[PrimaryIdx]->width() - m_splitter->handleWidth()) / 2;
+ if (m_viewContainer[SecondaryView] == 0) {
+ const int newWidth = (m_viewContainer[PrimaryView]->width() - m_splitter->handleWidth()) / 2;
// create a secondary view
- m_view[SecondaryIdx] = new DolphinView(this,
- 0,
- m_view[PrimaryIdx]->url(),
- m_view[PrimaryIdx]->mode(),
- m_view[PrimaryIdx]->showHiddenFiles());
- connectViewSignals(SecondaryIdx);
- m_splitter->addWidget(m_view[SecondaryIdx]);
+ const DolphinView* view = m_viewContainer[PrimaryView]->view();
+ m_viewContainer[SecondaryView] = new DolphinViewContainer(this,
+ 0,
+ view->rootUrl(),
+ view->mode(),
+ view->showHiddenFiles());
+ connectViewSignals(SecondaryView);
+ m_splitter->addWidget(m_viewContainer[SecondaryView]);
m_splitter->setSizes(QList<int>() << newWidth << newWidth);
- m_view[SecondaryIdx]->reload();
- m_view[SecondaryIdx]->show();
- }
- else {
+ m_viewContainer[SecondaryView]->view()->reload();
+ m_viewContainer[SecondaryView]->setActive(false);
+ m_viewContainer[SecondaryView]->show();
+ } else {
// remove secondary view
- if (m_activeView == m_view[PrimaryIdx]) {
- m_view[SecondaryIdx]->close();
- m_view[SecondaryIdx]->deleteLater();
- m_view[SecondaryIdx] = 0;
- setActiveView(m_view[PrimaryIdx]);
- }
- else {
- // The secondary view is active, hence from the 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_view[PrimaryIdx]->close();
- delete m_view[PrimaryIdx];
- m_view[PrimaryIdx] = m_view[SecondaryIdx];
- m_view[SecondaryIdx] = 0;
- setActiveView(m_view[PrimaryIdx]);
- }
+ m_viewContainer[SecondaryView]->close();
+ m_viewContainer[SecondaryView]->deleteLater();
+ m_viewContainer[SecondaryView] = 0;
}
+
+ setActiveViewContainer(m_viewContainer[PrimaryView]);
+ updateViewActions();
emit activeViewChanged();
}
void DolphinMainWindow::reloadView()
{
clearStatusBar();
- m_activeView->reload();
+ m_activeViewContainer->view()->reload();
}
void DolphinMainWindow::stopLoading()
const KToggleAction* showPreviewAction =
static_cast<KToggleAction*>(actionCollection()->action("show_preview"));
const bool show = showPreviewAction->isChecked();
- m_activeView->setShowPreview(show);
+ m_activeViewContainer->view()->setShowPreview(show);
}
void DolphinMainWindow::toggleShowHiddenFiles()
const KToggleAction* showHiddenFilesAction =
static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));
const bool show = showHiddenFilesAction->isChecked();
- m_activeView->setShowHiddenFiles(show);
+ m_activeViewContainer->view()->setShowHiddenFiles(show);
}
-void DolphinMainWindow::showFilterBar()
+void DolphinMainWindow::toggleFilterBarVisibility()
{
const KToggleAction* showFilterBarAction =
static_cast<KToggleAction*>(actionCollection()->action("show_filter_bar"));
const bool show = showFilterBarAction->isChecked();
- m_activeView->showFilterBar(show);
+ m_activeViewContainer->showFilterBar(show);
}
void DolphinMainWindow::zoomIn()
{
- m_activeView->zoomIn();
+ m_activeViewContainer->view()->zoomIn();
updateViewActions();
}
void DolphinMainWindow::zoomOut()
{
- m_activeView->zoomOut();
+ m_activeViewContainer->view()->zoomOut();
updateViewActions();
}
KToggleAction* action = static_cast<KToggleAction*>(actionCollection()->action("editable_location"));
bool editOrBrowse = action->isChecked();
- m_activeView->setUrlEditable(editOrBrowse);
+ KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
+ urlNavigator->setUrlEditable(editOrBrowse);
}
void DolphinMainWindow::editLocation()
{
- m_activeView->setUrlEditable(true);
+ m_activeViewContainer->urlNavigator()->setUrlEditable(true);
}
void DolphinMainWindow::adjustViewProperties()
{
clearStatusBar();
- ViewPropertiesDialog dlg(m_activeView);
+ ViewPropertiesDialog dlg(m_activeViewContainer->view());
dlg.exec();
}
void DolphinMainWindow::goBack()
{
clearStatusBar();
- m_activeView->goBack();
+ m_activeViewContainer->urlNavigator()->goBack();
}
void DolphinMainWindow::goForward()
{
clearStatusBar();
- m_activeView->goForward();
+ m_activeViewContainer->urlNavigator()->goForward();
}
void DolphinMainWindow::goUp()
{
clearStatusBar();
- m_activeView->goUp();
+ m_activeViewContainer->urlNavigator()->goUp();
}
void DolphinMainWindow::goHome()
{
clearStatusBar();
- m_activeView->goHome();
-}
-
-void DolphinMainWindow::openTerminal()
-{
- QString command("konsole --workdir \"");
- command.append(m_activeView->url().path());
- command.append('\"');
-
- KRun::runCommand(command, "Konsole", "konsole");
+ m_activeViewContainer->urlNavigator()->goHome();
}
void DolphinMainWindow::findFile()
{
- KRun::run("kfind", m_activeView->url());
+ KRun::run("kfind", m_activeViewContainer->url(), this);
}
void DolphinMainWindow::compareFiles()
// - both in the secondary view
// - one in the primary view and the other in the secondary
// view
- Q_ASSERT(m_view[PrimaryIdx] != 0);
+ Q_ASSERT(m_viewContainer[PrimaryView] != 0);
KUrl urlA;
KUrl urlB;
- KUrl::List urls = m_view[PrimaryIdx]->selectedUrls();
+ KUrl::List urls = m_viewContainer[PrimaryView]->view()->selectedUrls();
switch (urls.count()) {
- case 0: {
- Q_ASSERT(m_view[SecondaryIdx] != 0);
- urls = m_view[SecondaryIdx]->selectedUrls();
- Q_ASSERT(urls.count() == 2);
- urlA = urls[0];
- urlB = urls[1];
- break;
- }
+ case 0: {
+ Q_ASSERT(m_viewContainer[SecondaryView] != 0);
+ urls = m_viewContainer[SecondaryView]->view()->selectedUrls();
+ Q_ASSERT(urls.count() == 2);
+ urlA = urls[0];
+ urlB = urls[1];
+ break;
+ }
- case 1: {
- urlA = urls[0];
- Q_ASSERT(m_view[SecondaryIdx] != 0);
- urls = m_view[SecondaryIdx]->selectedUrls();
- Q_ASSERT(urls.count() == 1);
- urlB = urls[0];
- break;
- }
+ case 1: {
+ urlA = urls[0];
+ Q_ASSERT(m_viewContainer[SecondaryView] != 0);
+ urls = m_viewContainer[SecondaryView]->view()->selectedUrls();
+ Q_ASSERT(urls.count() == 1);
+ urlB = urls[0];
+ break;
+ }
- case 2: {
- urlA = urls[0];
- urlB = urls[1];
- break;
- }
+ case 2: {
+ urlA = urls[0];
+ urlB = urls[1];
+ break;
+ }
- default: {
- // may not happen: compareFiles may only get invoked if 2
- // files are selected
- Q_ASSERT(false);
- }
+ default: {
+ // may not happen: compareFiles may only get invoked if 2
+ // files are selected
+ Q_ASSERT(false);
+ }
}
QString command("kompare -c \"");
command.append("\" \"");
command.append(urlB.pathOrUrl());
command.append('\"');
- KRun::runCommand(command, "Kompare", "kompare");
+ KRun::runCommand(command, "Kompare", "kompare", this);
}
void DolphinMainWindow::editSettings()
{
- // TODO: make a static method for opening the settings dialog
- DolphinSettingsDialog dlg(this);
- dlg.exec();
+ DolphinSettingsDialog dialog(this);
+ dialog.exec();
}
void DolphinMainWindow::init()
DolphinSettings& settings = DolphinSettings::instance();
- KBookmarkManager* manager = settings.bookmarkManager();
- Q_ASSERT(manager != 0);
- KBookmarkGroup root = manager->root();
- if (root.first().isNull()) {
- root.addBookmark(manager, i18n("Home"), settings.generalSettings()->homeUrl(), "folder-home");
- root.addBookmark(manager, i18n("Storage Media"), KUrl("media:/"), "hdd-mount");
- root.addBookmark(manager, i18n("Network"), KUrl("remote:/"), "network-local");
- root.addBookmark(manager, i18n("Root"), KUrl("/"), "folder-red");
- root.addBookmark(manager, i18n("Trash"), KUrl("trash:/"), "user-trash");
- }
-
setupActions();
const KUrl& homeUrl = settings.generalSettings()->homeUrl();
setCaption(homeUrl.fileName());
ViewProperties props(homeUrl);
- m_view[PrimaryIdx] = new DolphinView(this,
- m_splitter,
- homeUrl,
- props.viewMode(),
- props.showHiddenFiles());
+ m_viewContainer[PrimaryView] = new DolphinViewContainer(this,
+ m_splitter,
+ homeUrl,
+ props.viewMode(),
+ props.showHiddenFiles());
- m_activeView = m_view[PrimaryIdx];
- connectViewSignals(PrimaryIdx);
- m_view[PrimaryIdx]->reload();
- m_view[PrimaryIdx]->show();
+ m_activeViewContainer = m_viewContainer[PrimaryView];
+ connectViewSignals(PrimaryView);
+ m_viewContainer[PrimaryView]->view()->reload();
+ m_viewContainer[PrimaryView]->show();
setCentralWidget(m_splitter);
setupDockWidgets();
- setupGUI(Keys|Save|Create|ToolBar);
+ setupGUI(Keys | Save | Create | ToolBar);
createGUI();
stateChanged("new_file");
if (firstRun) {
// assure a proper default size if Dolphin runs the first time
- resize(640, 480);
+ resize(700, 500);
}
- #ifdef HAVE_KMETADATA
- if ( !MetaDataWidget::metaDataAvailable() )
- activeView()->statusBar()->setMessage(i18n("Failed to contact Nepomuk service, annotation and tagging are disabled."), DolphinStatusBar::Error);
- #endif
+#ifdef HAVE_NEPOMUK
+ if (!MetaDataWidget::metaDataAvailable())
+ activeViewContainer()->statusBar()->setMessage(i18n("Failed to contact Nepomuk service, annotation and tagging are disabled."), DolphinStatusBar::Error);
+#endif
emit urlChanged(homeUrl);
}
void DolphinMainWindow::loadSettings()
{
GeneralSettings* settings = DolphinSettings::instance().generalSettings();
+ updateSplitAction(settings->splitView());
+ updateViewActions();
+}
- KToggleAction* splitAction = static_cast<KToggleAction*>(actionCollection()->action("split_view"));
- if (settings->splitView()) {
- splitAction->setChecked(true);
- toggleSplitView();
+void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* view)
+{
+ Q_ASSERT((view == m_viewContainer[PrimaryView]) || (view == m_viewContainer[SecondaryView]));
+ if (m_activeViewContainer == view) {
+ return;
}
+ m_activeViewContainer->setActive(false);
+ m_activeViewContainer = view;
+ m_activeViewContainer->setActive(true);
+
+ updateHistory();
+ updateEditActions();
updateViewActions();
+ updateGoActions();
- // TODO: I assume there will be a generic way in KDE 4 to restore the docks
- // of the main window. In the meantime they are restored manually (see also
- // DolphinMainWindow::closeEvent() for more details):
- QString filename = KStandardDirs::locateLocal("data", KGlobal::mainComponent().componentName()); filename.append("/panels_layout");
- QFile file(filename);
- if (file.open(QIODevice::ReadOnly)) {
- QByteArray data = file.readAll();
- restoreState(data);
- file.close();
- }
+ setCaption(m_activeViewContainer->url().fileName());
+
+ emit activeViewChanged();
}
void DolphinMainWindow::setupActions()
// setup 'File' menu
m_newMenu = new DolphinNewMenu(this);
KMenu* menu = m_newMenu->menu();
- menu->setTitle(i18n("Create New..."));
+ menu->setTitle(i18n("Create New"));
menu->setIcon(KIcon("document-new"));
connect(menu, SIGNAL(aboutToShow()),
this, SLOT(updateNewMenu()));
connect(newWindow, SIGNAL(triggered()), this, SLOT(openNewMainWindow()));
QAction* rename = actionCollection()->addAction("rename");
- rename->setText(i18n("Rename"));
+ rename->setText(i18n("Rename..."));
rename->setShortcut(Qt::Key_F2);
connect(rename, SIGNAL(triggered()), this, SLOT(rename()));
// setup 'View' menu
KStandardAction::zoomIn(this,
- SLOT(zoomIn()),
- actionCollection());
+ SLOT(zoomIn()),
+ actionCollection());
KStandardAction::zoomOut(this,
- SLOT(zoomOut()),
- actionCollection());
+ SLOT(zoomOut()),
+ actionCollection());
KToggleAction* iconsView = actionCollection()->add<KToggleAction>("icons");
iconsView->setText(i18n("Icons"));
iconsView->setShortcut(Qt::CTRL | Qt::Key_1);
- iconsView->setIcon(KIcon("view-icon"));
+ iconsView->setIcon(KIcon("fileview-icon"));
connect(iconsView, SIGNAL(triggered()), this, SLOT(setIconsView()));
KToggleAction* detailsView = actionCollection()->add<KToggleAction>("details");
detailsView->setText(i18n("Details"));
detailsView->setShortcut(Qt::CTRL | Qt::Key_2);
- detailsView->setIcon(KIcon("fileview-text"));
+ detailsView->setIcon(KIcon("fileview-detailed"));
connect(detailsView, SIGNAL(triggered()), this, SLOT(setDetailsView()));
KToggleAction* columnView = actionCollection()->add<KToggleAction>("columns");
columnView->setText(i18n("Columns"));
columnView->setShortcut(Qt::CTRL | Qt::Key_3);
- columnView->setIcon(KIcon("view-tree"));
+ columnView->setIcon(KIcon("fileview-column"));
connect(columnView, SIGNAL(triggered()), this, SLOT(setColumnView()));
QActionGroup* viewModeGroup = new QActionGroup(this);
sortByGroup->setText(i18n("By Group"));
connect(sortByGroup, SIGNAL(triggered()), this, SLOT(sortByGroup()));
+ KToggleAction* sortByType = actionCollection()->add<KToggleAction>("by_type");
+ sortByType->setText(i18n("By Type"));
+ connect(sortByType, SIGNAL(triggered()), this, SLOT(sortByType()));
+
QActionGroup* sortGroup = new QActionGroup(this);
sortGroup->addAction(sortByName);
sortGroup->addAction(sortBySize);
sortGroup->addAction(sortByPermissions);
sortGroup->addAction(sortByOwner);
sortGroup->addAction(sortByGroup);
+ sortGroup->addAction(sortByType);
KToggleAction* sortDescending = actionCollection()->add<KToggleAction>("descending");
sortDescending->setText(i18n("Descending"));
connect(sortDescending, SIGNAL(triggered()), this, SLOT(toggleSortOrder()));
+ KToggleAction* sortCategorized = actionCollection()->add<KToggleAction>("categorized");
+ sortCategorized->setText(i18n("Show in Groups"));
+ connect(sortCategorized, SIGNAL(triggered()), this, SLOT(toggleSortCategorization()));
+
KToggleAction* clearInfo = actionCollection()->add<KToggleAction>("clear_info");
clearInfo->setText(i18n("No Information"));
connect(clearInfo, SIGNAL(triggered()), this, SLOT(clearInfo()));
KToggleAction* showPreview = actionCollection()->add<KToggleAction>("show_preview");
showPreview->setText(i18n("Preview"));
- showPreview->setIcon(KIcon("thumbnail-show"));
+ showPreview->setIcon(KIcon("fileview-preview"));
connect(showPreview, SIGNAL(triggered()), this, SLOT(togglePreview()));
KToggleAction* showHiddenFiles = actionCollection()->add<KToggleAction>("show_hidden_files");
showHiddenFiles->setShortcut(Qt::ALT | Qt::Key_Period);
connect(showHiddenFiles, SIGNAL(triggered()), this, SLOT(toggleShowHiddenFiles()));
- KToggleAction* split = actionCollection()->add<KToggleAction>("split_view");
- split->setText(i18n("Split"));
+ QAction* split = actionCollection()->addAction("split_view");
split->setShortcut(Qt::Key_F10);
- split->setIcon(KIcon("view-left-right"));
+ updateSplitAction(false);
connect(split, SIGNAL(triggered()), this, SLOT(toggleSplitView()));
QAction* reload = actionCollection()->addAction("reload");
KStandardAction::home(this, SLOT(goHome()), actionCollection());
// setup 'Tools' menu
- QAction* openTerminal = actionCollection()->addAction("open_terminal");
- openTerminal->setText(i18n("Open Terminal"));
- openTerminal->setShortcut(Qt::Key_F4);
- openTerminal->setIcon(KIcon("konsole"));
- connect(openTerminal, SIGNAL(triggered()), this, SLOT(openTerminal()));
-
QAction* findFile = actionCollection()->addAction("find_file");
findFile->setText(i18n("Find File..."));
- findFile->setShortcut(Qt::Key_F);
+ findFile->setShortcut(Qt::CTRL | Qt::Key_F);
findFile->setIcon(KIcon("file-find"));
connect(findFile, SIGNAL(triggered()), this, SLOT(findFile()));
KToggleAction* showFilterBar = actionCollection()->add<KToggleAction>("show_filter_bar");
showFilterBar->setText(i18n("Show Filter Bar"));
- showFilterBar->setShortcut(Qt::Key_Slash);
- connect(showFilterBar, SIGNAL(triggered()), this, SLOT(showFilterBar()));
+ showFilterBar->setShortcut(Qt::CTRL | Qt::Key_I);
+ connect(showFilterBar, SIGNAL(triggered()), this, SLOT(toggleFilterBarVisibility()));
QAction* compareFiles = actionCollection()->addAction("compare_files");
compareFiles->setText(i18n("Compare Files"));
void DolphinMainWindow::setupDockWidgets()
{
- // TODO: there's a lot copy/paste code here. Provide a generic approach
- // after the dock concept has been finalized.
-
- // setup "Bookmarks"
- QDockWidget* shortcutsDock = new QDockWidget(i18n("Bookmarks"), this);
- shortcutsDock->setObjectName("bookmarksDock");
- shortcutsDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
- SidebarPage* shortcutsWidget = new BookmarksSidebarPage(shortcutsDock);
- shortcutsDock->setWidget(shortcutsWidget);
-
-
- shortcutsDock->toggleViewAction()->setText(i18n("Show Bookmarks Panel"));
- actionCollection()->addAction("show_bookmarks_panel", shortcutsDock->toggleViewAction());
-
- addDockWidget(Qt::LeftDockWidgetArea, shortcutsDock);
- connectSidebarPage(shortcutsWidget);
-
// setup "Information"
- QDockWidget* infoDock = new QDockWidget(i18n("Information"), this);
+ QDockWidget* infoDock = new QDockWidget(i18n("Information"));
infoDock->setObjectName("infoDock");
infoDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
SidebarPage* infoWidget = new InfoSidebarPage(infoDock);
infoDock->setWidget(infoWidget);
-
- infoDock->toggleViewAction()->setText(i18n("Show Information Panel"));
+ infoDock->toggleViewAction()->setText(i18n("Information"));
actionCollection()->addAction("show_info_panel", infoDock->toggleViewAction());
addDockWidget(Qt::RightDockWidgetArea, infoDock);
- connectSidebarPage(infoWidget);
+ connect(this, SIGNAL(urlChanged(KUrl)),
+ infoWidget, SLOT(setUrl(KUrl)));
+ connect(this, SIGNAL(selectionChanged(KFileItemList)),
+ infoWidget, SLOT(setSelection(KFileItemList)));
+ connect(this, SIGNAL(requestItemInfo(KUrl)),
+ infoWidget, SLOT(requestDelayedItemInfo(KUrl)));
// setup "Tree View"
- QDockWidget* treeViewDock = new QDockWidget(i18n("Folders")); // TODO: naming?
+ QDockWidget* treeViewDock = new QDockWidget(i18n("Folders"));
treeViewDock->setObjectName("treeViewDock");
treeViewDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
TreeViewSidebarPage* treeWidget = new TreeViewSidebarPage(treeViewDock);
treeViewDock->setWidget(treeWidget);
- treeViewDock->toggleViewAction()->setText(i18n("Show Folders Panel"));
+ treeViewDock->toggleViewAction()->setText(i18n("Folders"));
actionCollection()->addAction("show_folders_panel", treeViewDock->toggleViewAction());
addDockWidget(Qt::LeftDockWidgetArea, treeViewDock);
- connectSidebarPage(treeWidget);
+ connect(this, SIGNAL(urlChanged(KUrl)),
+ treeWidget, SLOT(setUrl(KUrl)));
+ connect(treeWidget, SIGNAL(changeUrl(KUrl)),
+ this, SLOT(changeUrl(KUrl)));
+ connect(treeWidget, SIGNAL(changeSelection(KFileItemList)),
+ this, SLOT(changeSelection(KFileItemList)));
+ connect(treeWidget, SIGNAL(urlsDropped(KUrl::List, KUrl)),
+ this, SLOT(dropUrls(KUrl::List, KUrl)));
+
+ // setup "Terminal"
+ QDockWidget* terminalDock = new QDockWidget(i18n("Terminal"));
+ terminalDock->setObjectName("terminalDock");
+ terminalDock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea);
+ SidebarPage* terminalWidget = new TerminalSidebarPage(terminalDock);
+ terminalDock->setWidget(terminalWidget);
+
+ terminalDock->toggleViewAction()->setText(i18n("Terminal"));
+ actionCollection()->addAction("show_terminal_panel", terminalDock->toggleViewAction());
+
+ addDockWidget(Qt::RightDockWidgetArea, terminalDock);
+ connect(this, SIGNAL(urlChanged(KUrl)),
+ terminalWidget, SLOT(setUrl(KUrl)));
const bool firstRun = DolphinSettings::instance().generalSettings()->firstRun();
if (firstRun) {
infoDock->hide();
treeViewDock->hide();
+ terminalDock->hide();
}
- // FIXME: To merge with the current bookmark sidebar
QDockWidget *placesDock = new QDockWidget(i18n("Places"));
placesDock->setObjectName("placesDock");
placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
KFilePlacesView *listView = new KFilePlacesView(placesDock);
placesDock->setWidget(listView);
- listView->setModel(new KFilePlacesModel(listView));
+ listView->setModel(DolphinSettings::instance().placesModel());
+
+ placesDock->toggleViewAction()->setText(i18n("Show Places Panel"));
+ actionCollection()->addAction("show_places_panel", placesDock->toggleViewAction());
+
addDockWidget(Qt::LeftDockWidgetArea, placesDock);
connect(listView, SIGNAL(urlChanged(KUrl)),
this, SLOT(changeUrl(KUrl)));
void DolphinMainWindow::updateHistory()
{
- int index = 0;
+ const KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
+ const int index = urlNavigator->historyIndex();
QAction* backAction = actionCollection()->action("go_back");
if (backAction != 0) {
- backAction->setEnabled(index < m_activeView->urlNavigator()->historySize() - 1);
+ backAction->setEnabled(index < urlNavigator->historySize() - 1);
}
QAction* forwardAction = actionCollection()->action("go_forward");
void DolphinMainWindow::updateEditActions()
{
- const KFileItemList list = m_activeView->selectedItems();
+ const KFileItemList list = m_activeViewContainer->view()->selectedItems();
if (list.isEmpty()) {
stateChanged("has_no_selection");
- }
- else {
+ } else {
stateChanged("has_selection");
QAction* renameAction = actionCollection()->action("rename");
void DolphinMainWindow::updateViewActions()
{
+ const DolphinView* view = m_activeViewContainer->view();
QAction* zoomInAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::ZoomIn));
if (zoomInAction != 0) {
- zoomInAction->setEnabled(m_activeView->isZoomInPossible());
+ zoomInAction->setEnabled(view->isZoomInPossible());
}
QAction* zoomOutAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::ZoomOut));
if (zoomOutAction != 0) {
- zoomOutAction->setEnabled(m_activeView->isZoomOutPossible());
+ zoomOutAction->setEnabled(view->isZoomOutPossible());
}
QAction* action = 0;
- switch (m_activeView->mode()) {
- case DolphinView::IconsView:
- action = actionCollection()->action("icons");
- break;
- case DolphinView::DetailsView:
- action = actionCollection()->action("details");
- break;
- case DolphinView::ColumnView:
- action = actionCollection()->action("columns");
- break;
- default:
- break;
+ switch (view->mode()) {
+ case DolphinView::IconsView:
+ action = actionCollection()->action("icons");
+ break;
+ case DolphinView::DetailsView:
+ action = actionCollection()->action("details");
+ break;
+ case DolphinView::ColumnView:
+ action = actionCollection()->action("columns");
+ break;
+ default:
+ break;
}
if (action != 0) {
toggleAction->setChecked(true);
}
- slotSortingChanged(m_activeView->sorting());
- slotSortOrderChanged(m_activeView->sortOrder());
- slotAdditionalInfoChanged(m_activeView->additionalInfo());
+ slotSortingChanged(view->sorting());
+ slotSortOrderChanged(view->sortOrder());
+ slotCategorizedSortingChanged();
+ slotAdditionalInfoChanged(view->additionalInfo());
KToggleAction* showFilterBarAction =
static_cast<KToggleAction*>(actionCollection()->action("show_filter_bar"));
- showFilterBarAction->setChecked(m_activeView->isFilterBarVisible());
+ showFilterBarAction->setChecked(m_activeViewContainer->isFilterBarVisible());
KToggleAction* showPreviewAction =
static_cast<KToggleAction*>(actionCollection()->action("show_preview"));
- showPreviewAction->setChecked(m_activeView->showPreview());
+ showPreviewAction->setChecked(view->showPreview());
KToggleAction* showHiddenFilesAction =
static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));
- showHiddenFilesAction->setChecked(m_activeView->showHiddenFiles());
+ showHiddenFilesAction->setChecked(view->showHiddenFiles());
- KToggleAction* splitAction = static_cast<KToggleAction*>(actionCollection()->action("split_view"));
- splitAction->setChecked(m_view[SecondaryIdx] != 0);
+ updateSplitAction(m_viewContainer[SecondaryView] != 0);
KToggleAction* editableLocactionAction =
static_cast<KToggleAction*>(actionCollection()->action("editable_location"));
- editableLocactionAction->setChecked(m_activeView->isUrlEditable());
+ const KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
+ editableLocactionAction->setChecked(urlNavigator->isUrlEditable());
}
void DolphinMainWindow::updateGoActions()
{
QAction* goUpAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Up));
- const KUrl& currentUrl = m_activeView->url();
+ const KUrl& currentUrl = m_activeViewContainer->url();
goUpAction->setEnabled(currentUrl.upUrl() != currentUrl);
}
void DolphinMainWindow::clearStatusBar()
{
- m_activeView->statusBar()->clear();
+ m_activeViewContainer->statusBar()->clear();
}
void DolphinMainWindow::connectViewSignals(int viewIndex)
{
- DolphinView* view = m_view[viewIndex];
+ DolphinViewContainer* container = m_viewContainer[viewIndex];
+ connect(container, SIGNAL(showFilterBarChanged(bool)),
+ this, SLOT(updateFilterBarAction(bool)));
+
+ DolphinView* view = container->view();
connect(view, SIGNAL(modeChanged()),
this, SLOT(slotViewModeChanged()));
connect(view, SIGNAL(showPreviewChanged()),
this, SLOT(slotShowPreviewChanged()));
connect(view, SIGNAL(showHiddenFilesChanged()),
this, SLOT(slotShowHiddenFilesChanged()));
+ connect(view, SIGNAL(categorizedSortingChanged()),
+ this, SLOT(slotCategorizedSortingChanged()));
connect(view, SIGNAL(sortingChanged(DolphinView::Sorting)),
this, SLOT(slotSortingChanged(DolphinView::Sorting)));
connect(view, SIGNAL(sortOrderChanged(Qt::SortOrder)),
this, SLOT(slotAdditionalInfoChanged(KFileItemDelegate::AdditionalInformation)));
connect(view, SIGNAL(selectionChanged(KFileItemList)),
this, SLOT(slotSelectionChanged(KFileItemList)));
- connect(view, SIGNAL(showFilterBarChanged(bool)),
- this, SLOT(updateFilterBarAction(bool)));
- connect(view, SIGNAL(urlChanged(KUrl)),
- this, SLOT(changeUrl(KUrl)));
+ connect(view, SIGNAL(requestItemInfo(KUrl)),
+ this, SLOT(slotRequestItemInfo(KUrl)));
+ connect(view, SIGNAL(activated()),
+ this, SLOT(toggleActiveView()));
- const KUrlNavigator* navigator = view->urlNavigator();
+ const KUrlNavigator* navigator = container->urlNavigator();
connect(navigator, SIGNAL(urlChanged(const KUrl&)),
this, SLOT(changeUrl(const KUrl&)));
connect(navigator, SIGNAL(historyChanged()),
this, SLOT(slotHistoryChanged()));
}
-void DolphinMainWindow::connectSidebarPage(SidebarPage* page)
-{
- connect(page, SIGNAL(changeUrl(KUrl)),
- this, SLOT(changeUrl(KUrl)));
- connect(page, SIGNAL(changeSelection(KFileItemList)),
- this, SLOT(changeSelection(KFileItemList)));
- connect(page, SIGNAL(urlsDropped(KUrl::List,KUrl)),
- this, SLOT(dropUrls(KUrl::List,KUrl)));
- connect(this, SIGNAL(urlChanged(KUrl)),
- page, SLOT(setUrl(KUrl)));
- connect(this, SIGNAL(selectionChanged(KFileItemList)),
- page, SLOT(setSelection(KFileItemList)));
+void DolphinMainWindow::updateSplitAction(bool isSplit)
+{
+ QAction* splitAction = actionCollection()->action("split_view");
+ if (isSplit) {
+ splitAction->setText(i18n("Join"));
+ splitAction->setIcon(KIcon("fileview-join"));
+ } else {
+ splitAction->setText(i18n("Split"));
+ splitAction->setIcon(KIcon("fileview-split"));
+ }
}
DolphinMainWindow::UndoUiInterface::UndoUiInterface(DolphinMainWindow* mainWin) :
void DolphinMainWindow::UndoUiInterface::jobError(KIO::Job* job)
{
- DolphinStatusBar* statusBar = m_mainWin->activeView()->statusBar();
+ DolphinStatusBar* statusBar = m_mainWin->activeViewContainer()->statusBar();
statusBar->setMessage(job->errorString(), DolphinStatusBar::Error);
}
projects / dolphin.git / blobdiff