From 13e8444031d0cb93eb5224fcc6d62a8ff66ab69b Mon Sep 17 00:00:00 2001 From: Dirk H Bartley Date: Sun, 24 Feb 2008 16:32:02 +0000 Subject: [PATCH] Change some icons around to make a little more senese with a status in console option and a status page option. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6481 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/qt-console/clients/clients.ui | 2 +- bacula/src/qt-console/fileset/fileset.ui | 2 +- .../images/applications-graphics.png | Bin 0 -> 1668 bytes .../images/applications-graphics.svg | 545 ++++++++++++++++ .../src/qt-console/images/status-console.png | Bin 0 -> 1960 bytes .../src/qt-console/images/status-console.svg | 606 ++++++++++++++++++ bacula/src/qt-console/images/status.png | Bin 952 -> 1853 bytes bacula/src/qt-console/images/status.svg | 380 +++++++++++ bacula/src/qt-console/jobgraphs/jobplot.cpp | 2 +- bacula/src/qt-console/main.qrc | 2 + bacula/src/qt-console/main.ui | 6 +- bacula/src/qt-console/prefs.ui | 237 ++----- bacula/src/qt-console/status/dirstat.cpp | 2 +- bacula/src/qt-console/status/dirstat.ui | 69 +- bacula/src/qt-console/storage/storage.ui | 2 +- 15 files changed, 1612 insertions(+), 243 deletions(-) create mode 100644 bacula/src/qt-console/images/applications-graphics.png create mode 100644 bacula/src/qt-console/images/applications-graphics.svg create mode 100644 bacula/src/qt-console/images/status-console.png create mode 100644 bacula/src/qt-console/images/status-console.svg create mode 100644 bacula/src/qt-console/images/status.svg diff --git a/bacula/src/qt-console/clients/clients.ui b/bacula/src/qt-console/clients/clients.ui index 0f69dbc51d..cd8e91acca 100644 --- a/bacula/src/qt-console/clients/clients.ui +++ b/bacula/src/qt-console/clients/clients.ui @@ -47,7 +47,7 @@ - :/images/status.png + :/images/status-console.png Status Client In Console diff --git a/bacula/src/qt-console/fileset/fileset.ui b/bacula/src/qt-console/fileset/fileset.ui index 7df6809b30..7b0aaf36ce 100644 --- a/bacula/src/qt-console/fileset/fileset.ui +++ b/bacula/src/qt-console/fileset/fileset.ui @@ -36,7 +36,7 @@ - :/images/status.png + :/images/status-console.png Status FileSet In Console diff --git a/bacula/src/qt-console/images/applications-graphics.png b/bacula/src/qt-console/images/applications-graphics.png new file mode 100644 index 0000000000000000000000000000000000000000..e392c298a6a984a11998238c7de58af796988da1 GIT binary patch literal 1668 zcmV-~27CF5P)aR*|!EFT!`B&7Es(?^PoWvx6hOE{XUp59n?NoB_*+|(xkr`B!SSN0)GF$Y$59IRbkc5BPp<59n$XsJ==)xZXtSFDUp>sg@ zrq`IJK>)xL0v^BOE+GU|rEX=+4RavTu5B}K`Q>`so&!~VIB|Xwh1oPbP;kW$K@@P; zTflci1SHzE&5DFq_tpJfdwrxDKmX}HsIIAp6>bG%3{(G|#=nP#`5!)+>|GEngt#tr z-QipNXuB`@ZXziDv8P@Pe*B@hR^gnB-rn9zyLRomr9A$+97wclF#^2VxyBc@`~>e- zKZtE>*1>TcxUP$IIt|V_gb*NvARdob_xJa|0^q(UCm06x^(aZ3;{l9)dk2IXxSf{jXZB+2VxQqTI z17szMVAMNtA&unJ9LA>^#-<%4rx`vRvvF)-3P(>S;b>OXfddETc^56fX9o8)#vf^t zH$6m7e@)S!bl?hnkq@nYT$UBWT#lKXgIr<3l7~IVpa(+o@bK{R(z`_s!HX~dX77p> zD>udO*)Dzl`6%9=VIn{LrwIc5!ZGS(Sy3hCctru;g7{1}55G~RP)h3oe6=VCdU_7F z`gQ-_+gsNM)9Ex^*8>UFacf=t=2K_~_r6*Hn3$Nr>HbrbR8gO^S~k220F=^Tv*nSy*44rD zJUEVnT#kb=3dU40W`MO?5JbjDhOur@0%VoEw(aitDp{5>K0c0R?E$M+pA z_3``t5m~;Rj&lyqIc8^PF*i2{RaNJ61p_(=A-8>J0f%2Y^ytP7oA0ivStgB+j^h0j z?~Ot5pFQ!!Qy-M~Q&rVc6a@g_x-JF>2a(BS09-zZB9RDGRfQx;&~-iftpc`e*;3!! z+_>t88#e4;vwE#DGV&=u*>~cC!@TX?-QCH`{*=;r2QFT`I8P2--tMQSrVxol;CUWG zq0szZus}d_bFizasZPgRIdcYv zVSq7)(a}p^{JHlp;jXSO01yCp5gq_97K@R1Jl;4kFo0Al1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Graphics Category + + + + Jakub Steiner + + + + + + graphics + category + pixel + vector + editor + draw + paint + + + http://tango-project.org + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bacula/src/qt-console/images/status-console.png b/bacula/src/qt-console/images/status-console.png new file mode 100644 index 0000000000000000000000000000000000000000..ea88abed370b0a5fa028cf2f48887d9f459658f3 GIT binary patch literal 1960 zcmV;Z2UqxsP)&{C_Q;sq0* zjGCAb9(*vw;FB>CA2b??CO$}fF;Sxl+W2Bp3qfO|)@TUS7J`HjYOx)l)UoZ%bjq1I z=giq>-`4l}u=kwKFl}ePoPGA%Ywfka|N3tKwanN9Uwh8j=%6u%m164O^~Neuv~K8% zF$qOeL-B>_SDwCbqxs&t_@E!$u*De5uI(G?iz6y92I~wWV2s6@3Xrj|2-YrzYAQG= zOink*i-MWyS&HQ9Vc^C9z~Fp@F_yhM#u@C7QDabrkzr4#6Ud8dovK7( zRS;D~0&l!M!}_6q;=Vr0*3J;K{jsa9Xg|At_N9?-C z^VlP|W3U)w7`v^Hzn+}qj2#I)D@4Mcl?y^is91+TtzhF4#% zzGtElCfz?Fn9N%|v2cn8Dq2Efm zAR@Jyr6MU6R25Odn5sQ>afVWqZa1NuX1Xc>35$_#D2jslW*b!M6$&Dtglqc*t$>Is zhU#7vIo+&7H%*vr%#fuiog^X4($xW!p#W+cE=v~LEnI&e)5yh!Rs~RGp*OkA3!3vSHr~0JuYUOnPEWkX>!)Ah?Q>_5 zq9lYsCuxx+ZOTwC;~-N9cbNx7l%(4sPxI9+kdb;0y*Wf>^TlBCli&x_Roq}`k>&nSaXlwbkmf}m!`OD z-%bu4c#!8$9_MF2e~RYJT%B^u*2`i|S=twhKp6s^PC`+x#R6$gmSspOgi^@51?S#4 z%hw-&j8KH7I^M6Hm4i?eflyv!&ouz(Ru%}=#564-4J>u<$k-@PeET~XU9RoLlh5;y zXaBOSugs;le-V*21Ywqw=2^}4O47zryA#Tesv z?%R3b-o1OjF}`VhufeElrCKV+QBgsp?yU)__pFtlMWlWoZ7;OSiHWz4zIpoWi@>`# u1+WML7y(9sg*Dm!#^Ql~panElHTyp#*h{ZHDdT?t0000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Terminal + 2005-10-15 + + + Andreas Nilsson + + + + + terminal + emulator + term + command line + + + + + + Jakub Steiner + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bacula/src/qt-console/images/status.png b/bacula/src/qt-console/images/status.png index ea06f93b16568a60df17c58867068ba172357565..9e12db09df60c068af39eafa2318e34412198103 100644 GIT binary patch delta 1837 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 DZ~c%^ diff --git a/bacula/src/qt-console/images/status.svg b/bacula/src/qt-console/images/status.svg new file mode 100644 index 0000000000..ecde0e9fb6 --- /dev/null +++ b/bacula/src/qt-console/images/status.svg @@ -0,0 +1,380 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + System Monitor + 2005-10-10 + + + Andreas Nilsson + + + + + system + monitor + performance + + + + + + Jakub Steiner + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bacula/src/qt-console/jobgraphs/jobplot.cpp b/bacula/src/qt-console/jobgraphs/jobplot.cpp index 2dc2493f6b..e6763f8ec2 100644 --- a/bacula/src/qt-console/jobgraphs/jobplot.cpp +++ b/bacula/src/qt-console/jobgraphs/jobplot.cpp @@ -80,7 +80,7 @@ JobPlot::JobPlot(QTreeWidgetItem *parentTreeWidgetItem, JobPlotPass &passVals) pgInitialize(parentTreeWidgetItem); readSplitterSettings(); QTreeWidgetItem* thisitem = mainWin->getFromHash(this); - thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/graph1.png"))); + thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/applications-graphics.png"))); m_drawn = false; /* this invokes the pass values = operator function */ diff --git a/bacula/src/qt-console/main.qrc b/bacula/src/qt-console/main.qrc index a867e6bb84..f521152c8e 100644 --- a/bacula/src/qt-console/main.qrc +++ b/bacula/src/qt-console/main.qrc @@ -1,5 +1,6 @@ + images/applications-graphics.png images/bat.png images/bat_icon.png images/browse.png @@ -35,6 +36,7 @@ images/restore.png images/run.png images/save.png + images/status-console.png images/status.png images/system-file-manager.png images/unchecked.png diff --git a/bacula/src/qt-console/main.ui b/bacula/src/qt-console/main.ui index 8a127bf610..1e9a4113aa 100644 --- a/bacula/src/qt-console/main.ui +++ b/bacula/src/qt-console/main.ui @@ -456,7 +456,7 @@ - :/images/status.png + :/images/status-console.png Status Dir @@ -564,7 +564,7 @@ - :/images/graph1.png + :/images/applications-graphics.png JobPlot @@ -578,7 +578,7 @@ - images/joblog.svg + :/images/status.png Status Dir Page diff --git a/bacula/src/qt-console/prefs.ui b/bacula/src/qt-console/prefs.ui index a0b0bc2aa9..b8c739f41d 100644 --- a/bacula/src/qt-console/prefs.ui +++ b/bacula/src/qt-console/prefs.ui @@ -10,7 +10,9 @@ - + + 0 + 0 0 0 @@ -22,22 +24,10 @@ images/bat.png - + 9 - - 9 - - - 9 - - - 9 - - - 6 - - + 6 @@ -59,7 +49,9 @@ - + + 0 + 0 0 0 @@ -117,7 +109,9 @@ - + + 0 + 0 0 0 @@ -160,12 +154,12 @@ 24 - - 20 - 3600 + + 15 + @@ -174,28 +168,18 @@ Joblist - + 9 - - 9 - - - 9 - - - 9 - - - 6 - - + 6 - + + 0 + 0 0 0 @@ -204,42 +188,18 @@ Jolist Limit Options - - 9 - - + 9 - - 9 - - - 9 - - - 6 - - + 6 - + 0 - - 0 - - - 0 - - - 0 - - - 6 - - + 6 @@ -251,12 +211,12 @@ - - 1 - 10000 + + 1 + 7 @@ -264,12 +224,12 @@ - - 1 - 10000 + + 1 + 25 @@ -358,22 +318,10 @@ Context Sensitive List Commands - - 9 - - + 9 - - 9 - - - 9 - - - 6 - - + 6 @@ -443,28 +391,18 @@ Debug - - 9 - - - 9 - - - 9 - - + 9 - - 6 - - + 6 - + + 0 + 0 0 0 @@ -473,42 +411,18 @@ Debugging Options - + 9 - - 9 - - - 9 - - - 9 - - - 6 - - + 6 - + 0 - - 0 - - - 0 - - - 0 - - - 6 - - + 6 @@ -558,28 +472,18 @@ RestoreTree - - 9 - - - 9 - - - 9 - - + 9 - - 6 - - + 6 - + + 0 + 0 0 0 @@ -588,42 +492,18 @@ Debugging Options - - 9 - - - 9 - - - 9 - - + 9 - - 6 - - + 6 - - 0 - - - 0 - - + 0 - - 0 - - - 6 - - + 6 @@ -731,20 +611,11 @@ - - 6 - - + 0 - - 0 - - - 0 - - - 0 + + 6 @@ -762,7 +633,9 @@ - + + 0 + 0 0 0 diff --git a/bacula/src/qt-console/status/dirstat.cpp b/bacula/src/qt-console/status/dirstat.cpp index 540ee8b8aa..b749fd7b85 100644 --- a/bacula/src/qt-console/status/dirstat.cpp +++ b/bacula/src/qt-console/status/dirstat.cpp @@ -46,7 +46,7 @@ DirStat::DirStat() m_closeable = true; pgInitialize(); QTreeWidgetItem* thisitem = mainWin->getFromHash(this); - thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/joblog.png"))); + thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/status.png"))); m_cursor = new QTextCursor(textEdit->document()); readSettings(); diff --git a/bacula/src/qt-console/status/dirstat.ui b/bacula/src/qt-console/status/dirstat.ui index 715f808cc8..1ef8294c87 100644 --- a/bacula/src/qt-console/status/dirstat.ui +++ b/bacula/src/qt-console/status/dirstat.ui @@ -5,30 +5,18 @@ 0 0 - 537 - 458 + 504 + 410 Form - + 9 - - 9 - - - 9 - - - 9 - - - 6 - - + 6 @@ -38,7 +26,9 @@ - + + 0 + 0 200 0 @@ -97,20 +87,11 @@ - - 6 - - - 0 - - - 0 - - + 0 - - 0 + + 6 @@ -135,20 +116,11 @@ p, li { white-space: pre-wrap; } - - 6 - - - 0 - - - 0 - - + 0 - - 0 + + 6 @@ -173,20 +145,11 @@ p, li { white-space: pre-wrap; } - - 6 - - + 0 - - 0 - - - 0 - - - 0 + + 6 diff --git a/bacula/src/qt-console/storage/storage.ui b/bacula/src/qt-console/storage/storage.ui index d4e2261be3..1f2085060c 100644 --- a/bacula/src/qt-console/storage/storage.ui +++ b/bacula/src/qt-console/storage/storage.ui @@ -36,7 +36,7 @@ - :/images/status.png + :/images/status-console.png Status Storage In Console -- 2.39.5