Mercurial > hg > tony

changeset 24:bf342201e4f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
edit icon now toggles between edit and navigate modes
author gyorgyf
date Fri, 19 Apr 2013 19:15:22 +0100
parents 9e695ff60b74
children 6479a92f1e0c
files src/MainWindow.cpp src/MainWindow.h
diffstat 2 files changed, 16 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/MainWindow.cpp	Fri Apr 19 15:37:27 2013 +0100
+++ b/src/MainWindow.cpp	Fri Apr 19 19:15:22 2013 +0100
@@ -570,15 +570,15 @@
 	toolbar = addToolBar(tr("Test actions toolbar")); // GF: temporary toolbar for triggering actions manually
 	
 	// GF: TEMP : this created a menu item
-    QAction *test = toolbar->addAction(il.load("new"), tr("Test"));
-    test->setShortcut(tr("Home"));
-    test->setStatusTip(tr("Test"));
-	test->setEnabled(true);
+    m_editSelectAction = toolbar->addAction(il.load("move"), tr("Edit"));
+    m_editSelectAction->setShortcut(tr("Home"));
+    m_editSelectAction->setStatusTip(tr("Edit Notes"));
+	m_editSelectAction->setEnabled(true);
     // connect(test, SIGNAL(triggered()), this, SLOT(about()));
     // connect(test, SIGNAL(triggered()), m_analyser, SLOT(resizeLayer()));
-    connect(test, SIGNAL(triggered()), this, SLOT(selectEditMode())); 
+    connect(m_editSelectAction, SIGNAL(triggered()), this, SLOT(selectEditMode())); 
     // connect(this, SIGNAL(canPlay(bool)), test, SLOT(setEnabled(bool)));
-	menu->addAction(test);
+	menu->addAction(m_editSelectAction);
 
     Pane::registerShortcuts(*m_keyReference);
 }
@@ -586,8 +586,15 @@
 void
 MainWindow::selectEditMode()	
 {
-	std::cerr << "Edit mode selected" << std::endl;
-	m_viewManager->setToolMode(ViewManager::EditMode);
+	IconLoader il;
+	if (m_viewManager->getToolMode() == ViewManager::EditMode) {
+		m_viewManager->setToolMode(ViewManager::NavigateMode);
+		m_editSelectAction->setIcon(il.load("move"));
+	} else {
+		std::cerr << "Edit mode selected" << std::endl;
+		m_viewManager->setToolMode(ViewManager::EditMode);
+		m_editSelectAction->setIcon(il.load("navigate"));
+	}
 }
 
 void
--- a/src/MainWindow.h	Fri Apr 19 15:37:27 2013 +0100
+++ b/src/MainWindow.h	Fri Apr 19 19:15:22 2013 +0100
@@ -120,6 +120,7 @@
     QAction       *m_deleteSelectedAction;
     QAction       *m_ffwdAction;
     QAction       *m_rwdAction;
+    QAction       *m_editSelectAction;
 
     KeyReference  *m_keyReference;