パネル自体の背景色を変更

diff --git a/folderview_private.cpp b/folderview_private.cpp
index 595a4c3..2c6a480 100644 (file)
--- a/folderview_private.cpp
+++ b/folderview_private.cpp
@@ -175,7 +175,7 @@ bool FolderView_Private::onMousePress(QObject *obj, QMouseEvent *e)
 ///
 void FolderView_Private::model_PostReset()
 {
-    FolderModel *model = static_cast<FolderModel*>(m_view->model());
+    FolderModel *model = static_cast<FolderModel*>(sender());
 
     // フォルダが変わった場合は先頭行を選択する
     if (m_savePath != model->rootPath()) {

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 7b40268..baa3a96 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -112,6 +112,8 @@ MainWindow::MainWindow(QWidget *parent) :
     ui->LPanel->model()->updateAppearance(prefs);\r
     ui->RPanel->updateAppearance(prefs);\r
     ui->RPanel->model()->updateAppearance(prefs);\r
+\r
+    connect(ui->FPanel, SIGNAL(showed(QWidget*)), this, SLOT(view_showed(QWidget*)));\r
 }\r
 \r
 ///////////////////////////////////////////////////////////////////////////////\r
@@ -300,6 +302,17 @@ void MainWindow::view_statusChanged(const QString &text)
 }\r
 \r
 ///////////////////////////////////////////////////////////////////////////////\r
+/// \brief MainWindow::view_showed\r
+/// \param w    表示されたビュー\r
+///\r
+/// パネルのビューが表示された場合の処理を行います。\r
+///\r
+void MainWindow::view_showed(QWidget *w)\r
+{\r
+    w->setFocus();\r
+}\r
+\r
+///////////////////////////////////////////////////////////////////////////////\r
 /// \brief MainWindow::view_currentChanged\r
 /// \param current  新しいカレントインデックス\r
 /// \param previous (使用しません)\r

diff --git a/mainwindow.h b/mainwindow.h
index 542d46d..0b17b5d 100644 (file)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -99,6 +99,7 @@ public slots:
     void    view_currentChanged(const QModelIndex & current, const QModelIndex & previous);\r
     void    view_finished();\r
     void    view_statusChanged(const QString &text);\r
+    void    view_showed(QWidget* w);\r
 \r
 private:\r
     typedef QList<QAction*> ActionList;\r
@@ -122,7 +123,6 @@ private:
     void                initActions();\r
     void                initBookmarkMenu();\r
     bool                onContextMenuEvent(QObject *obj, QContextMenuEvent *e);\r
-//    bool                onDropEvent(QObject *obj, QDropEvent *e);\r
     bool                onKeyPressEvent(QObject *obj, QKeyEvent *e);\r
     QFileInfoList       selectedItems() const;\r
     void                sendEventOther(QEvent *event);\r

diff --git a/panel.cpp b/panel.cpp
index 3482122..e5732c3 100644 (file)
--- a/panel.cpp
+++ b/panel.cpp
@@ -139,6 +139,11 @@ void Panel::updateAppearance(const Preferences &prefs)
 
     QPalette pal;
 
+    pal = this->palette();
+    pal.setColor(this->backgroundRole(), prefs.folderViewBgColor(objectName() == "FPanel"));
+    this->setAutoFillBackground(true);
+    this->setPalette(pal);
+
     pal = ui->imageView->palette();
     pal.setColor(QPalette::Base, prefs.getImageViewBgColor());
     ui->imageView->setPalette(pal);
@@ -191,7 +196,7 @@ void Panel::onReady(const QByteArray &data)
         ui->folderPanel->setVisible(false);
         ui->textView->setVisible(false);
         ui->imageView->setVisible(true);
-        ui->imageView->setFocus();
+        emit showed(ui->imageView);
         return;
     }
 
@@ -199,5 +204,5 @@ void Panel::onReady(const QByteArray &data)
     ui->folderPanel->setVisible(false);
     ui->imageView->setVisible(false);
     ui->textView->setVisible(true);
-    ui->textView->setFocus();
+    emit showed(ui->textView);
 }

diff --git a/panel.h b/panel.h
index bfb0a64..9188109 100644 (file)
--- a/panel.h
+++ b/panel.h
@@ -37,6 +37,8 @@ private:
 public slots:
     void    onReady(const QByteArray &data);
 
+signals:
+    void    showed(QWidget *w);
 };
 
 #endif // PANEL_H