From b1b3baa48906a80d04a47ce1ef7e1b6a99c2f180 Mon Sep 17 00:00:00 2001 From: Dirk H Bartley Date: Mon, 28 May 2007 19:39:58 +0000 Subject: [PATCH] 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 --- bacula/src/qt-console/clients/clients.cpp | 2 +- bacula/src/qt-console/clients/clients.ui | 14 +- bacula/src/qt-console/console/console.ui | 15 +- bacula/src/qt-console/fileset/fileset.cpp | 2 +- bacula/src/qt-console/fileset/fileset.ui | 2 +- .../src/qt-console/images/cartridge-edit.svg | 277 + bacula/src/qt-console/images/cartridge.png | Bin 1688 -> 0 bytes bacula/src/qt-console/images/cartridge.svg | 2 +- bacula/src/qt-console/images/edit-cut.png | Bin 0 -> 807 bytes bacula/src/qt-console/images/edit-delete.svg | 882 ++++ .../src/qt-console/images/emblem-system.png | Bin 629 -> 0 bytes .../src/qt-console/images/emblem-system.svg | 122 +- bacula/src/qt-console/images/estimate-job.svg | 222 + bacula/src/qt-console/images/help-browser.svg | 213 + .../qt-console/images/mail-message-new.svg | 462 ++ bacula/src/qt-console/images/media-floppy.svg | 340 ++ .../src/qt-console/images/network-server.png | Bin 642 -> 0 bytes .../qt-console/images/package-x-generic.png | Bin 540 -> 0 bytes .../qt-console/images/system-file-manager.png | Bin 378 -> 0 bytes .../qt-console/images/utilities-terminal.png | Bin 668 -> 0 bytes bacula/src/qt-console/images/view-refresh.svg | 391 ++ .../images/weather-severe-alert.svg | 4696 +++++++++++++++++ bacula/src/qt-console/joblist/joblist.cpp | 2 +- bacula/src/qt-console/joblist/joblist.ui | 31 +- bacula/src/qt-console/main.qrc | 79 +- bacula/src/qt-console/main.ui | 43 +- bacula/src/qt-console/mainwin.cpp | 2 +- bacula/src/qt-console/medialist/medialist.cpp | 2 +- bacula/src/qt-console/medialist/medialist.ui | 18 +- bacula/src/qt-console/restore/prerestore.cpp | 2 + bacula/src/qt-console/restore/restore.cpp | 3 + bacula/src/qt-console/run/estimate.cpp | 2 + bacula/src/qt-console/run/run.cpp | 2 + bacula/src/qt-console/run/runcmd.cpp | 2 + bacula/src/qt-console/storage/storage.cpp | 2 +- bacula/src/qt-console/storage/storage.ui | 14 +- 36 files changed, 7713 insertions(+), 133 deletions(-) create mode 100644 bacula/src/qt-console/images/cartridge-edit.svg delete mode 100644 bacula/src/qt-console/images/cartridge.png create mode 100644 bacula/src/qt-console/images/edit-cut.png create mode 100644 bacula/src/qt-console/images/edit-delete.svg delete mode 100644 bacula/src/qt-console/images/emblem-system.png create mode 100644 bacula/src/qt-console/images/estimate-job.svg create mode 100644 bacula/src/qt-console/images/help-browser.svg create mode 100644 bacula/src/qt-console/images/mail-message-new.svg create mode 100644 bacula/src/qt-console/images/media-floppy.svg delete mode 100644 bacula/src/qt-console/images/network-server.png delete mode 100644 bacula/src/qt-console/images/package-x-generic.png delete mode 100644 bacula/src/qt-console/images/system-file-manager.png delete mode 100644 bacula/src/qt-console/images/utilities-terminal.png create mode 100644 bacula/src/qt-console/images/view-refresh.svg create mode 100644 bacula/src/qt-console/images/weather-severe-alert.svg 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 b7871b4219aca235444ce12d6fce1387e83ec130..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1688 zcmV;J250$+P)pmrp_=UpByE5R1PNf6rd3d%l4vNh<^Bg#s6U`UuLWLui^tGMOZw&to>5 zvD@v4;z|{XFQR-pgs$sMPEL|er%_dvU?4y~n zp|AekDydv#lxs&1@zIa_7(4zl`HTWA%0TkQRsQ+&N6|AW(&;p@SPX#Y5B-dmJzpi8 zO7e>zKF9e>gV^nM>~?#3shE{P_EFLH#6ku}4j)3#qyQ)s3INnqR}<>n1A>6r>7sA< z18AB?JRTw3)oLw!TV(G&i0SA}uKn%TMXh2q8j)q0NHoe@hhHP7q=@|Y6W)CNNKpWr#eyu$ zR8&-8Hk;=&cRMo6K0LA;A@un7_2~IyB~7}nqbLeygOPYLftp`vO-U5#*s+6DHakC- z%jHNU5@a$Nq!KN+SamJkxN0{ermtT?w8ozqs z5Uj69lBDG`B1*WW9O8y93|^ZNwO}Xd@u7^5B51j#eo@5fbYipFNTpIZtXAx9H|bol zx4U~MJ0Jf#0Ph}ojgu!&5Rb=~#H-j4qTr~+6YM|~EOx90fsGym^&1;7S8imvl9D6| zx7!Vp#Ai2dpsH%o^Vaq*B#Q;fVqsfn4>p?(pU;QEuyE$-y3QK64RJ%~%*(Cme-_Of zz$42%_so92*0F_kb&VK2Rm)(^fT*fUI2OuLw$B0A|ME-M@?X6pB-xk8CWeDetsG5eZW=etxf`F!Jq*5s~O~Zgr zOO~%J>%zKl`B%&x%v#ABsz1y%i_0Pmud=})AQKnA4M6-F4j{Dn)Mx&g0 z?|m*_n?M;KgM4-=#Ukmtjz^a9$TFEl^^r& z-_us>WNRqICu3urdhaYB-;9yHHNx_T>kPzP_ZW>v(&;pcGL0mORMxjpS-TO>lfRnx zOI!9HJov>RCf7aKnjhfml*Z+Ozf$L~pueY!3a5!!7L~CD~uXZgjXd1Upzd}{?B0Jme!{u^u_S`uJ2CovibsbHKt~7mK zHm{$Ch6Zd;y^PW7xP5>*bGF8Zp69c=_T>X zzGHb?_F&)l3MayDjvV_tE|-h%?SG1W5BE|NY(a8(ftjxGIxL8Ru99(Xy9QQLHXdf; z?cWeIPSDfYfze>#=o`nl^m!aTlb}Ah3H#H(E4mBbRe(7quMLwr^&;EWJ4mKd{A+j^ zDuZ|$+i`V&r{tXSuel}UtZio9fj=x0P6{X_=- iL~QI5){44iz5fF!E_2WnFG9Ki0000 z1Hh-$q?nqWnZ{11 z1JXGjGT#nH5JGSEt3`W-F{81UPnb`417>0bwH3tCzhB0pcmY+{X4F+L%h_RSnk|a_^$fF6B>ZO8Zd4#b& zIcbiYQS<4l$&8G?%anG5EK?xFunXWgL9J9WU-R-}CY`QnUJ$&B%*-pvkEGQ$e0RAv z4j($yFl({I2&EV>4gdf!007lmt}-!W5XkX| l!x~>C;!~(p=dGgX{tck>ItSb|!8`x}002ovPDHLkV1ju0W~TrE literal 0 HcmV?d00001 diff --git a/bacula/src/qt-console/images/edit-delete.svg b/bacula/src/qt-console/images/edit-delete.svg new file mode 100644 index 0000000000..146d32db9e --- /dev/null +++ b/bacula/src/qt-console/images/edit-delete.svg @@ -0,0 +1,882 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 259ed26dd000fcfb81b2c312980765a181a65486..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 629 zcmV-*0*d{KP)i103CEi zSad^gZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00G%aL_t(I%f*vTYZGA< zg`a6_gEXBqBcUckH-X08gk(ZUidc0eHCc%W6$Bw<{y`C3bs>l=5jQRU1EnnpL$Xl} zSV57z`Iw@D+a#2UG$mQIh#zrbXGq(0)rEI;dC%o=?>Xm%bCz@#@buY}zSBQidVJ>G znA6<7cPFFkaT7p@N){lWGgw_)Ifk7ia|v`kZsv0amSq8$p`c33ZV(Eppkt)Fl@Owm{qp(iw__VPf`x)A0JU1JXWQRj2~pit6y>TUjXqq++zL47=z84M zV#Hy}=L}+rf2;a@KDpU!Zf>k^nVnAOy)1hJ&N=yE|O=HjAr(hPT zmg@ji%XJE7kv)6g$-!_9j#TZtNz^ej(-{i8MJJi&$4?(lCGp&U;s4iPvstez0t~w? P00000NkvXXu0mjf3(pax 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 068ffebee274d5b48b36a68670e191a7ed4cbf06..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 642 zcmV-|0)737P)WFU8GbZ8({Xk{QrNlj1+3MgYKATls8GayP~Yjt8ECu(VJ zZDC_4AX9W@X>Mh5Co}I@0005SNkl)(8U!C>$i_{ANvESF31eP4Xv7tiy=bzN~?SBx=YjFItpELv*;zFx7l)^a|d zugLcVPN$RX_xn%;>rzB1#b`A8$N{ZZD~hf6kEhd#a=HAFJe^K4#{3h|T7Ln)hZo6Y z5@QS^f`||V0V0C$`+o_RMGyp`?Vnb++XbN4>j7{)9+}VQ0EkGGDU3rQfKI0~vqEBs zMxzmZ3M)`bAtD%Kh{xk7r2y#n`%l(jFn9%Cwbo);7Q^9?)oMjPpQltRvE6R*eLt!| zM95~d;XZtey>F7^I24OTX0sVeDdO=sg+d`ZmlkfOAR-hB1tyaT?RFd6wsBpT#bOav zVB0o_!{PB5>-9R-YBlP7E|~=c< zHk%EJM1u8tO)M6RHa6V5D+`CiflMX?K&4V4l}gcUHc6#Y)M_=->GVyaOM&N?mzN*> cKb`^p0DMpp{`zwTlK=n!07*qoM6N<$f&;Gw9smFU 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 9015426153054c0b529b4d9ebdfa06a221d568ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 540 zcmV+%0^|LOP)Vhlm95D^5CAW0*NO~l4h2`Gn+SSXee3p=k!DITN| zloYWEXca63MGv(U^qPobY>b#9Dp8{0UEbTVcsUg#cu}XB*@6F?*_nZVGy!PT%rNk5 zliHE-nb49(%`}10vsV}N{rqDUTQ;Bo7$dnCNIoxON&^{bA}^laGjk880qPdu^yOBT zEWa_clc&Tx2f*4|8y`gof^!a2aQL`dICk+4OK+dE`@k5lTlYsTutSWPkfmY@o;2kB zMZE(6RQjtR27v0WeY98J5hzgEvJDN{um$>(l@Gjpa+{MEra-d|pH&4=2yN1juSixu z;fgT;7AQWtIU$FSo`duYWUHV7)eJ(4YRG+92Ww!@-u*n7y$)#60)BA&kYbGBD?sJP zdQc>%Uxr2wvM|?-q){`MfcjsaLA`SadgR1;mgk#Ysp6f7xO?jg<1;~QC+VXy zJ@MAA0M19>AjQodNDi79I5|3(RJen zPo0{EhVu`FIhs1;8#^*ol`_^Ua5ZgRTEO;6WS?JG1xHlIrtQ_)g8XMypD%bh92XZL%@y~j=r?zX#<>_Ay zj?MhVvcApGd@i4rvfN_pU)QGW`q#B_OPRhKo8-;yZEvqm4`R9-*L?7~b=36Kx*Zc}(y&$D=J@HUQ8!MxuejCZ|M!i% z&Q&&tS9kw!Gf+%;qdi-?J-PWx^^%|^_nzBbuuzY(&i>xb{mLL=FWNdBW7kS-|1Flt9VjZIBnic?*Db$yx>QG&VIP!QSJs zc<=BfKy0=M*Ov)53jjFhb^=6%sSh*s_1@*#$P<vkh+39&!fBd1N{T!K~miLpN5%0^7 zP?hbT6c8YA-0Z%^@Yn!vCnpHf3aBY5S34BA-9-fWI{S@FS1*DHD0nwMQ@+zW=FIu_ z^4U4Rs|JAcE~$}90nl-_txCE=rBeGS5Gby0{l5*X^50PdrIZG#Z$944!ootiUH7xb zBZrCN2&L5T0Mu|cH-BwxY&6)|C=!MtVYo&VMHp+a)?&9O(ORrEXrozKDQMtnAmZ=j zm%fwD&0jXgWVF_mQ8uOw*&b!BHAb7*SUV&l_x=LcqJkHgP4yiB0000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 - + + + -- 2.39.5