diff -r 4f2773374eff -r 4b22a598b890 filebrowser/ui/src/filebrowsermainwindow.cpp --- a/filebrowser/ui/src/filebrowsermainwindow.cpp Fri May 14 15:53:02 2010 +0300 +++ b/filebrowser/ui/src/filebrowsermainwindow.cpp Thu May 27 12:52:19 2010 +0300 @@ -24,13 +24,15 @@ #include "filebrowserview.h" #include "settingsview.h" #include "editorview.h" +#include "searchview.h" -FileBrowserMainWindow::FileBrowserMainWindow(QWidget *parent) : - HbMainWindow( parent ) - ,mEngineWrapper(0) - ,mFileBrowserView(0) - ,mSettingsView(0) - ,mEditorView(0) +FileBrowserMainWindow::FileBrowserMainWindow(QWidget *parent) + : HbMainWindow(parent), + mEngineWrapper(0), + mFileBrowserView(0), + mSettingsView(0), + mEditorView(0), + mSearchView(0) { } @@ -65,14 +67,22 @@ connect(mEditorView, SIGNAL(finished(bool)), this, SLOT(openFileBrowserView())); addView(mEditorView); + // Create Search view + mSearchView = new SearchView(*mEngineWrapper); + connect(mFileBrowserView, SIGNAL(aboutToShowSearchView(QString)), this, SLOT(openSearchView(QString))); + connect(mSearchView, SIGNAL(finished(bool)), this, SLOT(openFileBrowserView())); + addView(mSearchView); + // Show ApplicationView at startup setCurrentView(mFileBrowserView); + // Show HbMainWindow show(); } void FileBrowserMainWindow::openFileBrowserView() { + mFileBrowserView->refreshList(); setCurrentView(mFileBrowserView); } @@ -86,3 +96,9 @@ mEditorView->open(fileName, flagReadOnly); setCurrentView(mEditorView); } + +void FileBrowserMainWindow::openSearchView(const QString &path) +{ + mSearchView->open(path); + setCurrentView(mSearchView); +}