diff --git a/src/meshlab/additionalgui.cpp b/src/meshlab/additionalgui.cpp index 7745dab90..c891d2764 100644 --- a/src/meshlab/additionalgui.cpp +++ b/src/meshlab/additionalgui.cpp @@ -855,4 +855,4 @@ void MyToolButton::paintEvent( QPaintEvent * ) initStyleOption( & opt ); opt.features &= (~ QStyleOptionToolButton::HasMenu); p.drawComplexControl( QStyle::CC_ToolButton, opt ); -} \ No newline at end of file +} diff --git a/src/meshlab/mainwindow.h b/src/meshlab/mainwindow.h index 05b0d1a93..8e0624c8e 100644 --- a/src/meshlab/mainwindow.h +++ b/src/meshlab/mainwindow.h @@ -351,8 +351,9 @@ private: QMenu *handleMenu; QMenu *splitMenu; QMenu *unSplitMenu; - ////////// Search Action //////////////// - QAction* searchAct; + ////////// Search Shortcut //////////////// + QShortcut* searchShortCut; + MyToolButton* searchButton; //////////// Actions Menu File /////////////////////// QAction *newProjectAct; QAction *openProjectAct, *appendProjectAct, *saveProjectAct, *saveProjectAsAct; diff --git a/src/meshlab/mainwindow_Init.cpp b/src/meshlab/mainwindow_Init.cpp index 5db1f969d..827656cb8 100644 --- a/src/meshlab/mainwindow_Init.cpp +++ b/src/meshlab/mainwindow_Init.cpp @@ -110,9 +110,8 @@ MainWindow::MainWindow() void MainWindow::createActions() { - /*searchAct = new QAction(tr("Search into MeshLab"), this); - searchAct->setShortcutContext(Qt::ApplicationShortcut); - searchAct->setShortcut(Qt::CTRL+Qt::Key_F);*/ + searchShortCut = new QShortcut(QKeySequence(Qt::CTRL+Qt::Key_F), this); + searchShortCut->setContext(Qt::ApplicationShortcut); //////////////Action Menu File //////////////////////////////////////////////////////////////////////////// newProjectAct = new QAction(QIcon(":/images/new_project.png"),tr("New Empty Project..."), this); newProjectAct->setShortcutContext(Qt::ApplicationShortcut); @@ -478,17 +477,16 @@ void MainWindow::createToolBars() searchToolBar->setMovable(false); searchToolBar->setFloatable(false); searchToolBar->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Fixed); - MyToolButton* searchbutton = new MyToolButton(this); - searchbutton->setPopupMode(QToolButton::InstantPopup); - searchbutton->setIcon(QIcon(":/images/search.png")); - searchToolBar->addWidget(searchbutton); - SearchMenu* ser = new SearchMenu(wama,10,searchbutton); - searchbutton->setMenu(ser); - connect(ser,SIGNAL(updatedResults()),searchbutton,SLOT(tbupdate())); + searchButton = new MyToolButton(this); + searchButton->setPopupMode(QToolButton::InstantPopup); + searchButton->setIcon(QIcon(":/images/search.png")); + searchToolBar->addWidget(searchButton); + SearchMenu* ser = new SearchMenu(wama,10,searchButton); + searchButton->setMenu(ser); + connect(searchShortCut,SIGNAL(activated()),searchButton,SLOT(showMenu())); } - void MainWindow::createMenus() { //////////////////// Menu File ////////////////////////////////////////////////////////////////////////////