# HG changeset patch # User Chris Cannam # Date 1430903308 -3600 # Node ID 61703996628d794c6d7ab2e53e09e172a052c362 # Parent abe5cfed6a88c5001cbd898820f11dee9c804ac0 Experiment with loading SVGs diff -r abe5cfed6a88 -r 61703996628d .hgsub --- a/.hgsub Mon Apr 20 10:10:26 2015 +0100 +++ b/.hgsub Wed May 06 10:08:28 2015 +0100 @@ -3,3 +3,4 @@ svapp = https://code.soundsoftware.ac.uk/hg/svapp dataquay = https://bitbucket.org/breakfastquay/dataquay sv-dependency-builds = https://code.soundsoftware.ac.uk/hg/sv-dependency-builds +icons/scalable = https://code.soundsoftware.ac.uk/hg/sv-iconset diff -r abe5cfed6a88 -r 61703996628d .hgsubstate --- a/.hgsubstate Mon Apr 20 10:10:26 2015 +0100 +++ b/.hgsubstate Wed May 06 10:08:28 2015 +0100 @@ -1,5 +1,6 @@ d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay +28748e29e057cdfba4706559a3fbba04569f1404 icons/scalable 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds dc1a360f2b694d73d4bc858b708db44249e2cddc svapp 32ab6c48efaa23d24a67315bccdc27f3ba1a18d5 svcore -e53a87a5efb2fcf90ca9d97cfe0592b53226d002 svgui +4b5efd76a55c814ba830ed694ae0886eb7a148b8 svgui diff -r abe5cfed6a88 -r 61703996628d main/MainWindow.cpp --- a/main/MainWindow.cpp Mon Apr 20 10:10:26 2015 +0100 +++ b/main/MainWindow.cpp Wed May 06 10:08:28 2015 +0100 @@ -459,7 +459,6 @@ IconLoader il; QIcon icon = il.load("filenew"); - icon.addPixmap(il.loadPixmap("filenew-22")); QAction *action = new QAction(icon, tr("&New Session"), this); action->setShortcut(tr("Ctrl+N")); action->setStatusTip(tr("Abandon the current %1 session and start a new one").arg(QApplication::applicationName())); @@ -469,7 +468,6 @@ toolbar->addAction(action); icon = il.load("fileopen"); - icon.addPixmap(il.loadPixmap("fileopen-22")); action = new QAction(icon, tr("&Open..."), this); action->setShortcut(tr("Ctrl+O")); action->setStatusTip(tr("Open a session file, audio file, or layer")); @@ -510,7 +508,6 @@ menu->addSeparator(); icon = il.load("filesave"); - icon.addPixmap(il.loadPixmap("filesave-22")); action = new QAction(icon, tr("&Save Session"), this); action->setShortcut(tr("Ctrl+S")); action->setStatusTip(tr("Save the current session into a %1 session file").arg(QApplication::applicationName())); @@ -521,7 +518,6 @@ toolbar->addAction(action); icon = il.load("filesaveas"); - icon.addPixmap(il.loadPixmap("filesaveas-22")); action = new QAction(icon, tr("Save Session &As..."), this); action->setShortcut(tr("Ctrl+Shift+S")); action->setStatusTip(tr("Save the current session into a new %1 session file").arg(QApplication::applicationName())); diff -r abe5cfed6a88 -r 61703996628d sonic-visualiser.qrc --- a/sonic-visualiser.qrc Mon Apr 20 10:10:26 2015 +0100 +++ b/sonic-visualiser.qrc Wed May 06 10:08:28 2015 +0100 @@ -1,5 +1,29 @@ - + + icons/scalable/align.svg + icons/scalable/colour3d.svg + icons/scalable/cross.svg + icons/scalable/draw.svg + icons/scalable/erase.svg + icons/scalable/filenew.svg + icons/scalable/fileopen.svg + icons/scalable/filesaveas.svg + icons/scalable/filesave.svg + icons/scalable/filesavesv.svg + icons/scalable/ffwd-end.svg + icons/scalable/ffwd.svg + icons/scalable/navigate.svg + icons/scalable/pause.svg + icons/scalable/playloop.svg + icons/scalable/playpause.svg + icons/scalable/play.svg + icons/scalable/rewind-start.svg + icons/scalable/rewind.svg + icons/scalable/select.svg + icons/scalable/sv-icon-light.svg + icons/scalable/sv-icon.svg + icons/scalable/sv-splash.svg + icons/scalable/waveform.svg icons/waveform.png icons/spectrum.png icons/spectrogram.png diff -r abe5cfed6a88 -r 61703996628d sv.pro --- a/sv.pro Mon Apr 20 10:10:26 2015 +0100 +++ b/sv.pro Wed May 06 10:08:28 2015 +0100 @@ -37,7 +37,7 @@ } CONFIG += qt thread warn_on stl rtti exceptions c++11 -QT += network xml gui widgets +QT += network xml gui widgets svg TARGET = "Sonic Visualiser" linux*:TARGET = sonic-visualiser