pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Added search bar (can be activated by Ctrl+F/CMD+F)

Browse source 
@TODO change search icon?
@TODO remove title for search bar
This commit is contained in:
Alex Zolotarev 2011-05-13 15:17:05 +02:00 • committed by Alex Zolotarev
parent e1fb46711b
commit 5ec4286850
4 changed files with 94 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

135
qt/mainwindow.cpp
View file

@ -13,6 +13,7 @@
#include <QtGui/QAction>
#include <QtGui/QMenuBar>
#include <QtGui/QMenu>
#include <QtGui/QLineEdit>
#define IDM_ABOUT_DIALOG 1001
#define IDM_PREFERENCES_DIALOG 1002
@ -42,6 +43,8 @@ MainWindow::MainWindow()
CreateNavigationBar();
CreateSearchBar();
#ifdef DEBUG // code removed for desktop releases
CreateClassifPanel();
CreateGuidePanel();
@ -200,9 +203,9 @@ namespace
void MainWindow::CreateNavigationBar()
{
QToolBar * pBar = new QToolBar(tr("Navigation Bar"), this);
pBar->setOrientation(Qt::Vertical);
pBar->setIconSize(QSize(32, 32));
QToolBar * pToolBar = new QToolBar(tr("Navigation Bar"), this);
pToolBar->setOrientation(Qt::Vertical);
pToolBar->setIconSize(QSize(32, 32));
{
// add navigation hot keys
@ -228,25 +231,31 @@ void MainWindow::CreateNavigationBar()
}
{
// add search button with "checked" behavior
m_pSearchAction = pToolBar->addAction(QIcon(":/navig64/search.png"),
tr("Search"),
this,
SLOT(OnSearchButtonClicked()));
m_pSearchAction->setCheckable(true);
m_pSearchAction->setToolTip(tr("Offline Search"));
pToolBar->addSeparator();
// add my position button with "checked" behavior
m_pMyPosition = pBar->addAction(QIcon(":/navig64/location.png"),
m_pMyPositionAction = pToolBar->addAction(QIcon(":/navig64/location.png"),
tr("My Position"),
this,
SLOT(OnMyPosition()));
m_pMyPosition->setCheckable(true);
m_pMyPosition->setToolTip(tr("My Position"));
m_pMyPositionAction->setCheckable(true);
m_pMyPositionAction->setToolTip(tr("My Position"));
// add view actions 1
button_t arr[] = {
// { tr("Left"), ":/navig64/left.png", SLOT(MoveLeft()) },
// { tr("Right"), ":/navig64/right.png", SLOT(MoveRight()) },
// { tr("Up"), ":/navig64/up.png", SLOT(MoveUp()) },
// { tr("Down"), ":/navig64/down.png", SLOT(MoveDown()) },
{ QString(), 0, 0 },
{ tr("Show all"), ":/navig64/world.png", SLOT(ShowAll()) },
{ tr("Scale +"), ":/navig64/plus.png", SLOT(ScalePlus()) }
};
add_buttons(pBar, arr, ARRAY_SIZE(arr), m_pDrawWidget);
add_buttons(pToolBar, arr, ARRAY_SIZE(arr), m_pDrawWidget);
}
// add scale slider
@ -254,7 +263,7 @@ void MainWindow::CreateNavigationBar()
pScale->setRange(3, scales::GetUpperScale());
pScale->setTickPosition(QSlider::TicksRight);
pBar->addWidget(pScale);
pToolBar->addWidget(pScale);
m_pDrawWidget->SetScaleControl(pScale);
{
@ -262,7 +271,7 @@ void MainWindow::CreateNavigationBar()
button_t arr[] = {
{ tr("Scale -"), ":/navig64/minus.png", SLOT(ScaleMinus()) }
};
add_buttons(pBar, arr, ARRAY_SIZE(arr), m_pDrawWidget);
add_buttons(pToolBar, arr, ARRAY_SIZE(arr), m_pDrawWidget);
}
#ifdef DEBUG // code removed for desktop releases
{
@ -271,37 +280,12 @@ void MainWindow::CreateNavigationBar()
{ QString(), 0, 0 },
{ tr("Download Maps"), ":/navig64/download.png", SLOT(ShowUpdateDialog()) }
};
add_buttons(pBar, arr, ARRAY_SIZE(arr), this);
add_buttons(pToolBar, arr, ARRAY_SIZE(arr), this);
}
#endif // DEBUG
addToolBar(Qt::RightToolBarArea, pBar);
addToolBar(Qt::RightToolBarArea, pToolBar);
}
//void MainWindow::CreateFindTable(QLayout * pLayout)
//{
// // find widget
// FindEditorWnd * pEditor = new FindEditorWnd(0);
// pLayout->addWidget(pEditor);
//
// // find table result
// m_pFindTable = new FindTableWnd(0, pEditor, m_pDrawWidget->GetModel());
// pLayout->addWidget(m_pFindTable);
// connect(m_pFindTable, SIGNAL(cellClicked(int, int)), this, SLOT(OnFeatureClicked(int, int)));
// connect(m_pFindTable, SIGNAL(cellEntered(int, int)), this, SLOT(OnFeatureEntered(int, int)));
//}
//
//void MainWindow::OnFeatureEntered(int /*row*/, int /*col*/)
//{
// //Feature const & p = m_pFindTable->GetFeature(row);
//
// /// @todo highlight the feature
//}
//
//void MainWindow::OnFeatureClicked(int row, int /*col*/)
//{
// Feature const & p = m_pFindTable->GetFeature(row);
// m_pDrawWidget->ShowFeature(p);
//}
void MainWindow::OnAbout()
{
AboutDialog dlg(this);
@ -310,26 +294,59 @@ void MainWindow::OnAbout()
void MainWindow::OnLocationFound()
{
m_pMyPosition->setIcon(QIcon(":/navig64/location.png"));
m_pMyPosition->setToolTip(tr("My Position"));
m_pMyPositionAction->setIcon(QIcon(":/navig64/location.png"));
m_pMyPositionAction->setToolTip(tr("My Position"));
}
void MainWindow::OnMyPosition()
{
if (m_pMyPosition->isChecked())
if (m_pMyPositionAction->isChecked())
{
m_pMyPosition->setIcon(QIcon(":/navig64/location-search.png"));
m_pMyPosition->setToolTip(tr("Looking for position..."));
m_pMyPositionAction->setIcon(QIcon(":/navig64/location-search.png"));
m_pMyPositionAction->setToolTip(tr("Looking for position..."));
m_pDrawWidget->OnEnableMyPosition(boost::bind(&MainWindow::OnLocationFound, this));
}
else
{
m_pMyPosition->setIcon(QIcon(":/navig64/location.png"));
m_pMyPosition->setToolTip(tr("My Position"));
m_pMyPositionAction->setIcon(QIcon(":/navig64/location.png"));
m_pMyPositionAction->setToolTip(tr("My Position"));
m_pDrawWidget->OnDisableMyPosition();
}
}
void MainWindow::OnSearchButtonClicked()
{
if (m_pSearchAction->isChecked())
{
m_Docks[2]->show();
m_Docks[2]->widget()->setFocus();
}
else
{
m_Docks[2]->hide();
}
}
void MainWindow::OnSearchShortcutPressed()
{
if (m_Docks[2]->isVisible())
{
m_pSearchAction->setChecked(false);
m_Docks[2]->hide();
}
else
{
m_pSearchAction->setChecked(true);
m_Docks[2]->show();
m_Docks[2]->widget()->setFocus();
}
}
void MainWindow::OnSearchTextChanged(QString const & str)
{
}
void MainWindow::OnPreferences()
{
bool autoUpdatesEnabled = DEFAULT_AUTO_UPDATES_ENABLED;
@ -361,7 +378,7 @@ void MainWindow::ShowGuidePanel()
void MainWindow::CreateClassifPanel()
{
CreatePanelImpl(0, tr("Classificator Bar"),
CreatePanelImpl(0, Qt::LeftDockWidgetArea, tr("Classificator Bar"),
QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_C), SLOT(ShowClassifPanel()));
ClassifTreeHolder * pCTree = new ClassifTreeHolder(m_Docks[0], m_pDrawWidget, SLOT(Repaint()));
@ -372,20 +389,34 @@ void MainWindow::CreateClassifPanel()
void MainWindow::CreateGuidePanel()
{
CreatePanelImpl(1, tr("Guide Bar"),
CreatePanelImpl(1, Qt::LeftDockWidgetArea, tr("Guide Bar"),
QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_G), SLOT(ShowGuidePanel()));
qt::GuidePageHolder * pGPage = new qt::GuidePageHolder(m_Docks[1]);
m_Docks[1]->setWidget(pGPage);
}
#endif // DEBUG
void MainWindow::CreatePanelImpl(size_t i, QString const & name,
void MainWindow::CreateSearchBar()
{
CreatePanelImpl(2, Qt::TopDockWidgetArea, tr("Search Bar"),
QKeySequence(Qt::CTRL + Qt::Key_F), SLOT(OnSearchShortcutPressed()));
QLineEdit * editor = new QLineEdit(m_Docks[2]);
connect(editor, SIGNAL(textChanged(QString const &)), this, SLOT(OnSearchTextChanged(QString const &)));
m_Docks[2]->setFeatures(QDockWidget::NoDockWidgetFeatures);
// @TODO remove search bar title
m_Docks[2]->setWidget(editor);
}
void MainWindow::CreatePanelImpl(size_t i, Qt::DockWidgetArea area, QString const & name,
QKeySequence const & hotkey, char const * slot)
{
m_Docks[i] = new QDockWidget(name, this);
addDockWidget(Qt::LeftDockWidgetArea, m_Docks[i]);
addDockWidget(area, m_Docks[i]);
// hide by default
m_Docks[i]->hide();
@ -396,5 +427,5 @@ void MainWindow::CreatePanelImpl(size_t i, QString const & name,
connect(pAct, SIGNAL(triggered()), this, slot);
addAction(pAct);
}
#endif // DEBUG
}

19
qt/mainwindow.hpp
View file

@ -8,18 +8,18 @@ class QDockWidget;
namespace qt
{
class FindTableWnd;
class DrawWidget;
class UpdateDialog;
class MainWindow : public QMainWindow
{
QAction * m_pMyPosition;
QAction * m_pMyPositionAction;
QAction * m_pSearchAction;
DrawWidget * m_pDrawWidget;
QDockWidget * m_Docks[3];
#ifdef DEBUG // code removed for desktop releases
QDockWidget * m_Docks[2];
//FindTableWnd * m_pFindTable;
UpdateDialog * m_updateDialog;
#endif // DEBUG
@ -41,14 +41,14 @@ namespace qt
protected:
#ifdef DEBUG // code removed for desktop releases
void CreatePanelImpl(size_t i, QString const & name, QKeySequence const & hotkey,
char const * slot);
void CreatePanelImpl(size_t i, Qt::DockWidgetArea area, QString const & name,
QKeySequence const & hotkey, char const * slot);
void CreateClassifPanel();
void CreateGuidePanel();
#endif // DEBUG
void CreateNavigationBar();
//void CreateFindTable(QLayout * pLayout);
void CreateSearchBar();
#if defined(Q_WS_WIN)
/// to handle menu messages
@ -56,8 +56,7 @@ namespace qt
#endif
protected Q_SLOTS:
//void OnFeatureEntered(int row, int col);
//void OnFeatureClicked(int row, int col);
void OnSearchTextChanged(QString const &);
#ifdef DEBUG // code removed for desktop releases
void ShowUpdateDialog();
void ShowClassifPanel();
@ -66,5 +65,7 @@ namespace qt
void OnPreferences();
void OnAbout();
void OnMyPosition();
void OnSearchButtonClicked();
void OnSearchShortcutPressed();
};
}

1
qt/res/resources.qrc
View file

@ -6,6 +6,7 @@
<file>clear.png</file>
</qresource>
<qresource prefix="/navig64">
<file>search.png</file>
<file>up.png</file>
<file>down.png</file>
<file>left.png</file>

BIN
qt/res/search.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.9 KiB