#include <kmenubar.h>
#include <kmessagebox.h>
#include <konqmimedata.h>
+#include <konq_operations.h>
#include <kpropertiesdialog.h>
#include <kprotocolinfo.h>
#include <ktoggleaction.h>
descending->setChecked(sortDescending);
}
-void DolphinMainWindow::slotAdditionalInfoChanged(KFileItemDelegate::InformationList list)
+void DolphinMainWindow::slotAdditionalInfoChanged()
{
- QAction* showSizeInfo = actionCollection()->action("show_size_info");
- QAction* showDateInfo = actionCollection()->action("show_date_info");
- QAction* showPermissionsInfo = actionCollection()->action("show_permissions_info");
- QAction* showOwnerInfo = actionCollection()->action("show_owner_info");
- QAction* showGroupInfo = actionCollection()->action("show_group_info");
- QAction* showMimeInfo = actionCollection()->action("show_mime_info");
-
- showSizeInfo->setChecked(false);
- showDateInfo->setChecked(false);
- showPermissionsInfo->setChecked(false);
- showOwnerInfo->setChecked(false);
- showGroupInfo->setChecked(false);
- showMimeInfo->setChecked(false);
-
- const DolphinView* view = m_activeViewContainer->view();
-
- const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
- const bool enable = (view->mode() == DolphinView::DetailsView) ||
- ((view->mode() == DolphinView::IconsView) && settings->showAdditionalInfo());
-
- showSizeInfo->setEnabled(enable);
- showDateInfo->setEnabled(enable);
- showPermissionsInfo->setEnabled(enable);
- showOwnerInfo->setEnabled(enable);
- showGroupInfo->setEnabled(enable);
- showMimeInfo->setEnabled(enable);
-
- foreach (KFileItemDelegate::Information info, list) {
- switch (info) {
- case KFileItemDelegate::Size:
- showSizeInfo->setChecked(true);
- break;
- case KFileItemDelegate::ModificationTime:
- showDateInfo->setChecked(true);
- break;
- case KFileItemDelegate::Permissions:
- showPermissionsInfo->setChecked(true);
- break;
- case KFileItemDelegate::Owner:
- showOwnerInfo->setChecked(true);
- break;
- case KFileItemDelegate::OwnerAndGroup:
- showGroupInfo->setChecked(true);
- break;
- case KFileItemDelegate::FriendlyMimeType:
- showMimeInfo->setChecked(true);
- break;
- default:
- break;
- }
- }
+ DolphinView* view = m_activeViewContainer->view();
+ view->updateAdditionalInfoActions(actionCollection());
}
void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection)
}
QAction* compareFilesAction = actionCollection()->action("compare_files");
- compareFilesAction->setEnabled(selectedUrlsCount == 2);
+ if (selectedUrlsCount == 2) {
+ const bool kompareInstalled = !KGlobal::dirs()->findExe("kompare").isEmpty();
+ compareFilesAction->setEnabled(selectedUrlsCount == 2 && kompareInstalled);
+ } else {
+ compareFilesAction->setEnabled(false);
+ }
m_activeViewContainer->updateStatusBar();
}
}
+void DolphinMainWindow::createDir()
+{
+ const KUrl& url = m_activeViewContainer->view()->url();
+ KonqOperations::newDir(this, url);
+}
+
void DolphinMainWindow::updateNewMenu()
{
m_newMenu->slotCheckUpToDate();
void DolphinMainWindow::toggleSortOrder()
{
- DolphinView* view = m_activeViewContainer->view();
- const Qt::SortOrder order = (view->sortOrder() == Qt::AscendingOrder) ?
- Qt::DescendingOrder :
- Qt::AscendingOrder;
- view->setSortOrder(order);
+ m_activeViewContainer->view()->toggleSortOrder();
}
void DolphinMainWindow::toggleSortCategorization()
view->setCategorizedSorting(!categorizedSorting);
}
-void DolphinMainWindow::toggleSizeInfo()
-{
- toggleAdditionalInfo("show_size_info", KFileItemDelegate::Size);
-}
-
-void DolphinMainWindow::toggleDateInfo()
-{
- toggleAdditionalInfo("show_date_info", KFileItemDelegate::ModificationTime);
-}
-
-void DolphinMainWindow::togglePermissionsInfo()
-{
- toggleAdditionalInfo("show_permissions_info", KFileItemDelegate::Permissions);
-}
-
-void DolphinMainWindow::toggleOwnerInfo()
-{
- toggleAdditionalInfo("show_owner_info", KFileItemDelegate::Owner);
-}
-
-void DolphinMainWindow::toggleGroupInfo()
-{
- toggleAdditionalInfo("show_group_info", KFileItemDelegate::OwnerAndGroup);
-}
-
-void DolphinMainWindow::toggleMimeInfo()
-{
- toggleAdditionalInfo("show_mime_info", KFileItemDelegate::FriendlyMimeType);
-}
-
void DolphinMainWindow::toggleSplitView()
{
if (m_viewContainer[SecondaryView] == 0) {
connect(menu, SIGNAL(aboutToShow()),
this, SLOT(updateNewMenu()));
+ KAction* newDirAction = DolphinView::createNewDirAction(actionCollection());
+ connect(newDirAction, SIGNAL(triggered()), SLOT(createDir()));
+
KAction* newWindow = actionCollection()->addAction("new_window");
newWindow->setIcon(KIcon("window-new"));
newWindow->setText(i18nc("@action:inmenu File", "New &Window"));
SLOT(undo()),
actionCollection());
- //Need to remove shift+del from cut action, else the shortcut for deletejob
- //doesn't work
+ // need to remove shift+del from cut action, else the shortcut for deletejob
+ // doesn't work
KAction* cut = KStandardAction::cut(this, SLOT(cut()), actionCollection());
KShortcut cutShortcut = cut->shortcut();
cutShortcut.remove(Qt::SHIFT + Qt::Key_Delete, KShortcut::KeepEmpty);
SLOT(zoomOut()),
actionCollection());
-
KToggleAction* iconsView = DolphinView::iconsModeAction(actionCollection());
KToggleAction* detailsView = DolphinView::detailsModeAction(actionCollection());
KToggleAction* columnView = DolphinView::columnsModeAction(actionCollection());
//sortGroup->addAction(sortByRating);
//sortGroup->addAction(sortByTags);
- KToggleAction* sortDescending = actionCollection()->add<KToggleAction>("descending");
- sortDescending->setText(i18nc("@action:inmenu Sort", "Descending"));
+ KAction* sortDescending = DolphinView::createSortDescendingAction(actionCollection());
connect(sortDescending, SIGNAL(triggered()), this, SLOT(toggleSortOrder()));
KToggleAction* showInGroups = actionCollection()->add<KToggleAction>("show_in_groups");
showInGroups->setText(i18nc("@action:inmenu View", "Show in Groups"));
connect(showInGroups, SIGNAL(triggered()), this, SLOT(toggleSortCategorization()));
- KToggleAction* showSizeInfo = actionCollection()->add<KToggleAction>("show_size_info");
- showSizeInfo->setText(i18nc("@action:inmenu Additional information", "Size"));
- connect(showSizeInfo, SIGNAL(triggered()), this, SLOT(toggleSizeInfo()));
-
- KToggleAction* showDateInfo = actionCollection()->add<KToggleAction>("show_date_info");
- showDateInfo->setText(i18nc("@action:inmenu Additional information", "Date"));
- connect(showDateInfo, SIGNAL(triggered()), this, SLOT(toggleDateInfo()));
-
- KToggleAction* showPermissionsInfo = actionCollection()->add<KToggleAction>("show_permissions_info");
- showPermissionsInfo->setText(i18nc("@action:inmenu Additional information", "Permissions"));
- connect(showPermissionsInfo, SIGNAL(triggered()), this, SLOT(togglePermissionsInfo()));
-
- KToggleAction* showOwnerInfo = actionCollection()->add<KToggleAction>("show_owner_info");
- showOwnerInfo->setText(i18nc("@action:inmenu Additional information", "Owner"));
- connect(showOwnerInfo, SIGNAL(triggered()), this, SLOT(toggleOwnerInfo()));
-
- KToggleAction* showGroupInfo = actionCollection()->add<KToggleAction>("show_group_info");
- showGroupInfo->setText(i18nc("@action:inmenu Additional information", "Group"));
- connect(showGroupInfo, SIGNAL(triggered()), this, SLOT(toggleGroupInfo()));
-
- KToggleAction* showMimeInfo = actionCollection()->add<KToggleAction>("show_mime_info");
- showMimeInfo->setText(i18nc("@action:inmenu Additional information", "Type"));
- connect(showMimeInfo, SIGNAL(triggered()), this, SLOT(toggleMimeInfo()));
+ QActionGroup* showInformationActionGroup = DolphinView::createAdditionalInformationActionGroup(actionCollection());
+ connect(showInformationActionGroup, SIGNAL(triggered(QAction*)), this, SLOT(toggleAdditionalInfo(QAction*)));
KToggleAction* showPreview = actionCollection()->add<KToggleAction>("show_preview");
showPreview->setText(i18nc("@action:intoolbar", "Preview"));
- showPreview->setIcon(KIcon("fileview-preview"));
+ showPreview->setIcon(KIcon("view-preview"));
connect(showPreview, SIGNAL(triggered()), this, SLOT(togglePreview()));
KToggleAction* showHiddenFiles = actionCollection()->add<KToggleAction>("show_hidden_files");
connect(showHiddenFiles, SIGNAL(triggered()), this, SLOT(toggleShowHiddenFiles()));
KAction* split = actionCollection()->addAction("split_view");
- split->setShortcut(Qt::Key_F10);
+ split->setShortcut(Qt::Key_F3);
updateSplitAction();
connect(split, SIGNAL(triggered()), this, SLOT(toggleSplitView()));
SidebarPage* terminalWidget = new TerminalSidebarPage(terminalDock);
terminalDock->setWidget(terminalWidget);
+ connect(terminalWidget, SIGNAL(hideTerminalSidebarPage()), terminalDock, SLOT(hide()));
+
terminalDock->toggleViewAction()->setText(i18nc("@title:window", "Terminal"));
terminalDock->toggleViewAction()->setShortcut(Qt::Key_F4);
actionCollection()->addAction("show_terminal_panel", terminalDock->toggleViewAction());
slotSortingChanged(view->sorting());
slotSortOrderChanged(view->sortOrder());
slotCategorizedSortingChanged();
- slotAdditionalInfoChanged(view->additionalInfo());
+ slotAdditionalInfoChanged();
KToggleAction* showFilterBarAction =
static_cast<KToggleAction*>(actionCollection()->action("show_filter_bar"));
this, SLOT(slotSortingChanged(DolphinView::Sorting)));
connect(view, SIGNAL(sortOrderChanged(Qt::SortOrder)),
this, SLOT(slotSortOrderChanged(Qt::SortOrder)));
- connect(view, SIGNAL(additionalInfoChanged(KFileItemDelegate::InformationList)),
- this, SLOT(slotAdditionalInfoChanged(KFileItemDelegate::InformationList)));
+ connect(view, SIGNAL(additionalInfoChanged()),
+ this, SLOT(slotAdditionalInfoChanged()));
connect(view, SIGNAL(selectionChanged(KFileItemList)),
this, SLOT(slotSelectionChanged(KFileItemList)));
connect(view, SIGNAL(requestItemInfo(KFileItem)),
if (m_viewContainer[SecondaryView] != 0) {
if (m_activeViewContainer == m_viewContainer[PrimaryView]) {
splitAction->setText(i18nc("@action:intoolbar Close right view", "Close"));
- splitAction->setIcon(KIcon("fileview-close-right"));
+ splitAction->setIcon(KIcon("view-right-close"));
} else {
splitAction->setText(i18nc("@action:intoolbar Close left view", "Close"));
- splitAction->setIcon(KIcon("fileview-close-left"));
+ splitAction->setIcon(KIcon("view-left-close"));
}
} else {
splitAction->setText(i18nc("@action:intoolbar Split view", "Split"));
- splitAction->setIcon(KIcon("fileview-split"));
+ splitAction->setIcon(KIcon("view-right-new"));
}
}
-void DolphinMainWindow::toggleAdditionalInfo(const char* actionName,
- KFileItemDelegate::Information info)
+void DolphinMainWindow::toggleAdditionalInfo(QAction* action)
{
clearStatusBar();
-
- DolphinView* view = m_activeViewContainer->view();
- KFileItemDelegate::InformationList list = view->additionalInfo();
-
- const bool show = actionCollection()->action(actionName)->isChecked();
-
- const int index = list.indexOf(info);
- const bool containsInfo = (index >= 0);
- if (show && !containsInfo) {
- list.append(info);
- view->setAdditionalInfo(list);
- } else if (!show && containsInfo) {
- list.removeAt(index);
- view->setAdditionalInfo(list);
- Q_ASSERT(list.indexOf(info) < 0);
- }
+ m_activeViewContainer->view()->toggleAdditionalInfo(action);
}
DolphinMainWindow::UndoUiInterface::UndoUiInterface(DolphinMainWindow* mainWin) :
projects / dolphin.git / blobdiff