From 39f7968bf5c7135c0209b43e0310aa8eef74557a Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sat, 16 Jul 2011 08:51:02 +0000 Subject: Remove BrowseDirTree. With the rework of the mountpoint selection the tree browser isn't used anymore. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30142 a1c6a512-1295-4272-9138-f99709370657 --- rbutil/rbutilqt/browsedirtree.cpp | 96 ------------------------------- rbutil/rbutilqt/browsedirtree.h | 51 ----------------- rbutil/rbutilqt/browsedirtreefrm.ui | 105 ---------------------------------- rbutil/rbutilqt/createvoicewindow.cpp | 1 - rbutil/rbutilqt/encttscfggui.cpp | 1 - rbutil/rbutilqt/installtalkwindow.cpp | 1 - rbutil/rbutilqt/rbutilqt.pri | 3 - 7 files changed, 258 deletions(-) delete mode 100644 rbutil/rbutilqt/browsedirtree.cpp delete mode 100644 rbutil/rbutilqt/browsedirtree.h delete mode 100644 rbutil/rbutilqt/browsedirtreefrm.ui diff --git a/rbutil/rbutilqt/browsedirtree.cpp b/rbutil/rbutilqt/browsedirtree.cpp deleted file mode 100644 index 6c7beb9aa9..0000000000 --- a/rbutil/rbutilqt/browsedirtree.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * - * Copyright (C) 2007 by Dominik Riebeling - * $Id$ - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#include - -#include "browsedirtree.h" -#include "ui_browsedirtreefrm.h" - - -BrowseDirtree::BrowseDirtree(QWidget *parent, const QString &caption) : QDialog(parent) -{ - ui.setupUi(this); - this->setModal(true); - ui.tree->setModel(&model); - model.setReadOnly(true); - model.setSorting(QDir::Name | QDir::DirsFirst | QDir::IgnoreCase); - - if(caption!="") - setWindowTitle(caption); - - // disable size / date / type columns - ui.tree->setColumnHidden(1, true); - ui.tree->setColumnHidden(2, true); - ui.tree->setColumnHidden(3, true); - ui.tree->setAlternatingRowColors(true); - ui.tree->setLayoutDirection(Qt::LeftToRight); -} - - -void BrowseDirtree::setDir(const QDir &dir) -{ - qDebug() << "[BrowseDirtree] setDir()" << model.index(dir.absolutePath()); - - // do not try to hilight directory if it's not valid. - if(!dir.exists()) return; - // hilight the set directory if it's valid - if(model.index(dir.absolutePath()).isValid()) { - QModelIndex p = model.index(dir.absolutePath()); - ui.tree->setCurrentIndex(p); - ui.tree->expand(p); - ui.tree->scrollTo(p); - ui.tree->resizeColumnToContents(0); - } -} - -void BrowseDirtree::setDir(const QString &dir) -{ - QDir d(dir); - setDir(d); -} - -void BrowseDirtree::setRoot(const QString &dir) -{ - ui.tree->setRootIndex(model.index(dir)); -} - -void BrowseDirtree::setFilter(const QDir::Filters &filters) -{ - model.setFilter(filters); -} - - -void BrowseDirtree::accept() -{ - QString path; - path = model.filePath(ui.tree->currentIndex()); - - this->close(); - emit itemChanged(QDir::toNativeSeparators(path)); - setResult(QDialog::Accepted); -} - -QString BrowseDirtree::getSelected() -{ - QString path; - path = model.filePath(ui.tree->currentIndex()); - return QDir::toNativeSeparators(path); -} - - diff --git a/rbutil/rbutilqt/browsedirtree.h b/rbutil/rbutilqt/browsedirtree.h deleted file mode 100644 index 057d8069fa..0000000000 --- a/rbutil/rbutilqt/browsedirtree.h +++ /dev/null @@ -1,51 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * - * Copyright (C) 2007 by Dominik Riebeling - * $Id$ - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#ifndef BROWSEDIRTREE_H -#define BROWSEDIRTREE_H - -#include -#include "ui_browsedirtreefrm.h" - -class BrowseDirtree : public QDialog -{ - Q_OBJECT - - public: - BrowseDirtree(QWidget *parent = 0, const QString &caption=""); - void setFilter(const QDir::Filters&); - void setDir(const QDir&); - void setDir(const QString&); - QString getSelected(); - void setRoot(const QString&); - - signals: - void itemChanged(QString); - - private: - Ui::BrowseDirtreeFrm ui; - QDirModel model; - - private slots: - void accept(void); -}; - -#endif diff --git a/rbutil/rbutilqt/browsedirtreefrm.ui b/rbutil/rbutilqt/browsedirtreefrm.ui deleted file mode 100644 index 2b41115c51..0000000000 --- a/rbutil/rbutilqt/browsedirtreefrm.ui +++ /dev/null @@ -1,105 +0,0 @@ - - BrowseDirtreeFrm - - - - 0 - 0 - 275 - 380 - - - - Find Directory - - - - - - Browse to the destination folder - - - true - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - &Ok - - - :/icons/go-next.png - - - - - - - &Cancel - - - :/icons/process-stop.png - - - - - - - - - - - - - buttonCancel - clicked() - BrowseDirtreeFrm - reject() - - - 224 - 355 - - - 48 - 349 - - - - - buttonOk - clicked() - BrowseDirtreeFrm - accept() - - - 146 - 358 - - - 74 - 357 - - - - - diff --git a/rbutil/rbutilqt/createvoicewindow.cpp b/rbutil/rbutilqt/createvoicewindow.cpp index 95df4b1b0c..7d51b90805 100644 --- a/rbutil/rbutilqt/createvoicewindow.cpp +++ b/rbutil/rbutilqt/createvoicewindow.cpp @@ -20,7 +20,6 @@ #include "createvoicewindow.h" #include "ui_createvoicefrm.h" -#include "browsedirtree.h" #include "configure.h" #include "rbsettings.h" #include "systeminfo.h" diff --git a/rbutil/rbutilqt/encttscfggui.cpp b/rbutil/rbutilqt/encttscfggui.cpp index 547cb97757..0030c5c206 100644 --- a/rbutil/rbutilqt/encttscfggui.cpp +++ b/rbutil/rbutilqt/encttscfggui.cpp @@ -20,7 +20,6 @@ ****************************************************************************/ #include "encttscfggui.h" -#include "browsedirtree.h" EncTtsCfgGui::EncTtsCfgGui(QDialog* parent,EncTtsSettingInterface* interface,QString name) : QDialog(parent) { diff --git a/rbutil/rbutilqt/installtalkwindow.cpp b/rbutil/rbutilqt/installtalkwindow.cpp index 405b3b05e0..da4389bb78 100644 --- a/rbutil/rbutilqt/installtalkwindow.cpp +++ b/rbutil/rbutilqt/installtalkwindow.cpp @@ -20,7 +20,6 @@ #include "installtalkwindow.h" #include "ui_installtalkfrm.h" -#include "browsedirtree.h" #include "configure.h" #include "rbsettings.h" #include "systeminfo.h" diff --git a/rbutil/rbutilqt/rbutilqt.pri b/rbutil/rbutilqt/rbutilqt.pri index 88977c1da3..b0052c38b5 100644 --- a/rbutil/rbutilqt/rbutilqt.pri +++ b/rbutil/rbutilqt/rbutilqt.pri @@ -31,7 +31,6 @@ SOURCES += \ ../ipodpatcher/ipodpatcher.c \ ../sansapatcher/sansapatcher.c \ ../chinachippatcher/chinachip.c \ - browsedirtree.cpp \ themesinstallwindow.cpp \ base/uninstall.cpp \ uninstallwindow.cpp \ @@ -98,7 +97,6 @@ HEADERS += \ irivertools/h100sums.h \ irivertools/h120sums.h \ irivertools/h300sums.h \ - browsedirtree.h \ themesinstallwindow.h \ base/uninstall.h \ uninstallwindow.h \ @@ -151,7 +149,6 @@ FORMS += \ installwindowfrm.ui \ progressloggerfrm.ui \ configurefrm.ui \ - browsedirtreefrm.ui \ installtalkfrm.ui \ themesinstallfrm.ui \ uninstallfrm.ui \ -- cgit v1.2.3