X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/093efca22dfd247f06e2a669ad968300e71ef08d..3c1c185400a55103cea3ed567de167df87b59945:/src/dolphincolumnview.cpp

diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index 3f6523ebe..7cb87e654 100644
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -71,7 +71,7 @@ public:
     void setUrl(const KUrl& url);
 
     /** Returns the directory URL that is shown inside the column widget. */
-    inline const KUrl& url() const;
+    const KUrl& url() const;
 
 protected:
     virtual QStyleOptionViewItem viewOptions() const;
@@ -139,6 +139,8 @@ ColumnWidget::ColumnWidget(QWidget* parent,
     const int iconSize = settings->iconSize();
     m_viewOptions.decorationSize = QSize(iconSize, iconSize);
 
+    m_viewOptions.showDecorationSelected = true;
+
     KFileItemDelegate* delegate = new KFileItemDelegate(this);
     setItemDelegate(delegate);
 
@@ -195,12 +197,12 @@ inline void ColumnWidget::setUrl(const KUrl& url)
     m_url = url;
 }
 
-const KUrl& ColumnWidget::url() const
+inline const KUrl& ColumnWidget::url() const
 {
     return m_url;
 }
 
-QStyleOptionViewItem ColumnWidget::viewOptions() const
+inline QStyleOptionViewItem ColumnWidget::viewOptions() const
 {
     return m_viewOptions;
 }
@@ -416,15 +418,15 @@ DolphinColumnView::DolphinColumnView(QWidget* parent, DolphinController* control
     connect(horizontalScrollBar(), SIGNAL(valueChanged(int)),
             this, SLOT(moveContentHorizontally(int)));
 
+    m_animation = new QTimeLine(500, this);
+    connect(m_animation, SIGNAL(frameChanged(int)), horizontalScrollBar(), SLOT(setValue(int)));
+
     ColumnWidget* column = new ColumnWidget(viewport(), this, m_controller->url());
     m_columns.append(column);
     setActiveColumnIndex(0);
 
     updateDecorationSize();
 
-    m_animation = new QTimeLine(500, this);
-    connect(m_animation, SIGNAL(frameChanged(int)), horizontalScrollBar(), SLOT(setValue(int)));
-
     // dim the background of the viewport
     QColor bgColor = KColorScheme(QPalette::Active, KColorScheme::View).background().color();
     const QColor fgColor = KColorScheme(QPalette::Active, KColorScheme::View).foreground().color();
@@ -495,8 +497,8 @@ void DolphinColumnView::invertSelection()
 
     KDirLister* dirLister = m_dolphinModel->dirLister();
     const KFileItemList list = dirLister->itemsForDir(column->url());
-    foreach (KFileItem* item, list) {
-        const QModelIndex index = m_dolphinModel->indexForUrl(item->url());
+    foreach (const KFileItem item, list) {
+        const QModelIndex index = m_dolphinModel->indexForUrl(item.url());
         selModel->select(m_proxyModel->mapFromSource(index), QItemSelectionModel::Toggle);
     }
 }
@@ -615,8 +617,6 @@ void DolphinColumnView::showColumn(const KUrl& url)
             columnIndex++;
 
             ColumnWidget* column = new ColumnWidget(viewport(), this, childUrl);
-            column->setVerticalScrollMode(ColumnWidget::ScrollPerPixel);
-            column->setHorizontalScrollMode(ColumnWidget::ScrollPerPixel);
             column->setModel(model());
             column->setRootIndex(proxyIndex);
             column->setActive(false);
@@ -641,6 +641,7 @@ void DolphinColumnView::showColumn(const KUrl& url)
     activeColumn()->setActive(false);
     m_index = columnIndex;
     activeColumn()->setActive(true);
+    assureVisibleActiveColumn();
 }
 
 void DolphinColumnView::selectAll()
@@ -733,10 +734,9 @@ void DolphinColumnView::zoomIn()
 {
     if (isZoomInPossible()) {
         ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
-        // TODO: get rid of K3Icon sizes
         switch (settings->iconSize()) {
-        case K3Icon::SizeSmall:  settings->setIconSize(K3Icon::SizeMedium); break;
-        case K3Icon::SizeMedium: settings->setIconSize(K3Icon::SizeLarge); break;
+        case KIconLoader::SizeSmall:  settings->setIconSize(KIconLoader::SizeMedium); break;
+        case KIconLoader::SizeMedium: settings->setIconSize(KIconLoader::SizeLarge); break;
         default: Q_ASSERT(false); break;
         }
         updateDecorationSize();
@@ -747,10 +747,9 @@ void DolphinColumnView::zoomOut()
 {
     if (isZoomOutPossible()) {
         ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
-        // TODO: get rid of K3Icon sizes
         switch (settings->iconSize()) {
-        case K3Icon::SizeLarge:  settings->setIconSize(K3Icon::SizeMedium); break;
-        case K3Icon::SizeMedium: settings->setIconSize(K3Icon::SizeSmall); break;
+        case KIconLoader::SizeLarge:  settings->setIconSize(KIconLoader::SizeMedium); break;
+        case KIconLoader::SizeMedium: settings->setIconSize(KIconLoader::SizeSmall); break;
         default: Q_ASSERT(false); break;
         }
         updateDecorationSize();
@@ -759,7 +758,7 @@ void DolphinColumnView::zoomOut()
 
 void DolphinColumnView::moveContentHorizontally(int x)
 {
-    m_contentX = -x;
+    m_contentX = isRightToLeft() ? +x : -x;
     layoutColumns();
 }
 
@@ -805,11 +804,6 @@ void DolphinColumnView::triggerUpdateColumns(const QModelIndex& index)
 
 void DolphinColumnView::updateColumns()
 {
-    KDirLister* dirLister = m_dolphinModel->dirLister();
-    foreach (ColumnWidget* column, m_columns) {
-        dirLister->updateDirectory(column->url());
-    }
-
     const int end = m_columns.count() - 2; // next to last column
     for (int i = 0; i <= end; ++i) {
         ColumnWidget* nextColumn = m_columns[i + 1];
@@ -829,7 +823,6 @@ void DolphinColumnView::updateColumns()
             }
         }
     }
-    assureVisibleActiveColumn();
 }
 
 void DolphinColumnView::slotDirListerStarted(const KUrl& url)
@@ -847,13 +840,13 @@ void DolphinColumnView::slotDirListerCompleted()
 bool DolphinColumnView::isZoomInPossible() const
 {
     ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
-    return settings->iconSize() < K3Icon::SizeLarge;
+    return settings->iconSize() < KIconLoader::SizeLarge;
 }
 
 bool DolphinColumnView::isZoomOutPossible() const
 {
     ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
-    return settings->iconSize() > K3Icon::SizeSmall;
+    return settings->iconSize() > KIconLoader::SizeSmall;
 }
 
 void DolphinColumnView::setActiveColumnIndex(int index)
@@ -871,16 +864,26 @@ void DolphinColumnView::setActiveColumnIndex(int index)
     m_columns[m_index]->setActive(true);
 
     m_controller->setUrl(m_columns[m_index]->url());
+
+    assureVisibleActiveColumn();
 }
 
 void DolphinColumnView::layoutColumns()
 {
-    int x = m_contentX;
     ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
     const int columnWidth = settings->columnWidth();
-    foreach (ColumnWidget* column, m_columns) {
-        column->setGeometry(QRect(x, 0, columnWidth, viewport()->height()));
-        x += columnWidth;
+    if (isRightToLeft()) {
+        int x = viewport()->width() - columnWidth + m_contentX;
+        foreach (ColumnWidget* column, m_columns) {
+            column->setGeometry(QRect(x, 0, columnWidth, viewport()->height()));
+            x -= columnWidth;
+        }
+    } else {
+        int x = m_contentX;
+        foreach (ColumnWidget* column, m_columns) {
+            column->setGeometry(QRect(x, 0, columnWidth, viewport()->height()));
+            x += columnWidth;
+        }
     }
 }
 
@@ -901,15 +904,20 @@ void DolphinColumnView::assureVisibleActiveColumn()
     const int x = activeColumn()->x();
     const int width = activeColumn()->width();
     if (x + width > viewportWidth) {
-        int newContentX = m_contentX - x - width + viewportWidth;
-        if (newContentX > 0) {
-            newContentX = 0;
+        const int newContentX = m_contentX - x - width + viewportWidth;
+        if (isRightToLeft()) {
+            m_animation->setFrameRange(m_contentX, newContentX);
+        } else {
+            m_animation->setFrameRange(-m_contentX, -newContentX);
         }
-        m_animation->setFrameRange(-m_contentX, -newContentX);
         m_animation->start();
     } else if (x < 0) {
         const int newContentX = m_contentX - x;
-        m_animation->setFrameRange(-m_contentX, -newContentX);
+        if (isRightToLeft()) {
+            m_animation->setFrameRange(m_contentX, newContentX);
+        } else {
+            m_animation->setFrameRange(-m_contentX, -newContentX);
+        }
         m_animation->start();
     }
 }
@@ -923,7 +931,6 @@ void DolphinColumnView::requestActivation(ColumnWidget* column)
         foreach (ColumnWidget* currColumn, m_columns) {
             if (currColumn == column) {
                 setActiveColumnIndex(index);
-                assureVisibleActiveColumn();
                 return;
             }
             ++index;