diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/dolphin_directoryviewpropertysettings.kcfg | 2 | ||||
| -rw-r--r-- | src/dolphincontroller.cpp | 13 | ||||
| -rw-r--r-- | src/dolphincontroller.h | 16 | ||||
| -rw-r--r-- | src/dolphiniconsview.cpp | 23 | ||||
| -rw-r--r-- | src/dolphiniconsview.h | 6 | ||||
| -rw-r--r-- | src/dolphinmainwindow.cpp | 108 | ||||
| -rw-r--r-- | src/dolphinmainwindow.h | 31 | ||||
| -rw-r--r-- | src/dolphinui.rc | 1 | ||||
| -rw-r--r-- | src/dolphinview.cpp | 19 | ||||
| -rw-r--r-- | src/dolphinview.h | 3 | ||||
| -rw-r--r-- | src/viewproperties.cpp | 36 | ||||
| -rw-r--r-- | src/viewproperties.h | 8 |
12 files changed, 149 insertions, 117 deletions
diff --git a/src/dolphin_directoryviewpropertysettings.kcfg b/src/dolphin_directoryviewpropertysettings.kcfg index 084a49803..2bc870a86 100644 --- a/src/dolphin_directoryviewpropertysettings.kcfg +++ b/src/dolphin_directoryviewpropertysettings.kcfg @@ -52,7 +52,7 @@ <entry name="AdditionalInfo" type="Int"> <label context="@label">Additional information</label> - <default code="true">KFileItemDelegate::NoInformation</default> + <default>0</default> </entry> <entry name="Timestamp" type="DateTime" > diff --git a/src/dolphincontroller.cpp b/src/dolphincontroller.cpp index 325608442..7723fd8ef 100644 --- a/src/dolphincontroller.cpp +++ b/src/dolphincontroller.cpp @@ -24,9 +24,10 @@ DolphinController::DolphinController(QObject* parent) : QObject(parent), m_showPreview(false), - m_showAdditionalInfo(false), m_zoomInPossible(false), - m_zoomOutPossible(false) + m_zoomOutPossible(false), + m_additionalInfoCount(0), + m_url() { } @@ -80,11 +81,11 @@ void DolphinController::setShowPreview(bool show) } } -void DolphinController::setShowAdditionalInfo(bool show) +void DolphinController::setAdditionalInfoCount(int count) { - if (m_showAdditionalInfo != show) { - m_showAdditionalInfo = show; - emit showAdditionalInfoChanged(show); + if (m_additionalInfoCount != count) { + m_additionalInfoCount = count; + emit additionalInfoCountChanged(count); } } diff --git a/src/dolphincontroller.h b/src/dolphincontroller.h index d17f34c75..d773a8548 100644 --- a/src/dolphincontroller.h +++ b/src/dolphincontroller.h @@ -77,8 +77,8 @@ public: void setShowPreview(bool show); bool showPreview() const; - void setShowAdditionalInfo(bool show); - bool showAdditionalInfo() const; + void setAdditionalInfoCount(int count); + bool additionalInfoCount() const; void triggerZoomIn(); void setZoomInPossible(bool possible); @@ -156,10 +156,10 @@ signals: void showPreviewChanged(bool show); /** - * Is emitted if the state for showing additional info has been - * changed to \a show. + * Is emitted if the number of additional informations has been + * changed to \a count. */ - void showAdditionalInfoChanged(bool show); + void additionalInfoCountChanged(int count); /** * Is emitted if the item with the index \a index should be triggered. @@ -188,9 +188,9 @@ signals: private: bool m_showPreview; - bool m_showAdditionalInfo; bool m_zoomInPossible; bool m_zoomOutPossible; + int m_additionalInfoCount; KUrl m_url; }; @@ -204,9 +204,9 @@ inline bool DolphinController::showPreview() const return m_showPreview; } -inline bool DolphinController::showAdditionalInfo() const +inline bool DolphinController::additionalInfoCount() const { - return m_showAdditionalInfo; + return m_additionalInfoCount; } inline void DolphinController::setZoomInPossible(bool possible) diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp index 9e2d3ee02..6b584612c 100644 --- a/src/dolphiniconsview.cpp +++ b/src/dolphiniconsview.cpp @@ -64,8 +64,8 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle controller, SLOT(emitViewportEntered())); connect(controller, SIGNAL(showPreviewChanged(bool)), this, SLOT(slotShowPreviewChanged(bool))); - connect(controller, SIGNAL(showAdditionalInfoChanged(bool)), - this, SLOT(slotShowAdditionalInfoChanged(bool))); + connect(controller, SIGNAL(additionalInfoCountChanged(int)), + this, SLOT(slotAdditionalInfoCountChanged(int))); connect(controller, SIGNAL(zoomIn()), this, SLOT(zoomIn())); connect(controller, SIGNAL(zoomOut()), @@ -84,7 +84,7 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle m_viewOptions.font = font; setWordWrap(settings->numberOfTextlines() > 1); - updateGridSize(controller->showPreview(), controller->showAdditionalInfo()); + updateGridSize(controller->showPreview(), controller->additionalInfoCount()); if (settings->arrangement() == QListView::TopToBottom) { setFlow(QListView::LeftToRight); @@ -230,12 +230,12 @@ void DolphinIconsView::keyPressEvent(QKeyEvent* event) void DolphinIconsView::slotShowPreviewChanged(bool showPreview) { - updateGridSize(showPreview, m_controller->showAdditionalInfo()); + updateGridSize(showPreview, m_controller->additionalInfoCount()); } -void DolphinIconsView::slotShowAdditionalInfoChanged(bool showAdditionalInfo) +void DolphinIconsView::slotAdditionalInfoCountChanged(int count) { - updateGridSize(m_controller->showPreview(), showAdditionalInfo); + updateGridSize(m_controller->showPreview(), count); } void DolphinIconsView::zoomIn() @@ -264,7 +264,7 @@ void DolphinIconsView::zoomIn() settings->setItemWidth(settings->itemWidth() + diff); settings->setItemHeight(settings->itemHeight() + diff); - updateGridSize(showPreview, m_controller->showAdditionalInfo()); + updateGridSize(showPreview, m_controller->additionalInfoCount()); } } @@ -295,7 +295,7 @@ void DolphinIconsView::zoomOut() settings->setItemWidth(settings->itemWidth() - diff); settings->setItemHeight(settings->itemHeight() - diff); - updateGridSize(showPreview, m_controller->showAdditionalInfo()); + updateGridSize(showPreview, m_controller->additionalInfoCount()); } } @@ -341,7 +341,7 @@ int DolphinIconsView::decreasedIconSize(int size) const return decSize; } -void DolphinIconsView::updateGridSize(bool showPreview, bool showAdditionalInfo) +void DolphinIconsView::updateGridSize(bool showPreview, int additionalInfoCount) { const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings(); Q_ASSERT(settings != 0); @@ -360,9 +360,8 @@ void DolphinIconsView::updateGridSize(bool showPreview, bool showAdditionalInfo) size = previewSize; } - if (showAdditionalInfo) { - itemHeight += m_viewOptions.font.pointSize() * 2; - } + Q_ASSERT(additionalInfoCount >= 0); + itemHeight += additionalInfoCount * m_viewOptions.font.pointSize() * 2; if (settings->arrangement() == QListView::TopToBottom) { // The decoration width indirectly defines the maximum diff --git a/src/dolphiniconsview.h b/src/dolphiniconsview.h index 69481eb7f..7e88f39bd 100644 --- a/src/dolphiniconsview.h +++ b/src/dolphiniconsview.h @@ -60,7 +60,7 @@ protected: private slots: void slotShowPreviewChanged(bool show); - void slotShowAdditionalInfoChanged(bool show); + void slotAdditionalInfoCountChanged(int count); void zoomIn(); void zoomOut(); @@ -76,9 +76,9 @@ private: /** * Updates the size of the grid depending on the state - * of \a showPreview and \a showAdditionalInfo. + * of \a showPreview and \a additionalInfoCount. */ - void updateGridSize(bool showPreview, bool showAdditionalInfo); + void updateGridSize(bool showPreview, int additionalInfoCount); private: DolphinController* m_controller; diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 38408d7bf..a7cbc527a 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -326,33 +326,35 @@ void DolphinMainWindow::slotSortOrderChanged(Qt::SortOrder order) void DolphinMainWindow::slotAdditionalInfoChanged(KFileItemDelegate::InformationList list) { - QAction* action = 0; - KFileItemDelegate::Information info = list.isEmpty() ? KFileItemDelegate::NoInformation : list.first(); + QAction* showMimeInfo = actionCollection()->action("show_mime_info"); + QAction* showSizeInfo = actionCollection()->action("show_size_info"); + QAction* showDateInfo = actionCollection()->action("show_date_info"); - 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; - } + showMimeInfo->setChecked(false); + showSizeInfo->setChecked(false); + showDateInfo->setChecked(false); - if (action != 0) { - KToggleAction* toggleAction = static_cast<KToggleAction*>(action); - toggleAction->setChecked(true); + const DolphinView* view = m_activeViewContainer->view(); + // currently only the icons view supports additional information + const bool enable = (view->mode() == DolphinView::IconsView); + showMimeInfo->setEnabled(enable); + showSizeInfo->setEnabled(enable); + showDateInfo->setEnabled(enable); - QActionGroup* group = toggleAction->actionGroup(); - Q_ASSERT(group != 0); - const DolphinView* view = m_activeViewContainer->view(); - group->setEnabled(view->mode() == DolphinView::IconsView); + foreach (KFileItemDelegate::Information info, list) { + switch (info) { + case KFileItemDelegate::FriendlyMimeType: + showMimeInfo->setChecked(true); + break; + case KFileItemDelegate::Size: + showSizeInfo->setChecked(true); + break; + case KFileItemDelegate::ModificationTime: + showDateInfo->setChecked(true); + break; + default: + break; + } } } @@ -776,27 +778,19 @@ void DolphinMainWindow::toggleSortCategorization() view->setCategorizedSorting(!categorizedSorting); } -void DolphinMainWindow::clearInfo() +void DolphinMainWindow::toggleMimeInfo() { - m_activeViewContainer->view()->setAdditionalInfo(KFileItemDelegate::NoInformation); + toggleAdditionalInfo("show_mime_info", KFileItemDelegate::FriendlyMimeType); } -void DolphinMainWindow::showMimeInfo() +void DolphinMainWindow::toggleSizeInfo() { - clearStatusBar(); - m_activeViewContainer->view()->setAdditionalInfo(KFileItemDelegate::FriendlyMimeType); + toggleAdditionalInfo("show_size_info", KFileItemDelegate::Size); } -void DolphinMainWindow::showSizeInfo() +void DolphinMainWindow::toggleDateInfo() { - clearStatusBar(); - m_activeViewContainer->view()->setAdditionalInfo(KFileItemDelegate::Size); -} - -void DolphinMainWindow::showDateInfo() -{ - clearStatusBar(); - m_activeViewContainer->view()->setAdditionalInfo(KFileItemDelegate::ModificationTime); + toggleAdditionalInfo("show_date_info", KFileItemDelegate::ModificationTime); } void DolphinMainWindow::toggleSplitView() @@ -1245,27 +1239,17 @@ void DolphinMainWindow::setupActions() showInGroups->setText(i18nc("@action:inmenu View", "Show in Groups")); connect(showInGroups, SIGNAL(triggered()), this, SLOT(toggleSortCategorization())); - KToggleAction* clearInfo = actionCollection()->add<KToggleAction>("clear_info"); - clearInfo->setText(i18nc("@action:inmenu Additional information", "No Information")); - connect(clearInfo, SIGNAL(triggered()), this, SLOT(clearInfo())); - KToggleAction* showMimeInfo = actionCollection()->add<KToggleAction>("show_mime_info"); showMimeInfo->setText(i18nc("@action:inmenu Additional information", "Type")); - connect(showMimeInfo, SIGNAL(triggered()), this, SLOT(showMimeInfo())); + connect(showMimeInfo, SIGNAL(triggered()), this, SLOT(toggleMimeInfo())); KToggleAction* showSizeInfo = actionCollection()->add<KToggleAction>("show_size_info"); showSizeInfo->setText(i18nc("@action:inmenu Additional information", "Size")); - connect(showSizeInfo, SIGNAL(triggered()), this, SLOT(showSizeInfo())); + 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(showDateInfo())); - - QActionGroup* infoGroup = new QActionGroup(this); - infoGroup->addAction(clearInfo); - infoGroup->addAction(showMimeInfo); - infoGroup->addAction(showSizeInfo); - infoGroup->addAction(showDateInfo); + connect(showDateInfo, SIGNAL(triggered()), this, SLOT(toggleDateInfo())); KToggleAction* showPreview = actionCollection()->add<KToggleAction>("show_preview"); showPreview->setText(i18nc("@action:intoolbar", "Preview")); @@ -1612,6 +1596,28 @@ void DolphinMainWindow::updateSplitAction() } } +void DolphinMainWindow::toggleAdditionalInfo(const char* actionName, + KFileItemDelegate::Information info) +{ + 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); + } +} + DolphinMainWindow::UndoUiInterface::UndoUiInterface(DolphinMainWindow* mainWin) : KonqUndoManager::UiInterface(mainWin), m_mainWin(mainWin) diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index 806399b6d..991312c0c 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -27,9 +27,10 @@ #include <config-nepomuk.h> -#include <kxmlguiwindow.h> -#include <ksortablelist.h> +#include <kfileitemdelegate.h> #include <konq_undo.h> +#include <ksortablelist.h> +#include <kxmlguiwindow.h> #include <QtCore/QList> @@ -292,20 +293,14 @@ private slots: /** Switches between sorting by categories or not. */ void toggleSortCategorization(); - /** - * Clears any additional information for an item except for the - * name and the icon. - */ - void clearInfo(); - - /** Shows the MIME type as additional information for the item. */ - void showMimeInfo(); + /** Switches between showing the MIME type as additional information for the item or not. */ + void toggleMimeInfo(); - /** Shows the size as additional information for the item. */ - void showSizeInfo(); + /** Switches between showing the size as additional information for the item or not. */ + void toggleSizeInfo(); - /** Shows the date as additional information for the item. */ - void showDateInfo(); + /** Switchtes between showing the date as additional information for the item or not. */ + void toggleDateInfo(); /** * Switches between one and two views: @@ -463,6 +458,14 @@ private: */ void updateSplitAction(); + /** + * Helper method for the slots toggleDateInfo(), toggleSizeInfo() + * and toggleMimeInfo(). Applies \a info dependent from the current + * checked state of the action \a actionName to the file item delegate. + */ + void toggleAdditionalInfo(const char* actionName, + KFileItemDelegate::Information info); + private: /** * DolphinMainWindow supports up to two views beside each other. diff --git a/src/dolphinui.rc b/src/dolphinui.rc index 235359fbf..21d10c5f7 100644 --- a/src/dolphinui.rc +++ b/src/dolphinui.rc @@ -38,7 +38,6 @@ </Menu> <Menu name="additional_info"> <text context="@title:menu">Additional Information</text> - <Action name="clear_info" /> <Action name="show_mime_info" /> <Action name="show_size_info" /> <Action name="show_date_info" /> diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index 30e3e7fe7..6a6c40c7b 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -412,22 +412,13 @@ void DolphinView::setAdditionalInfo(KFileItemDelegate::InformationList info) ViewProperties props(viewPropsUrl); props.setAdditionalInfo(info); - m_controller->setShowAdditionalInfo(!info.isEmpty()); + m_controller->setAdditionalInfoCount(info.count()); m_fileItemDelegate->setShowInformation(info); emit additionalInfoChanged(info); startDirLister(viewPropsUrl, true); } -void DolphinView::setAdditionalInfo(KFileItemDelegate::Information info) -{ - KFileItemDelegate::InformationList list; - if (info != KFileItemDelegate::NoInformation) - list << info; - - setAdditionalInfo(list); -} - KFileItemDelegate::InformationList DolphinView::additionalInfo() const { return m_fileItemDelegate->showInformation(); @@ -658,7 +649,7 @@ void DolphinView::applyViewProperties(const KUrl& url) KFileItemDelegate::InformationList info = props.additionalInfo(); if (info != m_fileItemDelegate->showInformation()) { - m_controller->setShowAdditionalInfo(!info.isEmpty()); + m_controller->setAdditionalInfoCount(info.count()); m_fileItemDelegate->setShowInformation(info); emit additionalInfoChanged(info); } @@ -807,6 +798,11 @@ void DolphinView::clearHoverInformation() void DolphinView::createView() { + KFileItemDelegate::InformationList infoList; + if (m_fileItemDelegate != 0) { + infoList = m_fileItemDelegate->showInformation(); + } + // delete current view QAbstractItemView* view = itemView(); if (view != 0) { @@ -846,6 +842,7 @@ void DolphinView::createView() Q_ASSERT(view != 0); m_fileItemDelegate = new KFileItemDelegate(view); + m_fileItemDelegate->setShowInformation(infoList); view->setItemDelegate(m_fileItemDelegate); view->setModel(m_proxyModel); diff --git a/src/dolphinview.h b/src/dolphinview.h index 96c649d97..c3d1c7abc 100644 --- a/src/dolphinview.h +++ b/src/dolphinview.h @@ -281,9 +281,6 @@ public: /** Sets the additional information which should be shown for the items. */ void setAdditionalInfo(KFileItemDelegate::InformationList info); - /** Sets the additional information which should be shown for the items. */ - void setAdditionalInfo(KFileItemDelegate::Information info); - /** Returns the additional information which should be shown for the items. */ KFileItemDelegate::InformationList additionalInfo() const; diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp index 8dc5b8ad6..f5fdbbf3a 100644 --- a/src/viewproperties.cpp +++ b/src/viewproperties.cpp @@ -199,8 +199,22 @@ Qt::SortOrder ViewProperties::sortOrder() const void ViewProperties::setAdditionalInfo(KFileItemDelegate::InformationList list) { - KFileItemDelegate::Information info = list.isEmpty() ? - KFileItemDelegate::NoInformation : list.first(); + int info = NoInfo; + foreach (KFileItemDelegate::Information currentInfo, list) { + switch (currentInfo) { + case KFileItemDelegate::FriendlyMimeType: + info = info | TypeInfo; + break; + case KFileItemDelegate::Size: + info = info | SizeInfo; + break; + case KFileItemDelegate::ModificationTime: + info = info | DateInfo; + break; + default: + break; + } + } if (m_node->additionalInfo() != info) { m_node->setAdditionalInfo(info); @@ -210,12 +224,20 @@ void ViewProperties::setAdditionalInfo(KFileItemDelegate::InformationList list) KFileItemDelegate::InformationList ViewProperties::additionalInfo() const { - KFileItemDelegate::Information info = static_cast<KFileItemDelegate::Information>(m_node->additionalInfo()); + const int info = m_node->additionalInfo(); + + KFileItemDelegate::InformationList list; + if (info & TypeInfo) { + list.append(KFileItemDelegate::FriendlyMimeType); + } + if (info & SizeInfo) { + list.append(KFileItemDelegate::Size); + } + if (info & DateInfo) { + list.append(KFileItemDelegate::ModificationTime); + } - if (info != KFileItemDelegate::NoInformation) - return KFileItemDelegate::InformationList() << info; - else - return KFileItemDelegate::InformationList(); + return list; } diff --git a/src/viewproperties.h b/src/viewproperties.h index 155d4e2f5..70c33b11b 100644 --- a/src/viewproperties.h +++ b/src/viewproperties.h @@ -120,6 +120,14 @@ private: Q_DISABLE_COPY(ViewProperties) private: + enum AdditionalInfoValues + { + NoInfo = 0, + TypeInfo = 1, + SizeInfo = 2, + DateInfo = 4 + }; + bool m_changedProps; bool m_autoSave; QString m_filepath; |