From: Dirk H Bartley Date: Sun, 24 Feb 2008 16:32:02 +0000 (+0000) Subject: Change some icons around to make a little more senese with a status X-Git-Tag: Release-7.0.0~4960 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=13e8444031d0cb93eb5224fcc6d62a8ff66ab69b;p=bacula%2Fbacula 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 --- 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 0000000000..e392c298a6 Binary files /dev/null and b/bacula/src/qt-console/images/applications-graphics.png differ diff --git a/bacula/src/qt-console/images/applications-graphics.svg b/bacula/src/qt-console/images/applications-graphics.svg new file mode 100644 index 0000000000..0438325ec7 --- /dev/null +++ b/bacula/src/qt-console/images/applications-graphics.svg @@ -0,0 +1,545 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 0000000000..ea88abed37 Binary files /dev/null and b/bacula/src/qt-console/images/status-console.png differ diff --git a/bacula/src/qt-console/images/status-console.svg b/bacula/src/qt-console/images/status-console.svg new file mode 100644 index 0000000000..f3caf8a34d --- /dev/null +++ b/bacula/src/qt-console/images/status-console.svg @@ -0,0 +1,606 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 ea06f93b16..9e12db09df 100644 Binary files a/bacula/src/qt-console/images/status.png and b/bacula/src/qt-console/images/status.png differ 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