From: Dirk H Bartley Date: Mon, 28 May 2007 19:39:58 +0000 (+0000) Subject: Lots of icon work. Attempting using .svg files directory. It works in my X-Git-Tag: Release-7.0.0~6218 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8cb5075df3b311e3abe36acbb2e46dbd93b80be9;p=bacula%2Fbacula Lots of icon work. Attempting using .svg files directory. It works in my environment here. I hope it works in windows. I think I've found the fix to the :images problem. Using the resource through designer, it works from designer and sets up the : in front. xml looks like so: :/images/view-refresh.svg git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4927 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/bacula/src/qt-console/clients/clients.cpp b/bacula/src/qt-console/clients/clients.cpp index 81ec330bf7..657f5261cd 100644 --- a/bacula/src/qt-console/clients/clients.cpp +++ b/bacula/src/qt-console/clients/clients.cpp @@ -47,7 +47,7 @@ Clients::Clients() m_name = "Clients"; pgInitialize(); QTreeWidgetItem* thisitem = mainWin->getFromHash(this); - thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/network-server.png"))); + thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/network-server.svg"))); /* mp_treeWidget, Storage Tree Tree Widget inherited from ui_client.h */ m_populated = false; diff --git a/bacula/src/qt-console/clients/clients.ui b/bacula/src/qt-console/clients/clients.ui index 11edc4c1d2..888aab5a8d 100644 --- a/bacula/src/qt-console/clients/clients.ui +++ b/bacula/src/qt-console/clients/clients.ui @@ -25,7 +25,7 @@ - images/run.png + :/images/view-refresh.svg Refresh Client List @@ -36,7 +36,7 @@ - images/unmark.png + :/images/emblem-system.svg List Jobs of Client @@ -47,7 +47,7 @@ - images/status.png + :/images/status.png Status Client In Console @@ -58,7 +58,7 @@ - images/unmark.png + :/images/weather-severe-alert.svg Purge Jobs @@ -69,7 +69,7 @@ - images/unmark.png + :/images/edit-cut.png Prune Jobs @@ -79,6 +79,8 @@ - + + + diff --git a/bacula/src/qt-console/console/console.ui b/bacula/src/qt-console/console/console.ui index c43facec2e..e29de7d36c 100644 --- a/bacula/src/qt-console/console/console.ui +++ b/bacula/src/qt-console/console/console.ui @@ -79,28 +79,39 @@ - ../images/status.png + :/images/status.png StatusDir + + :/images/utilities-terminal.svg + Console Help + + :/images/utilities-terminal.svg + Request Messages + + :/images/utilities-terminal.svg + Reload bacula-dir.conf - + + + diff --git a/bacula/src/qt-console/fileset/fileset.cpp b/bacula/src/qt-console/fileset/fileset.cpp index e346760c9a..55d6b216b1 100644 --- a/bacula/src/qt-console/fileset/fileset.cpp +++ b/bacula/src/qt-console/fileset/fileset.cpp @@ -46,7 +46,7 @@ FileSet::FileSet() m_name = "FileSets"; pgInitialize(); QTreeWidgetItem* thisitem = mainWin->getFromHash(this); - thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/system-file-manager.png"))); + thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/system-file-manager.svg"))); /* mp_treeWidget, FileSet Tree Tree Widget inherited from ui_fileset.h */ m_populated = false; diff --git a/bacula/src/qt-console/fileset/fileset.ui b/bacula/src/qt-console/fileset/fileset.ui index ecb51a803d..7774859eef 100644 --- a/bacula/src/qt-console/fileset/fileset.ui +++ b/bacula/src/qt-console/fileset/fileset.ui @@ -25,7 +25,7 @@ - :images/run.png + :images/view-refresh.svg Refresh FileSet List diff --git a/bacula/src/qt-console/images/cartridge-edit.svg b/bacula/src/qt-console/images/cartridge-edit.svg new file mode 100644 index 0000000000..80c594052b --- /dev/null +++ b/bacula/src/qt-console/images/cartridge-edit.svg @@ -0,0 +1,277 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bacula/src/qt-console/images/cartridge.png b/bacula/src/qt-console/images/cartridge.png deleted file mode 100644 index b7871b4219..0000000000 Binary files a/bacula/src/qt-console/images/cartridge.png and /dev/null differ diff --git a/bacula/src/qt-console/images/cartridge.svg b/bacula/src/qt-console/images/cartridge.svg index 7757a0da78..946e6906cd 100644 --- a/bacula/src/qt-console/images/cartridge.svg +++ b/bacula/src/qt-console/images/cartridge.svg @@ -45,7 +45,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Delete + + + + Jakub Steiner + + + + + edit + delete + shredder + + + + + Novell, Inc. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bacula/src/qt-console/images/emblem-system.png b/bacula/src/qt-console/images/emblem-system.png deleted file mode 100644 index 259ed26dd0..0000000000 Binary files a/bacula/src/qt-console/images/emblem-system.png and /dev/null differ diff --git a/bacula/src/qt-console/images/emblem-system.svg b/bacula/src/qt-console/images/emblem-system.svg index f5b116006a..3aba321cea 100644 --- a/bacula/src/qt-console/images/emblem-system.svg +++ b/bacula/src/qt-console/images/emblem-system.svg @@ -16,12 +16,22 @@ height="48px" id="svg11300" sodipodi:version="0.32" - inkscape:version="0.43+devel" - sodipodi:docbase="/home/tigert/cvs/freedesktop.org/tango-icon-theme/scalable/emblems" - sodipodi:docname="emblem-system.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:version="0.43" + sodipodi:docbase="/home/dbartley/src/bacula/src/qt-console/images" + sodipodi:docname="emblem-system.svg"> + + + + + + + + + inkscape:window-y="37" /> @@ -148,34 +198,38 @@ id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer"> - - - - + + + + + + diff --git a/bacula/src/qt-console/images/estimate-job.svg b/bacula/src/qt-console/images/estimate-job.svg new file mode 100644 index 0000000000..ed8792d117 --- /dev/null +++ b/bacula/src/qt-console/images/estimate-job.svg @@ -0,0 +1,222 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Emblem System + + + emblem + system + library + crucial + base + + + + + + + + + + + + + + + + + + + ? + + diff --git a/bacula/src/qt-console/images/help-browser.svg b/bacula/src/qt-console/images/help-browser.svg new file mode 100644 index 0000000000..669dda345f --- /dev/null +++ b/bacula/src/qt-console/images/help-browser.svg @@ -0,0 +1,213 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Help Browser + 2005-11-06 + + + Tuomas Kuosmanen + + + + + help + browser + documentation + docs + man + info + + + + + + Jakub Steiner, Andreas Nilsson + + + http://tigert.com + + + + + + + + + + + + + + + + + + diff --git a/bacula/src/qt-console/images/mail-message-new.svg b/bacula/src/qt-console/images/mail-message-new.svg new file mode 100644 index 0000000000..b81147fe7b --- /dev/null +++ b/bacula/src/qt-console/images/mail-message-new.svg @@ -0,0 +1,462 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Mail New + + + Jakub Steiner + + + + + Andreas Nilsson, Steven Garrity + + + + + + mail + e-mail + MUA + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bacula/src/qt-console/images/media-floppy.svg b/bacula/src/qt-console/images/media-floppy.svg new file mode 100644 index 0000000000..b3a2de9157 --- /dev/null +++ b/bacula/src/qt-console/images/media-floppy.svg @@ -0,0 +1,340 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Media Floppy + + + Tuomas Kuosmanen + + + http://www.tango-project.org + + + save + document + store + file + io + floppy + media + + + + + Jakub Steiner + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bacula/src/qt-console/images/network-server.png b/bacula/src/qt-console/images/network-server.png deleted file mode 100644 index 068ffebee2..0000000000 Binary files a/bacula/src/qt-console/images/network-server.png and /dev/null differ diff --git a/bacula/src/qt-console/images/package-x-generic.png b/bacula/src/qt-console/images/package-x-generic.png deleted file mode 100644 index 9015426153..0000000000 Binary files a/bacula/src/qt-console/images/package-x-generic.png and /dev/null differ diff --git a/bacula/src/qt-console/images/system-file-manager.png b/bacula/src/qt-console/images/system-file-manager.png deleted file mode 100644 index 60cade46c9..0000000000 Binary files a/bacula/src/qt-console/images/system-file-manager.png and /dev/null differ diff --git a/bacula/src/qt-console/images/utilities-terminal.png b/bacula/src/qt-console/images/utilities-terminal.png deleted file mode 100644 index c5b797a7df..0000000000 Binary files a/bacula/src/qt-console/images/utilities-terminal.png and /dev/null differ diff --git a/bacula/src/qt-console/images/view-refresh.svg b/bacula/src/qt-console/images/view-refresh.svg new file mode 100644 index 0000000000..8b63d9c943 --- /dev/null +++ b/bacula/src/qt-console/images/view-refresh.svg @@ -0,0 +1,391 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + View Refresh + + + reload + refresh + view + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bacula/src/qt-console/images/weather-severe-alert.svg b/bacula/src/qt-console/images/weather-severe-alert.svg new file mode 100644 index 0000000000..1506120821 --- /dev/null +++ b/bacula/src/qt-console/images/weather-severe-alert.svg @@ -0,0 +1,4696 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + weather-severe-alert + January 2006 + + + Ryan Collier (pseudo) + + + + + http://www.tango-project.org + + + http://www.pseudocode.org + + + weather + applet + notify + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bacula/src/qt-console/joblist/joblist.cpp b/bacula/src/qt-console/joblist/joblist.cpp index 0fdd0b57a7..b539c873ca 100644 --- a/bacula/src/qt-console/joblist/joblist.cpp +++ b/bacula/src/qt-console/joblist/joblist.cpp @@ -50,7 +50,7 @@ JobList::JobList(QString &mediaName, QString &clientname, m_clientName = clientname; pgInitialize(parentTreeWidgetItem); QTreeWidgetItem* thisitem = mainWin->getFromHash(this); - thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/emblem-system.png"))); + thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/emblem-system.svg"))); m_resultCount = 0; m_populated = false; diff --git a/bacula/src/qt-console/joblist/joblist.ui b/bacula/src/qt-console/joblist/joblist.ui index ef8e02eab0..e9f058a36c 100644 --- a/bacula/src/qt-console/joblist/joblist.ui +++ b/bacula/src/qt-console/joblist/joblist.ui @@ -280,6 +280,9 @@ Refresh + + :/images/view-refresh.svg + @@ -324,7 +327,7 @@ - :images/run.png + :/images/view-refresh.svg Refresh Job List @@ -335,7 +338,7 @@ - :images/unmark.png + :/images/utilities-terminal.svg ListJobid @@ -343,7 +346,7 @@ - :images/unmark.png + :/images/utilities-terminal.svg List Files On Job @@ -351,7 +354,7 @@ - :images/unmark.png + :/images/utilities-terminal.svg ListJobMedia @@ -359,7 +362,7 @@ - :images/unmark.png + :/images/utilities-terminal.svg ListVolumes @@ -367,7 +370,7 @@ - :images/unmark.png + :/images/weather-severe-alert.svg DeleteJob @@ -375,7 +378,7 @@ - :images/unmark.png + :/images/weather-severe-alert.svg PurgeFiles @@ -383,7 +386,7 @@ - :images/unmark.png + :/images/restore.png Restore From Job @@ -391,7 +394,7 @@ - :images/unmark.png + :/images/restore.png Restore From Time @@ -399,7 +402,7 @@ - :images/unmark.png + :/images/status.png Show Log for Job @@ -407,7 +410,7 @@ - :images/unmark.png + :/images/unmark.png Cancel Currently Running Job @@ -415,13 +418,15 @@ - :images/unmark.png + :/images/utilities-terminal.svg List Job Totals in Console - + + + diff --git a/bacula/src/qt-console/main.qrc b/bacula/src/qt-console/main.qrc index 4d5594dbf5..ddd0cdb18f 100644 --- a/bacula/src/qt-console/main.qrc +++ b/bacula/src/qt-console/main.qrc @@ -1,37 +1,44 @@ - - - images/backup.png - images/bat_icon.png - images/bat.png - images/big-server.png - images/connected.png - images/copy.png - images/cut.png - images/disconnected.png - images/folder.png - images/home.png - images/label.png - images/mark.png - images/new.png - images/next.png - images/open.png - images/paste.png - images/print.png - images/restore.png - images/run.png - images/save.png - images/server.png - images/status.png - images/undo.png - images/unmark.png - images/up.png - images/check.png - images/unchecked.png - images/cartridge.png - images/package-x-generic.png - images/utilities-terminal.png - images/network-server.png - images/system-file-manager.png - images/emblem-system.png - + + + images/backup.png + images/bat.png + images/bat_icon.png + images/big-server.png + images/cartridge-edit.svg + images/cartridge.svg + images/check.png + images/connected.png + images/copy.png + images/cut.png + images/disconnected.png + images/edit-cut.png + images/edit-delete.svg + images/emblem-system.svg + images/estimate-job.svg + images/folder.png + images/help-browser.svg + images/home.png + images/label.png + images/mail-message-new.svg + images/mark.png + images/network-server.svg + images/new.png + images/next.png + images/open.png + images/package-x-generic.svg + images/paste.png + images/print.png + images/restore.png + images/run.png + images/save.png + images/status.png + images/system-file-manager.svg + images/unchecked.png + images/undo.png + images/unmark.png + images/up.png + images/utilities-terminal.svg + images/view-refresh.svg + images/weather-severe-alert.svg + diff --git a/bacula/src/qt-console/main.ui b/bacula/src/qt-console/main.ui index 9bc9687b5c..098d74ac83 100644 --- a/bacula/src/qt-console/main.ui +++ b/bacula/src/qt-console/main.ui @@ -14,7 +14,7 @@ bat - Bacula Admin Tool - :images/bat.png + :/images/bat.png @@ -71,7 +71,7 @@ 0 0 882 - 28 + 26 @@ -307,7 +307,7 @@ - :images/bat.png + :/images/bat.png &About bat @@ -315,7 +315,7 @@ - :images/copy.png + :/images/copy.png &Copy @@ -323,7 +323,7 @@ - :images/cut.png + :/images/cut.png Cu&t @@ -331,7 +331,7 @@ - :images/new.png + :/images/new.png new @@ -339,7 +339,7 @@ - :images/open.png + :/images/open.png open @@ -347,7 +347,7 @@ - :images/paste.png + :/images/paste.png &Paste @@ -355,7 +355,7 @@ - :images/print.png + :/images/print.png &Print @@ -366,7 +366,7 @@ - :images/save.png + :/images/save.png &Save @@ -377,7 +377,7 @@ - :images/disconnected.png + :/images/disconnected.png Connect @@ -388,7 +388,7 @@ - :images/label.png + :/images/label.png Label @@ -402,7 +402,7 @@ - :images/restore.png + :/images/restore.png Restore @@ -416,7 +416,7 @@ false - :images/run.png + :/images/emblem-system.svg Run Job @@ -436,7 +436,7 @@ false - :images/run.png + :/images/estimate-job.svg Estimate Job @@ -453,7 +453,7 @@ - :images/status.png + :/images/status.png StatusDir @@ -472,7 +472,7 @@ - :images/up.png + :/images/up.png Undock Window @@ -480,7 +480,7 @@ - :images/unmark.png + :/images/up.png ToggleDock @@ -488,7 +488,7 @@ - :images/unmark.png + :/images/unmark.png Close Page @@ -499,7 +499,7 @@ - :images/status.png + :/images/mail-message-new.svg Messages @@ -520,6 +520,9 @@ + + :/images/help-browser.svg + bat &Help diff --git a/bacula/src/qt-console/mainwin.cpp b/bacula/src/qt-console/mainwin.cpp index 9380768d83..3f5ad3979d 100644 --- a/bacula/src/qt-console/mainwin.cpp +++ b/bacula/src/qt-console/mainwin.cpp @@ -116,7 +116,7 @@ void MainWin::createPages() /* Create Tree Widget Item */ item = createPage("Console", topItem); if (!m_firstItem){ m_firstItem = item; } - item->setIcon(0,QIcon(QString::fromUtf8(":images/utilities-terminal.png"))); + item->setIcon(0,QIcon(QString::fromUtf8(":images/utilities-terminal.svg"))); /* insert the cosole and tree widget item into the hashes */ hashInsert(item, m_currentConsole); diff --git a/bacula/src/qt-console/medialist/medialist.cpp b/bacula/src/qt-console/medialist/medialist.cpp index f558572627..6cad0dbb57 100644 --- a/bacula/src/qt-console/medialist/medialist.cpp +++ b/bacula/src/qt-console/medialist/medialist.cpp @@ -50,7 +50,7 @@ MediaList::MediaList() m_name = "Media"; pgInitialize(); QTreeWidgetItem* thisitem = mainWin->getFromHash(this); - thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/cartridge.png"))); + thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/cartridge.svg"))); /* mp_treeWidget, Storage Tree Tree Widget inherited from ui_medialist.h */ m_populated = false; diff --git a/bacula/src/qt-console/medialist/medialist.ui b/bacula/src/qt-console/medialist/medialist.ui index 71b8383dd9..4dfb5bb1f1 100644 --- a/bacula/src/qt-console/medialist/medialist.ui +++ b/bacula/src/qt-console/medialist/medialist.ui @@ -25,7 +25,7 @@ - :images/run.png + :/images/view-refresh.svg Refresh Media List @@ -36,7 +36,7 @@ - :images/status.png + :/images/cartridge-edit.svg Edit Volume @@ -44,7 +44,7 @@ - :images/unmark.png + :/images/emblem-system.svg List Jobs On Volume @@ -52,7 +52,7 @@ - :images/unmark.png + :/images/edit-delete.svg Delete Volume @@ -60,7 +60,7 @@ - :images/unmark.png + :/images/edit-cut.png Prune Volume @@ -68,7 +68,7 @@ - :images/unmark.png + :/images/weather-severe-alert.svg Purge Volume @@ -76,13 +76,15 @@ - :images/unmark.png + :/images/label.png Relabel Volume - + + + diff --git a/bacula/src/qt-console/restore/prerestore.cpp b/bacula/src/qt-console/restore/prerestore.cpp index d399cd50c6..d24822fa5c 100644 --- a/bacula/src/qt-console/restore/prerestore.cpp +++ b/bacula/src/qt-console/restore/prerestore.cpp @@ -64,6 +64,8 @@ void prerestorePage::buildPage() pgInitialize(); m_console->notify(false); m_closeable = true; + QTreeWidgetItem* thisitem = mainWin->getFromHash(this); + thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/restore.png"))); if (!m_console->preventInUseConnect()) return; diff --git a/bacula/src/qt-console/restore/restore.cpp b/bacula/src/qt-console/restore/restore.cpp index d4e2dd1a09..456e511ef8 100644 --- a/bacula/src/qt-console/restore/restore.cpp +++ b/bacula/src/qt-console/restore/restore.cpp @@ -45,6 +45,9 @@ restorePage::restorePage() setupUi(this); m_name = "Restore Select"; pgInitialize(); + QTreeWidgetItem* thisitem = mainWin->getFromHash(this); + thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/restore.png"))); + m_console->notify(false); /* this should already be off */ m_closeable = true; diff --git a/bacula/src/qt-console/run/estimate.cpp b/bacula/src/qt-console/run/estimate.cpp index d3295d741b..39ffc39e72 100644 --- a/bacula/src/qt-console/run/estimate.cpp +++ b/bacula/src/qt-console/run/estimate.cpp @@ -58,6 +58,8 @@ estimatePage::estimatePage() connect(jobCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(job_name_change(int))); connect(okButton, SIGNAL(pressed()), this, SLOT(okButtonPushed())); connect(cancelButton, SIGNAL(pressed()), this, SLOT(cancelButtonPushed())); + QTreeWidgetItem* thisitem = mainWin->getFromHash(this); + thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/estimate-job.svg"))); dockPage(); setCurrent(); diff --git a/bacula/src/qt-console/run/run.cpp b/bacula/src/qt-console/run/run.cpp index c4b0bf697d..4ea8d58233 100644 --- a/bacula/src/qt-console/run/run.cpp +++ b/bacula/src/qt-console/run/run.cpp @@ -47,6 +47,8 @@ runPage::runPage() m_name = "Run"; pgInitialize(); setupUi(this); + QTreeWidgetItem* thisitem = mainWin->getFromHash(this); + thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/emblem-system.svg"))); m_console->notify(false); m_console->beginNewCommand(); diff --git a/bacula/src/qt-console/run/runcmd.cpp b/bacula/src/qt-console/run/runcmd.cpp index 5c471efe64..93ec9e8989 100644 --- a/bacula/src/qt-console/run/runcmd.cpp +++ b/bacula/src/qt-console/run/runcmd.cpp @@ -51,6 +51,8 @@ runCmdPage::runCmdPage() m_name = "Restore Run"; pgInitialize(); setupUi(this); + QTreeWidgetItem* thisitem = mainWin->getFromHash(this); + thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/restore.png"))); m_console->notify(false); fill(); diff --git a/bacula/src/qt-console/storage/storage.cpp b/bacula/src/qt-console/storage/storage.cpp index 153319ac93..4b8bd9846a 100644 --- a/bacula/src/qt-console/storage/storage.cpp +++ b/bacula/src/qt-console/storage/storage.cpp @@ -48,7 +48,7 @@ Storage::Storage() m_name = "Storage"; pgInitialize(); QTreeWidgetItem* thisitem = mainWin->getFromHash(this); - thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/package-x-generic.png"))); + thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/package-x-generic.svg"))); /* mp_treeWidget, Storage Tree Tree Widget inherited from ui_storage.h */ m_populated = false; diff --git a/bacula/src/qt-console/storage/storage.ui b/bacula/src/qt-console/storage/storage.ui index a5182dae2d..61a37e5d84 100644 --- a/bacula/src/qt-console/storage/storage.ui +++ b/bacula/src/qt-console/storage/storage.ui @@ -25,7 +25,7 @@ - :images/run.png + :/images/view-refresh.svg Refresh Storage List @@ -36,7 +36,7 @@ - :images/status.png + :/images/status.png Status Storage In Console @@ -44,7 +44,7 @@ - :images/unmark.png + :/images/label.png Label Storage @@ -52,7 +52,7 @@ - :images/unmark.png + :/images/cartridge.svg MountStorage @@ -60,13 +60,15 @@ - :images/unmark.png + :/images/cartridge.svg UnMount Storage - + + +