mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-20 00:41:23 +00:00
Internal cleanup: Remove some public toggle-slots from DolphinView. Setters- and getters are already available for implementing a toggling.
svn path=/trunk/KDE/kdebase/apps/; revision=1184459
This commit is contained in:
parent
11befe3a6b
commit
7a071873bb
|
@ -699,40 +699,6 @@ void DolphinView::setCategorizedSorting(bool categorized)
|
|||
emit categorizedSortingChanged();
|
||||
}
|
||||
|
||||
void DolphinView::toggleSortOrder()
|
||||
{
|
||||
const Qt::SortOrder order = (sortOrder() == Qt::AscendingOrder) ?
|
||||
Qt::DescendingOrder :
|
||||
Qt::AscendingOrder;
|
||||
setSortOrder(order);
|
||||
}
|
||||
|
||||
void DolphinView::toggleSortFoldersFirst()
|
||||
{
|
||||
setSortFoldersFirst(!sortFoldersFirst());
|
||||
}
|
||||
|
||||
void DolphinView::toggleAdditionalInfo(QAction* action)
|
||||
{
|
||||
const KFileItemDelegate::Information info =
|
||||
static_cast<KFileItemDelegate::Information>(action->data().toInt());
|
||||
|
||||
KFileItemDelegate::InformationList list = additionalInfo();
|
||||
|
||||
const bool show = action->isChecked();
|
||||
|
||||
const int index = list.indexOf(info);
|
||||
const bool containsInfo = (index >= 0);
|
||||
if (show && !containsInfo) {
|
||||
list.append(info);
|
||||
setAdditionalInfo(list);
|
||||
} else if (!show && containsInfo) {
|
||||
list.removeAt(index);
|
||||
setAdditionalInfo(list);
|
||||
Q_ASSERT(list.indexOf(info) < 0);
|
||||
}
|
||||
}
|
||||
|
||||
void DolphinView::mouseReleaseEvent(QMouseEvent* event)
|
||||
{
|
||||
QWidget::mouseReleaseEvent(event);
|
||||
|
|
|
@ -411,18 +411,6 @@ public slots:
|
|||
*/
|
||||
void setCategorizedSorting(bool categorized);
|
||||
|
||||
/** Switches between an ascending and descending sorting order. */
|
||||
void toggleSortOrder();
|
||||
|
||||
/** Switches between a separate sorting (with folders first) and a mixed sorting of files and folders. */
|
||||
void toggleSortFoldersFirst();
|
||||
|
||||
/**
|
||||
* Switches on or off the displaying of additional information
|
||||
* as specified by \a action.
|
||||
*/
|
||||
void toggleAdditionalInfo(QAction* action);
|
||||
|
||||
signals:
|
||||
/**
|
||||
* Is emitted if the view has been activated by e. g. a mouse click.
|
||||
|
|
|
@ -358,12 +358,16 @@ void DolphinViewActionHandler::zoomOut()
|
|||
|
||||
void DolphinViewActionHandler::toggleSortOrder()
|
||||
{
|
||||
m_currentView->toggleSortOrder();
|
||||
const Qt::SortOrder order = (m_currentView->sortOrder() == Qt::AscendingOrder) ?
|
||||
Qt::DescendingOrder :
|
||||
Qt::AscendingOrder;
|
||||
m_currentView->setSortOrder(order);
|
||||
}
|
||||
|
||||
void DolphinViewActionHandler::toggleSortFoldersFirst()
|
||||
{
|
||||
m_currentView->toggleSortFoldersFirst();
|
||||
const bool sortFirst = m_currentView->sortFoldersFirst();
|
||||
m_currentView->setSortFoldersFirst(!sortFirst);
|
||||
}
|
||||
|
||||
void DolphinViewActionHandler::slotSortOrderChanged(Qt::SortOrder order)
|
||||
|
@ -381,7 +385,24 @@ void DolphinViewActionHandler::slotSortFoldersFirstChanged(bool foldersFirst)
|
|||
void DolphinViewActionHandler::toggleAdditionalInfo(QAction* action)
|
||||
{
|
||||
emit actionBeingHandled();
|
||||
m_currentView->toggleAdditionalInfo(action);
|
||||
|
||||
const KFileItemDelegate::Information info =
|
||||
static_cast<KFileItemDelegate::Information>(action->data().toInt());
|
||||
|
||||
KFileItemDelegate::InformationList list = m_currentView->additionalInfo();
|
||||
|
||||
const bool show = action->isChecked();
|
||||
|
||||
const int index = list.indexOf(info);
|
||||
const bool containsInfo = (index >= 0);
|
||||
if (show && !containsInfo) {
|
||||
list.append(info);
|
||||
m_currentView->setAdditionalInfo(list);
|
||||
} else if (!show && containsInfo) {
|
||||
list.removeAt(index);
|
||||
m_currentView->setAdditionalInfo(list);
|
||||
Q_ASSERT(list.indexOf(info) < 0);
|
||||
}
|
||||
}
|
||||
|
||||
void DolphinViewActionHandler::slotAdditionalInfoChanged()
|
||||
|
|
Loading…
Reference in a new issue