# HG changeset patch
# User Chris Cannam
# Date 1177942041 0
# Node ID 834ff910e3d209d5ebe1a632bd6cd9e8f0dd0cca
# Parent  006c90387f401b05f5d4b7a983ddd45f27e03ab1
* More icons, distinguish between icons for open session/audio and general open

diff -r 006c90387f40 -r 834ff910e3d2 icons/fileopenaudio.png
Binary file icons/fileopenaudio.png has changed
diff -r 006c90387f40 -r 834ff910e3d2 icons/fileopensession.png
Binary file icons/fileopensession.png has changed
diff -r 006c90387f40 -r 834ff910e3d2 icons/help.png
Binary file icons/help.png has changed
diff -r 006c90387f40 -r 834ff910e3d2 icons/zoom-fit.png
Binary file icons/zoom-fit.png has changed
diff -r 006c90387f40 -r 834ff910e3d2 main/MainWindow.cpp
--- a/main/MainWindow.cpp	Mon Apr 30 13:36:23 2007 +0000
+++ b/main/MainWindow.cpp	Mon Apr 30 14:07:21 2007 +0000
@@ -423,16 +423,17 @@
     connect(action, SIGNAL(triggered()), this, SLOT(newSession()));
     menu->addAction(action);
     toolbar->addAction(action);
-	
-    icon = QIcon(":icons/fileopen.png");
-    icon.addFile(":icons/fileopen-22.png");
-
+
+    icon = QIcon(":icons/fileopensession.png");
     action = new QAction(icon, tr("&Open Session..."), this);
     action->setShortcut(tr("Ctrl+O"));
     action->setStatusTip(tr("Open a previously saved Sonic Visualiser session file"));
     connect(action, SIGNAL(triggered()), this, SLOT(openSession()));
     menu->addAction(action);
 
+    icon = QIcon(":icons/fileopen.png");
+    icon.addFile(":icons/fileopen-22.png");
+
     action = new QAction(icon, tr("&Open..."), this);
     action->setStatusTip(tr("Open a session file, audio file, or layer"));
     connect(action, SIGNAL(triggered()), this, SLOT(openSomething()));
@@ -458,7 +459,8 @@
 
     menu->addSeparator();
 
-    action = new QAction(tr("&Import Audio File..."), this);
+    icon = QIcon(":icons/fileopenaudio.png");
+    action = new QAction(icon, tr("&Import Audio File..."), this);
     action->setShortcut(tr("Ctrl+I"));
     action->setStatusTip(tr("Import an existing audio file"));
     connect(action, SIGNAL(triggered()), this, SLOT(importAudio()));
@@ -709,7 +711,8 @@
     connect(this, SIGNAL(canZoom(bool)), action, SLOT(setEnabled(bool)));
     menu->addAction(action);
 
-    action = new QAction(tr("Zoom to &Fit"), this);
+    action = new QAction(QIcon(":/icons/zoom-fit.png"),
+                         tr("Zoom to &Fit"), this);
     action->setStatusTip(tr("Zoom to show the whole file"));
     connect(action, SIGNAL(triggered()), this, SLOT(zoomToFit()));
     connect(this, SIGNAL(canZoom(bool)), action, SLOT(setEnabled(bool)));
@@ -998,7 +1001,7 @@
 
                     if (isOnly && (!plural || menuType == 1)) {
 
-                        if (type != LayerFactory::Waveform) {
+                        if (menuType == 1 && type != LayerFactory::Waveform) {
                             action = new QAction(mainText, this);
                         } else {
                             action = new QAction(icon, mainText, this);
@@ -1343,7 +1346,8 @@
     QMenu *menu = menuBar()->addMenu(tr("&Help"));
     menu->setTearOffEnabled(true);
     
-    QAction *action = new QAction(tr("&Help Reference"), this); 
+    QAction *action = new QAction(QIcon(":icons/help.png"),
+                                  tr("&Help Reference"), this); 
     action->setStatusTip(tr("Open the Sonic Visualiser reference manual")); 
     connect(action, SIGNAL(triggered()), this, SLOT(help()));
     menu->addAction(action);
diff -r 006c90387f40 -r 834ff910e3d2 sonic-visualiser.qrc
--- a/sonic-visualiser.qrc	Mon Apr 30 13:36:23 2007 +0000
+++ b/sonic-visualiser.qrc	Mon Apr 30 14:07:21 2007 +0000
@@ -30,6 +30,7 @@
     <file>icons/zoom.png</file>
     <file>icons/zoom-in.png</file>
     <file>icons/zoom-out.png</file>
+    <file>icons/zoom-fit.png</file>
     <file>icons/undo.png</file>
     <file>icons/redo.png</file>
     <file>icons/new.png</file>
@@ -37,6 +38,8 @@
     <file>icons/speaker.png</file>
     <file>icons/annotation.png</file>
     <file>icons/fileopen.png</file>
+    <file>icons/fileopensession.png</file>
+    <file>icons/fileopenaudio.png</file>
     <file>icons/fileopen-22.png</file>
     <file>icons/fileclose.png</file>
     <file>icons/filenew.png</file>
@@ -52,6 +55,7 @@
     <file>icons/mono.png</file>
     <file>icons/stereo.png</file>
     <file>icons/sharpen.png</file>
+    <file>icons/help.png</file>
     <file>icons/svicon16.png</file>
     <file>icons/svicon32.png</file>
     <file>samples/bass.wav</file>