Ver0.08pre

[gefu/Gefu.git] / filetablemodel.cpp

diff --git a/filetablemodel.cpp b/filetablemodel.cpp
index aa41e46..a8526e7 100644 (file)
--- a/filetablemodel.cpp
+++ b/filetablemodel.cpp
@@ -5,7 +5,7 @@
 #include <QDebug>\r
 #include <QApplication>\r
 #include <QSettings>\r
-#include <QMenuBar>\r
+#include <QPalette>\r
 #ifdef Q_OS_WIN32\r
     #include <windows.h>\r
 #endif\r
@@ -53,11 +53,17 @@ bool FileTableModel::setPath(const QString &path)
         qDebug() << path;\r
     }\r
     else {\r
-        QFileInfoList::iterator it;\r
+        QFileInfoList::iterator it, itRoot = m_fileInfoList.end();\r
         for (it = m_fileInfoList.begin(); it != m_fileInfoList.end(); ) {\r
-            if (it->fileName() == ".." && m_dir.isRoot()) {\r
-                it = m_fileInfoList.erase(it);\r
-                continue;\r
+            if (it->fileName() == "..") {\r
+                if (m_dir.isRoot()) {\r
+                   it = m_fileInfoList.erase(it);\r
+                    itRoot = m_fileInfoList.end();\r
+                    continue;\r
+                }\r
+                else {\r
+                    itRoot = it;\r
+                }\r
             }\r
 #ifdef Q_OS_WIN32\r
             if (!(filter() & QDir::System)){\r
@@ -74,7 +80,14 @@ bool FileTableModel::setPath(const QString &path)
 #endif\r
             it++;\r
         }\r
+        // ソート方法によらず、".."は必ず先頭にする\r
+        if (itRoot != m_fileInfoList.begin() && itRoot != m_fileInfoList.end()) {\r
+            QFileInfo info(*itRoot);\r
+            m_fileInfoList.erase(itRoot);\r
+            m_fileInfoList.push_front(info);\r
+        }\r
     }\r
+\r
     m_checkStates.resize(m_fileInfoList.size());\r
     m_checkStates.fill(Qt::Unchecked);\r
 \r
@@ -84,7 +97,7 @@ bool FileTableModel::setPath(const QString &path)
     m_fsWatcher = new QFileSystemWatcher(this);\r
     m_fsWatcher->addPath(path);\r
     connect(m_fsWatcher, SIGNAL(directoryChanged(QString)),\r
-            this, SLOT(refresh()));\r
+            this, SIGNAL(listUpdated()));\r
 \r
     endResetModel();\r
 \r
@@ -136,6 +149,10 @@ bool FileTableModel::isDir(const QModelIndex &index) const
 \r
 const QString FileTableModel::absoluteFilePath(const QModelIndex &index) const\r
 {\r
+    if (!index.isValid()) {\r
+        qDebug() << "index is invalid.";\r
+        return QString();\r
+    }\r
     return m_dir.absoluteFilePath(m_fileInfoList[index.row()].fileName());\r
 }\r
 \r
@@ -144,22 +161,20 @@ QFileInfo FileTableModel::fileInfo(const QModelIndex &index) const
     return m_fileInfoList[index.row()];\r
 }\r
 \r
-#define Brush(x, y, z)  QBrush((x).value((y), (z)).value<QColor>());\r
-\r
-\r
 void FileTableModel::updateAppearance()\r
 {\r
     QSettings settings;\r
     QPalette palette(QApplication::palette("QTableView"));\r
 \r
-    m_font = settings.value(IniKey_ViewFont, QApplication::font()).value<QFont>();\r
-    m_NormalBrush = Brush(settings, IniKey_ViewColorBgNormal, palette.base());\r
-    m_NormalTextBrush = Brush(settings, IniKey_ViewColorFgNormal, palette.text());\r
-    m_MarkBrush = Brush(settings, IniKey_ViewColorBgMark, DefaultMarkBgColor);\r
-    m_MarkTextBrush = Brush(settings, IniKey_ViewColorFgMark, DefaultMarkFgColor);\r
-    m_SystemBrush = Brush(settings, IniKey_ViewColorFgSystem, DefaultSystemColor);\r
-    m_HiddenBrush = Brush(settings, IniKey_ViewColorFgHidden, DefaultHiddenColor);\r
-    m_ReadonlyBrush = Brush(settings, IniKey_ViewColorFgReadonly, DefaultReadonlyColor);\r
+    m_font = settings.value(IniKey_ViewFont).value<QFont>();\r
+    m_NormalBrush = QBrush(settings.value(IniKey_ViewColorBgNormal).value<QColor>());\r
+    m_NormalTextBrush = QBrush(settings.value(IniKey_ViewColorFgNormal).value<QColor>());\r
+    m_MarkBrush = QBrush(settings.value(IniKey_ViewColorBgMark).value<QColor>());\r
+    m_MarkTextBrush = QBrush(settings.value(IniKey_ViewColorFgMark).value<QColor>());\r
+    m_SystemBrush = QBrush(settings.value(IniKey_ViewColorFgSystem).value<QColor>());\r
+    m_HiddenBrush = QBrush(settings.value(IniKey_ViewColorFgHidden).value<QColor>());\r
+    m_ReadonlyBrush = QBrush(settings.value(IniKey_ViewColorFgReadonly).value<QColor>());\r
+    m_ReadonlyBrush = QBrush(settings.value(IniKey_ViewColorFgReadonly).value<QColor>());\r
 \r
     beginResetModel();\r
     endResetModel();\r
@@ -279,7 +294,7 @@ QVariant FileTableModel::data(const QModelIndex &index, int role) const
         {\r
             DWORD dwFlags = ::GetFileAttributes(\r
                         info.absoluteFilePath().toStdWString().c_str());\r
-            if (dwFlags != DWORD(-1) && (dwFlags & FILE_ATTRIBUTE_SYSTEM) == FILE_ATTRIBUTE_SYSTEM))\r
+            if (dwFlags != DWORD(-1) && (dwFlags & FILE_ATTRIBUTE_SYSTEM) == FILE_ATTRIBUTE_SYSTEM)\r
             {\r
                 return m_SystemBrush;\r
             }\r
@@ -321,9 +336,14 @@ QVariant FileTableModel::headerData(int section, Qt::Orientation orientation, in
 Qt::ItemFlags FileTableModel::flags(const QModelIndex &index) const\r
 {\r
     Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable;\r
-    if (index.column() == 0 && m_fileInfoList[index.row()].fileName() != "..")\r
-    {\r
-        flags |= Qt::ItemIsUserCheckable;\r
+    if (!index.isValid()) {\r
+        flags |= Qt::ItemIsDropEnabled;\r
+    }\r
+    else if (m_fileInfoList[index.row()].fileName() != "..") {\r
+        if (index.column() == 0) {\r
+            flags |= Qt::ItemIsUserCheckable;\r
+        }\r
+        flags |= Qt::ItemIsDropEnabled;\r
     }\r
     return flags;\r
 }\r
@@ -347,3 +367,17 @@ bool FileTableModel::setData(const QModelIndex &index, const QVariant &value, in
 \r
     return false;\r
 }\r
+\r
+Qt::DropActions FileTableModel::supportedDropActions() const\r
+{\r
+    return Qt::CopyAction | Qt::MoveAction;\r
+}\r
+\r
+QStringList FileTableModel::mimeTypes() const\r
+{\r
+    QStringList types;\r
+\r
+    types << "text/uri-list";\r
+\r
+    return types;\r
+}\r