Ver0.15

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 3581494..4eb248d 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1002,57 +1002,11 @@ void MainWindow::switchHalfMode(bool checked)
     updateActions();\r
 }\r
 \r
-//void MainWindow::setSorting(FolderView *view)\r
-//{\r
-//    qDebug() << "MainWindow::setSorting();" << view->objectName();\r
-\r
-//    QSettings settings;\r
-//    QDir::SortFlags flags;\r
-\r
-//    int sortBy = settings.value(view->side() + slash + IniKey_SortBy).toInt();\r
-//    switch (sortBy) {\r
-//    case SortByDate:    flags |= QDir::Time; break;\r
-//    case SortBySize:    flags |= QDir::Size; break;\r
-//    case SortByType:    flags |= QDir::Type; break;\r
-//    default:            flags |= QDir::Name; break;\r
-//    }\r
-\r
-//    // デフォルトだと文字列は昇順で、数値は降順…orz\r
-//    int orderBy = settings.value(view->side() + slash + IniKey_OrderBy).toInt();\r
-//    if (((sortBy == SortByName || sortBy == SortByType) && orderBy == OrderByDesc) ||\r
-//        ((sortBy == SortByDate || sortBy == SortBySize) && orderBy == OrderByAsc))\r
-//    {\r
-//        flags |= QDir::Reversed;\r
-//    }\r
-\r
-//    switch (settings.value(view->side() + slash + IniKey_PutDirs).toInt()) {\r
-//    case PutDirsFirst:  flags |= QDir::DirsFirst; break;\r
-//    case PutDirsLast:   flags |= QDir::DirsLast; break;\r
-//    }\r
-\r
-//    if (settings.value(view->side() + slash + IniKey_IgnoreCase).toBool()) {\r
-//        flags |= QDir::IgnoreCase;\r
-//    }\r
-\r
-//    view->setSorting(flags);\r
-//}\r
-\r
-//void MainWindow::showNameFilters(FolderView *view)\r
-//{\r
-//    QLabel *label = view->parent()->findChild<QLabel*>("filterLabel");\r
-//    Q_CHECK_PTR(label);\r
-\r
-//    label->setText(tr("フィルタ：") + view->nameFilters().join(" "));\r
-//}\r
-\r
 void MainWindow::searchItem(const QString &text)\r
 {\r
     qDebug() << "MainWindow::searchItem" << text;\r
 \r
-    FolderView *view = static_cast<FolderView*>(qApp->focusWidget());\r
-    Q_CHECK_PTR(view);\r
-\r
-    SearchBox *box = view->parent()->findChild<SearchBox*>("searchBox");\r
+    SearchBox *box = qobject_cast<SearchBox*>(qApp->focusWidget());\r
     Q_CHECK_PTR(box);\r
 \r
     if (text.right(1) == "/") {\r
@@ -1061,7 +1015,10 @@ void MainWindow::searchItem(const QString &text)
         ui->action_Search->setChecked(false);\r
     }\r
     else {\r
-        view->searchItem(box->text());\r
+        FolderPanel *fp = qobject_cast<FolderPanel*>(box->parent());\r
+        Q_CHECK_PTR(fp);\r
+\r
+        fp->folderView()->searchItem(box->text());\r
     }\r
 }\r
 \r
@@ -1069,26 +1026,26 @@ void MainWindow::searchNext()
 {\r
     qDebug() << "MainWindow::searchNext";\r
 \r
-    FolderView *view = static_cast<FolderView*>(qApp->focusWidget());\r
-    Q_CHECK_PTR(view);\r
-\r
-    SearchBox *box = view->parent()->findChild<SearchBox*>("searchBox");\r
+    SearchBox *box = qobject_cast<SearchBox*>(qApp->focusWidget());\r
     Q_CHECK_PTR(box);\r
 \r
-    view->searchNext(box->text());\r
+    FolderPanel *fp = qobject_cast<FolderPanel*>(box->parent());\r
+    Q_CHECK_PTR(fp);\r
+\r
+    fp->folderView()->searchNext(box->text());\r
 }\r
 \r
 void MainWindow::searchPrev()\r
 {\r
     qDebug() << "MainWindow::searchPrev";\r
 \r
-    FolderView *view = static_cast<FolderView*>(qApp->focusWidget());\r
-    Q_CHECK_PTR(view);\r
-\r
-    SearchBox *box = view->parent()->findChild<SearchBox*>("searchBox");\r
+    SearchBox *box = qobject_cast<SearchBox*>(qApp->focusWidget());\r
     Q_CHECK_PTR(box);\r
 \r
-    view->searchPrev(box->text());\r
+    FolderPanel *fp = qobject_cast<FolderPanel*>(box->parent());\r
+    Q_CHECK_PTR(fp);\r
+\r
+    fp->folderView()->searchPrev(box->text());\r
 }\r
 \r
 void MainWindow::setCursorToBegin()\r