From 483964e4ba06d40c810a80d2854903366d46994c Mon Sep 17 00:00:00 2001 From: Dirk H Bartley Date: Sun, 27 May 2007 12:26:53 +0000 Subject: [PATCH] Add icons for the page selector. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4918 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/qt-console/COMMANDS | 35 +- bacula/src/qt-console/clients/clients.cpp | 2 + bacula/src/qt-console/fileset/fileset.cpp | 2 + bacula/src/qt-console/images/cartridge.png | Bin 0 -> 1688 bytes bacula/src/qt-console/images/cartridge.svg | 148 +++ .../src/qt-console/images/emblem-system.png | Bin 0 -> 629 bytes .../src/qt-console/images/emblem-system.svg | 181 +++ bacula/src/qt-console/images/folder.png | Bin 0 -> 498 bytes .../src/qt-console/images/network-server.png | Bin 0 -> 642 bytes .../src/qt-console/images/network-server.svg | 1002 +++++++++++++++++ .../qt-console/images/package-x-generic.png | Bin 0 -> 540 bytes .../qt-console/images/package-x-generic.svg | 483 ++++++++ .../qt-console/images/system-file-manager.png | Bin 0 -> 378 bytes .../qt-console/images/system-file-manager.svg | 315 ++++++ .../qt-console/images/utilities-terminal.png | Bin 0 -> 668 bytes .../qt-console/images/utilities-terminal.svg | 498 ++++++++ bacula/src/qt-console/joblist/joblist.cpp | 3 + bacula/src/qt-console/main.qrc | 7 + bacula/src/qt-console/mainwin.cpp | 1 + bacula/src/qt-console/medialist/medialist.cpp | 2 + bacula/src/qt-console/storage/storage.cpp | 2 + 21 files changed, 2667 insertions(+), 14 deletions(-) create mode 100644 bacula/src/qt-console/images/cartridge.png create mode 100644 bacula/src/qt-console/images/cartridge.svg create mode 100644 bacula/src/qt-console/images/emblem-system.png create mode 100644 bacula/src/qt-console/images/emblem-system.svg create mode 100644 bacula/src/qt-console/images/folder.png create mode 100644 bacula/src/qt-console/images/network-server.png create mode 100644 bacula/src/qt-console/images/network-server.svg create mode 100644 bacula/src/qt-console/images/package-x-generic.png create mode 100644 bacula/src/qt-console/images/package-x-generic.svg create mode 100644 bacula/src/qt-console/images/system-file-manager.png create mode 100644 bacula/src/qt-console/images/system-file-manager.svg create mode 100644 bacula/src/qt-console/images/utilities-terminal.png create mode 100644 bacula/src/qt-console/images/utilities-terminal.svg diff --git a/bacula/src/qt-console/COMMANDS b/bacula/src/qt-console/COMMANDS index c3272a872e..0d2c16065e 100644 --- a/bacula/src/qt-console/COMMANDS +++ b/bacula/src/qt-console/COMMANDS @@ -1,6 +1,3 @@ -add [pool= storage= jobid=] -These are done from config files - autodisplay on/off could be done in the context of the console @@ -11,11 +8,7 @@ command as opposed to a property of a storage device cancel [jobid= job= ujobid=] To be done in the context of a status dir graphical window. -create [pool=] -Done in a config file - -delete [volume= pool= job jobid=] -not done for pool yet +delete pool= disable job and enable job Could be done in the context of a jobs window which is not yet created @@ -26,9 +19,6 @@ Could be a dialog in the context of a jobs window. help could be in the console window -label -Done by kern before I started - list many are done or are reproduced by having windows @@ -46,9 +36,6 @@ purge jobs client= (of all jobs) purge volume|volume= (of all jobs) this one is done from media -relabel -done - release storage= Would need to explain what this does in bat with a dialog @@ -90,3 +77,23 @@ Not really needed wait Mmmmmmm + +CONFIG FILE +=========================== +add [pool= storage= jobid=] +These are done from config files + +create [pool=] +Done in a config file + + +DONE +=========================== + +label +Done by kern before I started + +delete [volume= job jobid=] + +relabel +done diff --git a/bacula/src/qt-console/clients/clients.cpp b/bacula/src/qt-console/clients/clients.cpp index 93d75de8f7..362400e894 100644 --- a/bacula/src/qt-console/clients/clients.cpp +++ b/bacula/src/qt-console/clients/clients.cpp @@ -45,6 +45,8 @@ Clients::Clients() setupUi(this); m_name = "Clients"; pgInitialize(); + QTreeWidgetItem* thisitem = mainWin->getFromHash(this); + thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/network-server.png"))); /* mp_treeWidget, Storage Tree Tree Widget inherited from ui_client.h */ m_populated = false; diff --git a/bacula/src/qt-console/fileset/fileset.cpp b/bacula/src/qt-console/fileset/fileset.cpp index 905322e8b2..c9b10c63fc 100644 --- a/bacula/src/qt-console/fileset/fileset.cpp +++ b/bacula/src/qt-console/fileset/fileset.cpp @@ -45,6 +45,8 @@ FileSet::FileSet() setupUi(this); m_name = "FileSets"; pgInitialize(); + QTreeWidgetItem* thisitem = mainWin->getFromHash(this); + thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/system-file-manager.png"))); /* mp_treeWidget, FileSet Tree Tree Widget inherited from ui_fileset.h */ m_populated = false; diff --git a/bacula/src/qt-console/images/cartridge.png b/bacula/src/qt-console/images/cartridge.png new file mode 100644 index 0000000000000000000000000000000000000000..b7871b4219aca235444ce12d6fce1387e83ec130 GIT binary patch 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 + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/bacula/src/qt-console/images/emblem-system.png b/bacula/src/qt-console/images/emblem-system.png new file mode 100644 index 0000000000000000000000000000000000000000..259ed26dd000fcfb81b2c312980765a181a65486 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/bacula/src/qt-console/images/emblem-system.svg b/bacula/src/qt-console/images/emblem-system.svg new file mode 100644 index 0000000000..f5b116006a --- /dev/null +++ b/bacula/src/qt-console/images/emblem-system.svg @@ -0,0 +1,181 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Emblem System + + + emblem + system + library + crucial + base + + + + + + + + + + + + + + + + + + + + diff --git a/bacula/src/qt-console/images/folder.png b/bacula/src/qt-console/images/folder.png new file mode 100644 index 0000000000000000000000000000000000000000..901edc9624a23d92a9fcbc0c9c450bf37409da18 GIT binary patch literal 498 zcmVT` z=fK?B+ueUcgw&mTx8?fP8#5oZ_IS4UlwPlQrCO;yj|7yQi?lwqqD*+(cr$(Vs9LE# z0Eh#m(;1HB@{s`NLMd=l3Z)da7uEYf05Hbjc`mO%_Gxx9%%#H)XKp%DNa@dEf@UYf zg64HNtq;9mzz z0TxYQt&biCWrx3zi1`R0A}FO05k$Zj!CGNxeauK0j4VSdL!1G*==LU59h96xI zMByWh2N4hikuew;S(yNSb=sUhdyWrZ|BROccMMviB*Wb(P{I#8i on>e<%XnEP;xA*VLo2x9V1Hy;2%BQg6_y7O^07*qoM6N<$g5ayrIRF3v literal 0 HcmV?d00001 diff --git a/bacula/src/qt-console/images/network-server.png b/bacula/src/qt-console/images/network-server.png new file mode 100644 index 0000000000000000000000000000000000000000..068ffebee274d5b48b36a68670e191a7ed4cbf06 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/bacula/src/qt-console/images/network-server.svg b/bacula/src/qt-console/images/network-server.svg new file mode 100644 index 0000000000..47837c05bb --- /dev/null +++ b/bacula/src/qt-console/images/network-server.svg @@ -0,0 +1,1002 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Server + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + + server + daemon + comupetr + lan + service + provider + + + + + Garrett LeSage + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bacula/src/qt-console/images/package-x-generic.png b/bacula/src/qt-console/images/package-x-generic.png new file mode 100644 index 0000000000000000000000000000000000000000..9015426153054c0b529b4d9ebdfa06a221d568ac GIT binary patch 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> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Package + + + Jakub Steiner + + + http://jimmac.musichall.cz/ + + + package + archive + tarball + tar + bzip + gzip + zip + arj + tar + jar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bacula/src/qt-console/images/system-file-manager.png b/bacula/src/qt-console/images/system-file-manager.png new file mode 100644 index 0000000000000000000000000000000000000000..60cade46c9c01c2d3e3d6dfb4c7a7038624215d8 GIT binary patch literal 378 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEAjQodNDi79I5|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{m + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + File Manager + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + file + manager + copy + move + filesystem + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bacula/src/qt-console/images/utilities-terminal.png b/bacula/src/qt-console/images/utilities-terminal.png new file mode 100644 index 0000000000000000000000000000000000000000..c5b797a7dfe82a52fee3df9c7e19d49a4461ac02 GIT binary patch literal 668 zcmV;N0%QG&P)LL=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 + + Terminal + 2005-10-15 + + + Andreas Nilsson + + + + + terminal + emulator + term + command line + + + + + + Jakub Steiner + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bacula/src/qt-console/joblist/joblist.cpp b/bacula/src/qt-console/joblist/joblist.cpp index fbca3d3196..698e763be1 100644 --- a/bacula/src/qt-console/joblist/joblist.cpp +++ b/bacula/src/qt-console/joblist/joblist.cpp @@ -49,6 +49,9 @@ JobList::JobList(QString &mediaName, QString &clientname, m_mediaName = mediaName; m_clientName = clientname; pgInitialize(parentTreeWidgetItem); + QTreeWidgetItem* thisitem = mainWin->getFromHash(this); + thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/emblem-system.png"))); + m_resultCount = 0; m_populated = false; m_closeable = false; diff --git a/bacula/src/qt-console/main.qrc b/bacula/src/qt-console/main.qrc index bb946e4485..4d5594dbf5 100644 --- a/bacula/src/qt-console/main.qrc +++ b/bacula/src/qt-console/main.qrc @@ -8,6 +8,7 @@ images/copy.png images/cut.png images/disconnected.png + images/folder.png images/home.png images/label.png images/mark.png @@ -26,5 +27,11 @@ 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 diff --git a/bacula/src/qt-console/mainwin.cpp b/bacula/src/qt-console/mainwin.cpp index f28778817e..2ae2832f00 100644 --- a/bacula/src/qt-console/mainwin.cpp +++ b/bacula/src/qt-console/mainwin.cpp @@ -116,6 +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"))); /* 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 1f9d35ab77..9da7cc9055 100644 --- a/bacula/src/qt-console/medialist/medialist.cpp +++ b/bacula/src/qt-console/medialist/medialist.cpp @@ -48,6 +48,8 @@ MediaList::MediaList() setupUi(this); m_name = "Media"; pgInitialize(); + QTreeWidgetItem* thisitem = mainWin->getFromHash(this); + thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/cartridge.png"))); /* mp_treeWidget, Storage Tree Tree Widget inherited from ui_medialist.h */ m_populated = false; diff --git a/bacula/src/qt-console/storage/storage.cpp b/bacula/src/qt-console/storage/storage.cpp index 8e056f5e68..0069a589a6 100644 --- a/bacula/src/qt-console/storage/storage.cpp +++ b/bacula/src/qt-console/storage/storage.cpp @@ -47,6 +47,8 @@ Storage::Storage() setupUi(this); m_name = "Storage"; pgInitialize(); + QTreeWidgetItem* thisitem = mainWin->getFromHash(this); + thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/package-x-generic.png"))); /* mp_treeWidget, Storage Tree Tree Widget inherited from ui_storage.h */ m_populated = false; -- 2.39.5