Added drawModeMenu to the view menu

Only add drawMenu to context menu if option is set

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@3021 383ad7c9-94d9-4d36-a494-682f7c89f535

widgets/coreWidget/ContextMenu.cc

@@ -201,7 +201,7 @@ void CoreWidget::updatePopupMenu(const QPoint& _point) {
     examiner_widget_->getFuncMenu()->setTearOffEnabled(true);
   }
 
-  if (examiner_widget_->getDrawMenu() != NULL) {
+  if ( ( examiner_widget_->getDrawMenu() != NULL ) && OpenFlipper::Options::drawModesInContextMenu() ) {
 
     examiner_widget_->getDrawMenu()->setTitle("&DrawModes");
     QAction* drawMenuAction = contextMenu_->addMenu(examiner_widget_->getDrawMenu() );

widgets/coreWidget/MenuBar.cc

@@ -84,6 +84,18 @@ void CoreWidget::setupMenuBar()
   viewMenu_ = new QMenu(tr("&View"));
   menuBar()->addMenu(viewMenu_ );
 
+  if (examiner_widget_->getDrawMenu() != NULL) {
+
+    examiner_widget_->getDrawMenu()->setTitle("&DrawModes");
+    QAction* drawMenuAction = viewMenu_->addMenu(examiner_widget_->getDrawMenu() );
+
+    QIcon icon;
+    icon.addFile(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"drawModes.png");
+    drawMenuAction->setIcon(icon);
+
+    examiner_widget_->getDrawMenu()->setTearOffEnabled(true);
+  }
+
   QIcon icon;
 
   //Clear all