gwenview: drop the tree view

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/gwenview/importer/thumbnailpage.cpp b/gwenview/importer/thumbnailpage.cpp
index 38225d3..534f04c 100644 (file)
--- a/gwenview/importer/thumbnailpage.cpp
+++ b/gwenview/importer/thumbnailpage.cpp
@@ -32,7 +32,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include <KDirModel>
 #include <KIconLoader>
 #include <KIO/NetAccess>
-#include <kmodelindexproxymapper.h>
 #include <KLocale>
 
 // Local
@@ -86,7 +85,6 @@ struct ThumbnailPagePrivate : public Ui_ThumbnailPage
     QString mSrcBaseName;
     KUrl mSrcBaseUrl;
     KUrl mSrcUrl;
-    KModelIndexProxyMapper* mSrcUrlModelProxyMapper;
 
     RecursiveDirModel* mRecursiveDirModel;
     QAbstractItemModel* mFinalModel;
@@ -131,11 +129,7 @@ struct ThumbnailPagePrivate : public Ui_ThumbnailPage
 
     void setupSrcUrlWidgets()
     {
-        mSrcUrlModelProxyMapper = 0;
-        QObject::connect(mSrcUrlButton, SIGNAL(clicked()), q, SLOT(setupSrcUrlTreeView()));
-        QObject::connect(mSrcUrlButton, SIGNAL(clicked()), q, SLOT(toggleSrcUrlTreeView()));
-        mSrcUrlTreeView->hide();
-        KAcceleratorManager::setNoAccel(mSrcUrlButton);
+        KAcceleratorManager::setNoAccel(mSrcUrlLabel);
     }
 
     void setupDstUrlRequester()
@@ -281,7 +275,7 @@ void ThumbnailPage::openUrl(const KUrl& url)
         path.replace("/", QString::fromUtf8(" › "));
         text = QString::fromUtf8("%1 › %2").arg(d->mSrcBaseName).arg(path);
     }
-    d->mSrcUrlButton->setText(text);
+    d->mSrcUrlLabel->setText(text);
     d->mRecursiveDirModel->setUrl(url);
 }
 
@@ -388,61 +382,4 @@ private:
     QString mName;
 };
 
-void ThumbnailPage::setupSrcUrlTreeView()
-{
-    if (d->mSrcUrlTreeView->model()) {
-        // Already initialized
-        return;
-    }
-    KDirModel* dirModel = new KDirModel(this);
-    dirModel->dirLister()->setDirOnlyMode(true);
-    dirModel->dirLister()->openUrl(d->mSrcBaseUrl.upUrl());
-
-    OnlyBaseUrlProxyModel* onlyBaseUrlModel = new OnlyBaseUrlProxyModel(d->mSrcBaseUrl, d->mSrcBaseIcon, d->mSrcBaseName, this);
-    onlyBaseUrlModel->setSourceModel(dirModel);
-
-    QSortFilterProxyModel* sortModel = new QSortFilterProxyModel(this);
-    sortModel->setDynamicSortFilter(true);
-    sortModel->setSourceModel(onlyBaseUrlModel);
-    sortModel->sort(0);
-
-    d->mSrcUrlModelProxyMapper = new KModelIndexProxyMapper(dirModel, sortModel, this);
-
-    d->mSrcUrlTreeView->setModel(sortModel);
-    for(int i = 1; i < dirModel->columnCount(); ++i) {
-        d->mSrcUrlTreeView->hideColumn(i);
-    }
-    connect(d->mSrcUrlTreeView, SIGNAL(activated(QModelIndex)), SLOT(openUrlFromIndex(QModelIndex)));
-    connect(d->mSrcUrlTreeView, SIGNAL(clicked(QModelIndex)), SLOT(openUrlFromIndex(QModelIndex)));
-
-    dirModel->expandToUrl(d->mSrcUrl);
-    connect(dirModel, SIGNAL(expand(QModelIndex)), SLOT(slotSrcUrlModelExpand(QModelIndex)));
-}
-
-void ThumbnailPage::slotSrcUrlModelExpand(const QModelIndex& index)
-{
-    QModelIndex viewIndex = d->mSrcUrlModelProxyMapper->mapLeftToRight(index);
-    d->mSrcUrlTreeView->expand(viewIndex);
-    KFileItem item = itemForIndex(index);
-    if (item.url() == d->mSrcUrl) {
-        d->mSrcUrlTreeView->selectionModel()->select(viewIndex, QItemSelectionModel::ClearAndSelect);
-    }
-}
-
-void ThumbnailPage::toggleSrcUrlTreeView()
-{
-    d->mSrcUrlTreeView->setVisible(!d->mSrcUrlTreeView->isVisible());
-}
-
-void ThumbnailPage::openUrlFromIndex(const QModelIndex& index)
-{
-    KFileItem item = itemForIndex(index);
-    if (item.isNull()) {
-        return;
-    }
-    KUrl url = item.url();
-    d->rememberUrl(url);
-    openUrl(url);
-}
-
 } // namespace

diff --git a/gwenview/importer/thumbnailpage.h b/gwenview/importer/thumbnailpage.h
index bafc821..d28b7fe 100644 (file)
--- a/gwenview/importer/thumbnailpage.h
+++ b/gwenview/importer/thumbnailpage.h
@@ -64,10 +64,6 @@ private Q_SLOTS:
     void openUrl(const KUrl&);
     void slotDocumentDirFinderDone(const KUrl& url, DocumentDirFinder::Status status);
     void showConfigDialog();
-    void openUrlFromIndex(const QModelIndex& index);
-    void setupSrcUrlTreeView();
-    void toggleSrcUrlTreeView();
-    void slotSrcUrlModelExpand(const QModelIndex& index);
 
 private:
     friend struct ThumbnailPagePrivate;

diff --git a/gwenview/importer/thumbnailpage.ui b/gwenview/importer/thumbnailpage.ui
index e40819b..f093752 100644 (file)
--- a/gwenview/importer/thumbnailpage.ui
+++ b/gwenview/importer/thumbnailpage.ui
@@ -101,26 +101,6 @@ QLabel[isIcon=true] {
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
-        <widget class="QTreeView" name="mSrcUrlTreeView">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-           <horstretch>1</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="frameShape">
-          <enum>QFrame::NoFrame</enum>
-         </property>
-         <property name="editTriggers">
-          <set>QAbstractItemView::NoEditTriggers</set>
-         </property>
-         <property name="showDropIndicator" stdset="0">
-          <bool>false</bool>
-         </property>
-         <property name="headerHidden">
-          <bool>true</bool>
-         </property>
-        </widget>
         <widget class="Gwenview::ThumbnailView" name="mThumbnailView">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -220,12 +200,12 @@ QLabel[isIcon=true] {
          <string>Listing content of:</string>
         </property>
         <property name="buddy">
-         <cstring>mSrcUrlButton</cstring>
+         <cstring>mSrcUrlLabel</cstring>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="KPushButton" name="mSrcUrlButton"/>
+       <widget class="QLabel" name="mSrcUrlLabel"/>
       </item>
       <item>
        <spacer name="horizontalSpacer_2">
@@ -274,7 +254,6 @@ QLabel[isIcon=true] {
  </customwidgets>
  <tabstops>
   <tabstop>mSrcUrlButton</tabstop>
-  <tabstop>mSrcUrlTreeView</tabstop>
   <tabstop>mThumbnailView</tabstop>
   <tabstop>mDstUrlRequester</tabstop>
   <tabstop>mConfigureButton</tabstop>