From: Dirk H Bartley Date: Sun, 27 May 2007 12:26:53 +0000 (+0000) Subject: Add icons for the page selector. X-Git-Tag: Release-2.2.0~376 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=483964e4ba06d40c810a80d2854903366d46994c;p=bacula%2Fbacula Add icons for the page selector. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4918 91ce42f0-d328-0410-95d8-f526ca767f89 --- 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 0000000000..b7871b4219 Binary files /dev/null and b/bacula/src/qt-console/images/cartridge.png differ diff --git a/bacula/src/qt-console/images/cartridge.svg b/bacula/src/qt-console/images/cartridge.svg new file mode 100644 index 0000000000..7757a0da78 --- /dev/null +++ b/bacula/src/qt-console/images/cartridge.svg @@ -0,0 +1,148 @@ + + + + + + + + + + + + + + + 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 0000000000..259ed26dd0 Binary files /dev/null and b/bacula/src/qt-console/images/emblem-system.png differ 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 0000000000..901edc9624 Binary files /dev/null and b/bacula/src/qt-console/images/folder.png differ 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 0000000000..068ffebee2 Binary files /dev/null and b/bacula/src/qt-console/images/network-server.png differ 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 0000000000..9015426153 Binary files /dev/null and b/bacula/src/qt-console/images/package-x-generic.png differ diff --git a/bacula/src/qt-console/images/package-x-generic.svg b/bacula/src/qt-console/images/package-x-generic.svg new file mode 100644 index 0000000000..dced3c4222 --- /dev/null +++ b/bacula/src/qt-console/images/package-x-generic.svg @@ -0,0 +1,483 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 0000000000..60cade46c9 Binary files /dev/null and b/bacula/src/qt-console/images/system-file-manager.png differ diff --git a/bacula/src/qt-console/images/system-file-manager.svg b/bacula/src/qt-console/images/system-file-manager.svg new file mode 100644 index 0000000000..9a837827a0 --- /dev/null +++ b/bacula/src/qt-console/images/system-file-manager.svg @@ -0,0 +1,315 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 0000000000..c5b797a7df Binary files /dev/null and b/bacula/src/qt-console/images/utilities-terminal.png differ diff --git a/bacula/src/qt-console/images/utilities-terminal.svg b/bacula/src/qt-console/images/utilities-terminal.svg new file mode 100644 index 0000000000..2197700fe0 --- /dev/null +++ b/bacula/src/qt-console/images/utilities-terminal.svg @@ -0,0 +1,498 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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;