diff options
| author | Shireesh Anjal <shireesh@gluster.com> | 2011-07-21 21:23:19 +0530 |
|---|---|---|
| committer | Shireesh Anjal <shireesh@gluster.com> | 2011-07-22 11:51:11 +0530 |
| commit | c2b4ed41ccf2e2a7958aee7cab521fdeeabbca38 (patch) | |
| tree | 9453b35a318a35d4ed88f8c815693ef212cd5b9c /src | |
| parent | c5fd622463dba84b5586bdd4a3e6c1feb443e687 (diff) | |
Added some new icons
Diffstat (limited to 'src')
27 files changed, 255 insertions, 1762 deletions
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Device.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Device.java index 4a00ac5a..f6f8450e 100644 --- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Device.java +++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Device.java @@ -185,6 +185,10 @@ public class Device extends Entity { @Override public boolean equals(Object obj) { + if(this == obj) { + return true; + } + if(!(obj instanceof Device)) { return false; } @@ -201,7 +205,7 @@ public class Device extends Entity { if (getName().equals(device.getName()) && getServerName().equals(device.getServerName()) && oldMountPoint.equals(newMountPoint) && getStatus() == device.getStatus() - && getSpace() == device.getSpace() && getSpaceInUse() == device.getSpaceInUse() + && getSpace().equals(device.getSpace()) && getSpaceInUse().equals(device.getSpaceInUse()) && oldFsType.equals(newFsType) && oldFsVersion.equals(newFsVersion) && getType() == device.getType()) { return true; diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Disk.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Disk.java index f06ca258..1fb870e5 100644 --- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Disk.java +++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Disk.java @@ -107,9 +107,14 @@ public class Disk extends Device { @Override public boolean equals(Object obj) { + if(this == obj) { + return true; + } + if(!(obj instanceof Disk)) { return false; } + Disk disk = (Disk)obj; if (!(super.equals(obj) && getDescription().equals(disk.getDescription()) && getDiskInterface().equals( diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterServer.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterServer.java index 025db809..5928f3af 100644 --- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterServer.java +++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterServer.java @@ -81,6 +81,10 @@ public class GlusterServer extends Server { @Override public boolean equals(Object obj) { + if(this == obj) { + return true; + } + if(!(obj instanceof GlusterServer)) { return false; } diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Server.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Server.java index 39696665..5697530e 100644 --- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Server.java +++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Server.java @@ -160,7 +160,9 @@ public class Server extends Entity { String ipAddresses = ""; for (NetworkInterface networkInterface : getNetworkInterfaces()) { String ipAddr = networkInterface.getIpAddress(); - ipAddresses += (ipAddresses.isEmpty() ? ipAddr : ", " + ipAddr); + if(!ipAddr.equals("127.0.0.1")) { + ipAddresses += (ipAddresses.isEmpty() ? ipAddr : ", " + ipAddr); + } } return ipAddresses; } @@ -190,6 +192,10 @@ public class Server extends Entity { @Override public boolean equals(Object obj) { + if(this == obj) { + return true; + } + if(!(obj instanceof Server)) { return false; } diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/replace-brick.png b/src/com.gluster.storage.management.gui/icons/tango/16x16/replace-brick.png Binary files differnew file mode 100644 index 00000000..828ede1b --- /dev/null +++ b/src/com.gluster.storage.management.gui/icons/tango/16x16/replace-brick.png diff --git a/src/com.gluster.storage.management.gui/icons/tango/22x22/disk-initialisation.png b/src/com.gluster.storage.management.gui/icons/tango/22x22/disk-initialisation.png Binary files differnew file mode 100644 index 00000000..73ecf4c0 --- /dev/null +++ b/src/com.gluster.storage.management.gui/icons/tango/22x22/disk-initialisation.png diff --git a/src/com.gluster.storage.management.gui/icons/tango/22x22/high-memory-usage.png b/src/com.gluster.storage.management.gui/icons/tango/22x22/high-memory-usage.png Binary files differnew file mode 100644 index 00000000..b7c166ab --- /dev/null +++ b/src/com.gluster.storage.management.gui/icons/tango/22x22/high-memory-usage.png diff --git a/src/com.gluster.storage.management.gui/icons/tango/22x22/low-diskspace.png b/src/com.gluster.storage.management.gui/icons/tango/22x22/low-diskspace.png Binary files differnew file mode 100644 index 00000000..983012ad --- /dev/null +++ b/src/com.gluster.storage.management.gui/icons/tango/22x22/low-diskspace.png diff --git a/src/com.gluster.storage.management.gui/icons/tango/22x22/offline-brick.png b/src/com.gluster.storage.management.gui/icons/tango/22x22/offline-brick.png Binary files differnew file mode 100644 index 00000000..e0528241 --- /dev/null +++ b/src/com.gluster.storage.management.gui/icons/tango/22x22/offline-brick.png diff --git a/src/com.gluster.storage.management.gui/icons/tango/22x22/offline-server.png b/src/com.gluster.storage.management.gui/icons/tango/22x22/offline-server.png Binary files differnew file mode 100644 index 00000000..5900c724 --- /dev/null +++ b/src/com.gluster.storage.management.gui/icons/tango/22x22/offline-server.png diff --git a/src/com.gluster.storage.management.gui/icons/tango/22x22/replace-brick.png b/src/com.gluster.storage.management.gui/icons/tango/22x22/replace-brick.png Binary files differnew file mode 100644 index 00000000..48a66c8c --- /dev/null +++ b/src/com.gluster.storage.management.gui/icons/tango/22x22/replace-brick.png diff --git a/src/com.gluster.storage.management.gui/icons/tango/22x22/server-warning.png b/src/com.gluster.storage.management.gui/icons/tango/22x22/server-warning.png Binary files differnew file mode 100644 index 00000000..9e2da0bc --- /dev/null +++ b/src/com.gluster.storage.management.gui/icons/tango/22x22/server-warning.png diff --git a/src/com.gluster.storage.management.gui/icons/tango/22x22/volume-rebalance.png b/src/com.gluster.storage.management.gui/icons/tango/22x22/volume-rebalance.png Binary files differnew file mode 100644 index 00000000..4539822c --- /dev/null +++ b/src/com.gluster.storage.management.gui/icons/tango/22x22/volume-rebalance.png diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/add-server.png b/src/com.gluster.storage.management.gui/icons/tango/32x32/add-server.png Binary files differnew file mode 100644 index 00000000..29a512f2 --- /dev/null +++ b/src/com.gluster.storage.management.gui/icons/tango/32x32/add-server.png diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/remove-volume.png b/src/com.gluster.storage.management.gui/icons/tango/32x32/remove-volume.png Binary files differnew file mode 100644 index 00000000..68de86a3 --- /dev/null +++ b/src/com.gluster.storage.management.gui/icons/tango/32x32/remove-volume.png diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/remove-volume.svg b/src/com.gluster.storage.management.gui/icons/tango/32x32/remove-volume.svg deleted file mode 100644 index 0a0a6cf5..00000000 --- a/src/com.gluster.storage.management.gui/icons/tango/32x32/remove-volume.svg +++ /dev/null @@ -1,1699 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="32px" - height="32px" - id="svg10057" - version="1.1" - inkscape:version="0.48.1 " - sodipodi:docname="remove_volume.svg"> - <defs - id="defs10059"> - <linearGradient - id="linearGradient6488"> - <stop - id="stop6490" - offset="0" - style="stop-color:#38a111;stop-opacity:1;" /> - <stop - id="stop6492" - offset="1" - style="stop-color:#baff76;stop-opacity:1;" /> - </linearGradient> - <linearGradient - id="linearGradient6359"> - <stop - style="stop-color:#50980a;stop-opacity:1" - offset="0" - id="stop6361" /> - <stop - style="stop-color:#a5f263;stop-opacity:1" - offset="1" - id="stop6363" /> - </linearGradient> - <linearGradient - id="linearGradient6367"> - <stop - style="stop-color:#a5f263;stop-opacity:1" - offset="0" - id="stop6369" /> - <stop - style="stop-color:#73d336;stop-opacity:1" - offset="1" - id="stop6371" /> - </linearGradient> - <linearGradient - id="linearGradient7721"> - <stop - id="stop7723" - offset="0" - style="stop-color:#ffffff;stop-opacity:1" /> - <stop - id="stop7725" - offset="1" - style="stop-color:#ffffff;stop-opacity:0" /> - </linearGradient> - <linearGradient - id="linearGradient4134-9"> - <stop - id="stop4136-4" - offset="0" - style="stop-color:#4f79a6;stop-opacity:1;" /> - <stop - style="stop-color:#7fa8d3;stop-opacity:1" - offset="0.25000000" - id="stop4148-8" /> - <stop - style="stop-color:#7fa8d3;stop-opacity:1" - offset="0.45037496" - id="stop4142-8" /> - <stop - id="stop4138-2" - offset="1" - style="stop-color:#547ba6;stop-opacity:1" /> - </linearGradient> - <linearGradient - id="linearGradient4206-4"> - <stop - id="stop4208-5" - offset="0.0000000" - style="stop-color:#2b558c;stop-opacity:1" /> - <stop - id="stop4210-5" - offset="1.0000000" - style="stop-color:#2c568c;stop-opacity:1" /> - </linearGradient> - <linearGradient - id="linearGradient4176" - inkscape:collect="always"> - <stop - id="stop4178" - offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - id="stop4180" - offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - id="linearGradient7210"> - <stop - id="stop7212" - offset="0.0000000" - style="stop-color:#ffffff;stop-opacity:1.0000000;" /> - <stop - id="stop7214" - offset="1.0000000" - style="stop-color:#bfbebf;stop-opacity:1" /> - </linearGradient> - <linearGradient - id="linearGradient6924" - inkscape:collect="always"> - <stop - id="stop6926" - offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - id="stop6928" - offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - id="linearGradient2316-0"> - <stop - id="stop2318-7" - offset="0" - style="stop-color:#a48600;stop-opacity:1;" /> - <stop - id="stop2320-5" - offset="1" - style="stop-color:#c4a000;stop-opacity:0;" /> - </linearGradient> - <linearGradient - id="linearGradient2326-1"> - <stop - id="stop2328-8" - offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - id="stop2330-5" - offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6385-1" - id="linearGradient10359" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0363443,0,0,1.0363443,122.11453,-0.09055374)" - x1="-25.812988" - y1="6.046875" - x2="-20.421724" - y2="6.0895195" /> - <linearGradient - id="linearGradient6385-1"> - <stop - id="stop6387-7" - offset="0" - style="stop-color:#fbfbfb;stop-opacity:1;" /> - <stop - id="stop6389-40" - offset="1" - style="stop-color:#3566a5;stop-opacity:1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6529-9" - id="linearGradient10361" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0020655,0,0,0.6996656,-43.395568,4.4430794)" - x1="-14.515251" - y1="6.407763" - x2="-14.468635" - y2="15.969822" /> - <linearGradient - inkscape:collect="always" - id="linearGradient6529-9"> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="0" - id="stop6531-48" /> - <stop - style="stop-color:#ffffff;stop-opacity:0;" - offset="1" - id="stop6533-8" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6529-9" - id="linearGradient10363" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0020655,0,0,0.69986921,-43.395568,4.440002)" - x1="-14.515251" - y1="6.410296" - x2="-14.468635" - y2="15.969573" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6529-9" - id="linearGradient10365" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0020655,0,0,1,-43.395568,0.92382652)" - x1="-14.515251" - y1="8.0025444" - x2="-14.468635" - y2="15.969822" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6385-1" - id="linearGradient10367" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0363443,0,0,1.0363443,122.11453,-0.09055374)" - x1="-25.812988" - y1="6.046875" - x2="-20.421724" - y2="6.0895195" /> - <linearGradient - id="linearGradient4245"> - <stop - id="stop4247" - offset="0" - style="stop-color:#fbfbfb;stop-opacity:1;" /> - <stop - id="stop4249" - offset="1" - style="stop-color:#3566a5;stop-opacity:1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6385-1" - id="linearGradient10369" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0363443,0,0,1.0363443,122.11453,-0.09055374)" - x1="-25.812988" - y1="6.046875" - x2="-20.421724" - y2="6.0895195" /> - <linearGradient - id="linearGradient4252"> - <stop - id="stop4254" - offset="0" - style="stop-color:#fbfbfb;stop-opacity:1;" /> - <stop - id="stop4256" - offset="1" - style="stop-color:#3566a5;stop-opacity:1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6385-1" - id="linearGradient10371" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0363443,0,0,1.0363443,122.11453,-0.09055374)" - x1="-25.812988" - y1="6.046875" - x2="-20.421724" - y2="6.0895195" /> - <linearGradient - id="linearGradient4259"> - <stop - id="stop4261" - offset="0" - style="stop-color:#fbfbfb;stop-opacity:1;" /> - <stop - id="stop4263" - offset="1" - style="stop-color:#3566a5;stop-opacity:1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4134-9-5" - id="linearGradient6925" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.4954152,0,0,1.4906315,382.15258,-11.973727)" - x1="9.9747334" - y1="31.09375" - x2="37.077564" - y2="31.09375" /> - <linearGradient - id="linearGradient4134-9-5"> - <stop - id="stop4136-4-7" - offset="0" - style="stop-color:#4f79a6;stop-opacity:1;" /> - <stop - style="stop-color:#7fa8d3;stop-opacity:1" - offset="0.25000000" - id="stop4148-8-9" /> - <stop - style="stop-color:#7fa8d3;stop-opacity:1" - offset="0.45037496" - id="stop4142-8-2" /> - <stop - id="stop4138-2-3" - offset="1" - style="stop-color:#547ba6;stop-opacity:1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4206-4-7" - id="linearGradient6927" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.4954152,0,0,1.4906315,382.15258,-11.973727)" - x1="25.064732" - y1="21.857143" - x2="25.207588" - y2="25.428572" /> - <linearGradient - id="linearGradient4206-4-7"> - <stop - id="stop4208-5-9" - offset="0.0000000" - style="stop-color:#3465a4;stop-opacity:1" /> - <stop - id="stop4210-5-3" - offset="1.0000000" - style="stop-color:#3465a4;stop-opacity:1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4176-3" - id="linearGradient6929" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.4954152,0,0,1.4954152,382.15258,-12.162834)" - x1="17.160095" - y1="14.004482" - x2="37.969398" - y2="56.575912" /> - <linearGradient - id="linearGradient4176-3" - inkscape:collect="always"> - <stop - id="stop4178-8" - offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - id="stop4180-1" - offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient7210-7" - id="linearGradient6931" - gradientUnits="userSpaceOnUse" - x1="24" - y1="16.525082" - x2="24" - y2="13.284962" /> - <linearGradient - id="linearGradient7210-7"> - <stop - id="stop7212-33" - offset="0.0000000" - style="stop-color:#ffffff;stop-opacity:1.0000000;" /> - <stop - id="stop7214-0" - offset="1.0000000" - style="stop-color:#bfbebf;stop-opacity:1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6924-6" - id="linearGradient6933" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.4954152,0,0,1.4954152,381.93895,-8.2106577)" - x1="16.07143" - y1="19.5" - x2="15.785715" - y2="30" /> - <linearGradient - id="linearGradient6924-6" - inkscape:collect="always"> - <stop - id="stop6926-8" - offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - id="stop6928-76" - offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - y2="30" - x2="15.785715" - y1="19.5" - x1="16.07143" - gradientTransform="matrix(1.4954152,0,0,1.4954152,381.93895,-8.2106577)" - gradientUnits="userSpaceOnUse" - id="linearGradient13350" - xlink:href="#linearGradient6924-6" - inkscape:collect="always" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4134-9" - id="linearGradient13420" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.88340971,0,0,0.88340971,41.850823,-2.8039326)" - x1="9.9747334" - y1="31.09375" - x2="37.077564" - y2="31.09375" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4206-4" - id="linearGradient13422" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.88340971,0,0,0.88340971,41.850823,-2.8039326)" - x1="25.064732" - y1="21.857143" - x2="25.207588" - y2="25.428572" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4176" - id="linearGradient13424" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.8488726,0,0,0.8488726,42.68195,-1.9724202)" - x1="17.160095" - y1="14.004482" - x2="37.969398" - y2="56.575912" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient7210" - id="linearGradient13426" - gradientUnits="userSpaceOnUse" - x1="24" - y1="16.525082" - x2="24" - y2="13.284962" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6924" - id="linearGradient13428" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.88340971,0,0,0.88340971,42.072914,-0.86102988)" - x1="15.972866" - y1="16.641634" - x2="15.785715" - y2="30" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6214" - id="linearGradient6649" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(394,0)" - x1="28.158247" - y1="13.121862" - x2="21.283247" - y2="4.670352" /> - <linearGradient - id="linearGradient6214"> - <stop - style="stop-color:#38a111;stop-opacity:1" - offset="0" - id="stop6216" /> - <stop - style="stop-color:#baff76;stop-opacity:1" - offset="1" - id="stop6218" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6230" - id="linearGradient6651" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,3.0700325,-442,-31.270668)" - x1="19.120131" - y1="20.965828" - x2="28.07798" - y2="14.630604" /> - <linearGradient - id="linearGradient6230"> - <stop - style="stop-color:#b4fb71;stop-opacity:1" - offset="0" - id="stop6232" /> - <stop - style="stop-color:#3fa617;stop-opacity:1" - offset="1" - id="stop6234" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6214" - id="linearGradient6653" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(394,0)" - x1="28.158247" - y1="13.121862" - x2="21.283247" - y2="4.670352" /> - <linearGradient - id="linearGradient15141"> - <stop - style="stop-color:#38a111;stop-opacity:1" - offset="0" - id="stop15143" /> - <stop - style="stop-color:#baff76;stop-opacity:1" - offset="1" - id="stop15145" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6230" - id="linearGradient6655" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,3.0700325,-442,-31.270668)" - x1="19.120131" - y1="20.965828" - x2="28.07798" - y2="14.630604" /> - <linearGradient - id="linearGradient15148"> - <stop - style="stop-color:#b4fb71;stop-opacity:1" - offset="0" - id="stop15150" /> - <stop - style="stop-color:#3fa617;stop-opacity:1" - offset="1" - id="stop15152" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6214" - id="linearGradient6657" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(394,0)" - x1="28.158247" - y1="13.121862" - x2="21.283247" - y2="4.670352" /> - <linearGradient - id="linearGradient15155"> - <stop - style="stop-color:#38a111;stop-opacity:1" - offset="0" - id="stop15157" /> - <stop - style="stop-color:#baff76;stop-opacity:1" - offset="1" - id="stop15159" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6230" - id="linearGradient6659" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,3.0700325,-442,-31.270668)" - x1="19.120131" - y1="20.965828" - x2="28.07798" - y2="14.630604" /> - <linearGradient - id="linearGradient15162"> - <stop - style="stop-color:#b4fb71;stop-opacity:1" - offset="0" - id="stop15164" /> - <stop - style="stop-color:#3fa617;stop-opacity:1" - offset="1" - id="stop15166" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4134-9-5-1" - id="linearGradient6639" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.4954152,0,0,1.4906315,382.15258,-11.973727)" - x1="9.9747334" - y1="31.09375" - x2="37.077564" - y2="31.09375" /> - <linearGradient - id="linearGradient4134-9-5-1"> - <stop - id="stop4136-4-7-7" - offset="0" - style="stop-color:#4f79a6;stop-opacity:1;" /> - <stop - style="stop-color:#7fa8d3;stop-opacity:1" - offset="0.25000000" - id="stop4148-8-9-4" /> - <stop - style="stop-color:#7fa8d3;stop-opacity:1" - offset="0.45037496" - id="stop4142-8-2-0" /> - <stop - id="stop4138-2-3-9" - offset="1" - style="stop-color:#547ba6;stop-opacity:1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4206-4-7-4" - id="linearGradient6641" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.4954152,0,0,1.4906315,382.15258,-11.973727)" - x1="25.064732" - y1="21.857143" - x2="25.207588" - y2="25.428572" /> - <linearGradient - id="linearGradient4206-4-7-4"> - <stop - id="stop4208-5-9-8" - offset="0.0000000" - style="stop-color:#3465a4;stop-opacity:1" /> - <stop - id="stop4210-5-3-8" - offset="1.0000000" - style="stop-color:#3465a4;stop-opacity:1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4176-3-2" - id="linearGradient6643" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.4954152,0,0,1.4954152,382.15258,-12.162834)" - x1="17.160095" - y1="14.004482" - x2="37.969398" - y2="56.575912" /> - <linearGradient - id="linearGradient4176-3-2" - inkscape:collect="always"> - <stop - id="stop4178-8-4" - offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - id="stop4180-1-5" - offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient7210-7-5" - id="linearGradient6645" - gradientUnits="userSpaceOnUse" - x1="24" - y1="16.525082" - x2="24" - y2="13.284962" /> - <linearGradient - id="linearGradient7210-7-5"> - <stop - id="stop7212-33-1" - offset="0.0000000" - style="stop-color:#ffffff;stop-opacity:1.0000000;" /> - <stop - id="stop7214-0-7" - offset="1.0000000" - style="stop-color:#bfbebf;stop-opacity:1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6924-6-1" - id="linearGradient6647" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.4954152,0,0,1.4954152,381.93895,-8.2106577)" - x1="16.07143" - y1="19.5" - x2="15.785715" - y2="30" /> - <linearGradient - id="linearGradient6924-6-1" - inkscape:collect="always"> - <stop - id="stop6926-8-1" - offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - id="stop6928-76-5" - offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - y2="30" - x2="15.785715" - y1="19.5" - x1="16.07143" - gradientTransform="matrix(1.4954152,0,0,1.4954152,381.93895,-8.2106577)" - gradientUnits="userSpaceOnUse" - id="linearGradient15211" - xlink:href="#linearGradient6924-6-1" - inkscape:collect="always" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4134-9-5-1" - id="linearGradient15381" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.4954152,0,0,1.4906315,382.15258,-11.973727)" - x1="9.9747334" - y1="31.09375" - x2="37.077564" - y2="31.09375" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4206-4-7-4" - id="linearGradient15383" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.4954152,0,0,1.4906315,382.15258,-11.973727)" - x1="25.064732" - y1="21.857143" - x2="25.207588" - y2="25.428572" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4176-3-2" - id="linearGradient15385" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.4954152,0,0,1.4954152,382.15258,-12.162834)" - x1="17.160095" - y1="14.004482" - x2="37.969398" - y2="56.575912" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient7210-7-5" - id="linearGradient15387" - gradientUnits="userSpaceOnUse" - x1="24" - y1="16.525082" - x2="24" - y2="13.284962" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6924-6-1" - id="linearGradient15389" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.4954152,0,0,1.4954152,381.93895,-8.2106577)" - x1="16.07143" - y1="19.5" - x2="15.785715" - y2="30" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6214" - id="linearGradient15391" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(394,0)" - x1="28.158247" - y1="13.121862" - x2="21.283247" - y2="4.670352" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6230" - id="linearGradient15393" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,3.0700325,-442,-31.270668)" - x1="19.120131" - y1="20.965828" - x2="28.07798" - y2="14.630604" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6214" - id="linearGradient15395" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(394,0)" - x1="28.158247" - y1="13.121862" - x2="21.283247" - y2="4.670352" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6230" - id="linearGradient15397" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,3.0700325,-442,-31.270668)" - x1="19.120131" - y1="20.965828" - x2="28.07798" - y2="14.630604" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6214" - id="linearGradient15399" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(394,0)" - x1="28.158247" - y1="13.121862" - x2="21.283247" - y2="4.670352" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6230" - id="linearGradient15401" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,3.0700325,-442,-31.270668)" - x1="19.120131" - y1="20.965828" - x2="28.07798" - y2="14.630604" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6214" - id="linearGradient15424" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(394,0)" - x1="30.138733" - y1="16.429234" - x2="19.538534" - y2="5.0010891" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6230" - id="linearGradient15426" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,3.0700325,-442,-31.270668)" - x1="19.120131" - y1="20.965828" - x2="28.07798" - y2="14.630604" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6214" - id="linearGradient15428" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(394,0)" - x1="29.091856" - y1="14.925975" - x2="20.082891" - y2="5.4053607" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6230" - id="linearGradient15430" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,3.0700325,-442,-31.270668)" - x1="19.120131" - y1="20.965828" - x2="28.07798" - y2="14.630604" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6214" - id="linearGradient15432" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(394,0)" - x1="29.855806" - y1="16.145744" - x2="19.302763" - y2="5.1428337" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6230" - id="linearGradient15434" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,3.0700325,-442,-31.270668)" - x1="19.120131" - y1="20.965828" - x2="28.07798" - y2="14.630604" /> - <clipPath - clipPathUnits="userSpaceOnUse" - id="clipPath15437"> - <path - clip-path="none" - style="color:#000000;fill:#3a3a3a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00492704;marker:none;visibility:visible;display:block;overflow:visible" - d="m 437.13691,15.199953 c 0,3.922069 -8.57373,7.385024 -19.14997,7.385024 -10.57623,0 -19.14997,-3.462955 -19.14997,-7.385024 0,-2.453311 -2.97639,-9.3396375 2.1246,-10.6154265 3.05388,-0.7637939 13.06472,-4.48610797 17.02537,-4.48610797 4.65593,0 15.23964,3.20196207 18.55878,4.22641197 4.22049,1.302653 0.59119,8.6796495 0.59119,10.8751225 z" - id="path15439" - inkscape:connector-curvature="0" - sodipodi:nodetypes="sssssss" /> - </clipPath> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4134-9-5" - id="linearGradient16236" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.4954152,0,0,1.4906315,382.15258,-11.973727)" - x1="9.9747334" - y1="31.09375" - x2="37.077564" - y2="31.09375" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4206-4-7" - id="linearGradient16238" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.4954152,0,0,1.4906315,382.15258,-11.973727)" - x1="25.064732" - y1="21.857143" - x2="25.207588" - y2="25.428572" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4176-3" - id="linearGradient16240" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.4954152,0,0,1.4954152,382.15258,-12.162834)" - x1="17.160095" - y1="14.004482" - x2="37.969398" - y2="56.575912" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient7210-7" - id="linearGradient16242" - gradientUnits="userSpaceOnUse" - x1="24" - y1="16.525082" - x2="24" - y2="13.284962" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6924-6" - id="linearGradient16244" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.4954152,0,0,1.4954152,381.93895,-8.2106577)" - x1="16.07143" - y1="19.5" - x2="15.785715" - y2="30" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6214" - id="linearGradient16246" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(394,0)" - x1="30.138733" - y1="16.429234" - x2="19.538534" - y2="5.0010891" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6230" - id="linearGradient16248" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,3.0700325,-442,-31.270668)" - x1="19.120131" - y1="20.965828" - x2="28.07798" - y2="14.630604" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6214" - id="linearGradient16250" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(394,0)" - x1="29.091856" - y1="14.925975" - x2="20.082891" - y2="5.4053607" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6230" - id="linearGradient16252" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,3.0700325,-442,-31.270668)" - x1="19.120131" - y1="20.965828" - x2="28.07798" - y2="14.630604" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6214" - id="linearGradient16254" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(394,0)" - x1="29.855806" - y1="16.145744" - x2="19.302763" - y2="5.1428337" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6230" - id="linearGradient16256" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,3.0700325,-442,-31.270668)" - x1="19.120131" - y1="20.965828" - x2="28.07798" - y2="14.630604" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4134-9-6" - id="linearGradient17825" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.47256308,0,0,0.47256308,-19.884513,6.8263032)" - x1="9.9747334" - y1="31.09375" - x2="37.077564" - y2="31.09375" /> - <linearGradient - id="linearGradient4134-9-6"> - <stop - id="stop4136-4-9" - offset="0" - style="stop-color:#4f79a6;stop-opacity:1;" /> - <stop - style="stop-color:#7fa8d3;stop-opacity:1" - offset="0.25000000" - id="stop4148-8-6" /> - <stop - style="stop-color:#7fa8d3;stop-opacity:1" - offset="0.45037496" - id="stop4142-8-9" /> - <stop - id="stop4138-2-8" - offset="1" - style="stop-color:#547ba6;stop-opacity:1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4206-4-8" - id="linearGradient17827" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.47256308,0,0,0.47256308,-19.884513,6.8263032)" - x1="25.064732" - y1="21.857143" - x2="25.207588" - y2="25.428572" /> - <linearGradient - id="linearGradient4206-4-8"> - <stop - id="stop4208-5-3" - offset="0.0000000" - style="stop-color:#2b558c;stop-opacity:1" /> - <stop - id="stop4210-5-8" - offset="1.0000000" - style="stop-color:#2c568c;stop-opacity:1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4176-9" - id="linearGradient17829" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.45408812,0,0,0.45408812,-19.439922,7.2711048)" - x1="17.160095" - y1="14.004482" - x2="37.969398" - y2="56.575912" /> - <linearGradient - id="linearGradient4176-9" - inkscape:collect="always"> - <stop - id="stop4178-6" - offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - id="stop4180-7" - offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient7210-8" - id="linearGradient17831" - gradientUnits="userSpaceOnUse" - x1="24" - y1="16.525082" - x2="24" - y2="13.284962" /> - <linearGradient - id="linearGradient7210-8"> - <stop - id="stop7212-7" - offset="0.0000000" - style="stop-color:#ffffff;stop-opacity:1.0000000;" /> - <stop - id="stop7214-5" - offset="1.0000000" - style="stop-color:#bfbebf;stop-opacity:1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6924-1" - id="linearGradient17833" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.47256308,0,0,0.47256308,-19.765711,7.8656218)" - x1="15.972866" - y1="16.641634" - x2="15.785715" - y2="30" /> - <linearGradient - id="linearGradient6924-1" - inkscape:collect="always"> - <stop - id="stop6926-3" - offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - id="stop6928-9" - offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4134-9-5-6" - id="linearGradient17805" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.4954152,0,0,1.4906315,382.15258,-11.973727)" - x1="9.9747334" - y1="31.09375" - x2="37.077564" - y2="31.09375" /> - <linearGradient - id="linearGradient4134-9-5-6"> - <stop - id="stop4136-4-7-0" - offset="0" - style="stop-color:#4f79a6;stop-opacity:1;" /> - <stop - style="stop-color:#7fa8d3;stop-opacity:1" - offset="0.25000000" - id="stop4148-8-9-9" /> - <stop - style="stop-color:#7fa8d3;stop-opacity:1" - offset="0.45037496" - id="stop4142-8-2-2" /> - <stop - id="stop4138-2-3-3" - offset="1" - style="stop-color:#547ba6;stop-opacity:1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4206-4-7-7" - id="linearGradient17807" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.4954152,0,0,1.4906315,382.15258,-11.973727)" - x1="25.064732" - y1="21.857143" - x2="25.207588" - y2="25.428572" /> - <linearGradient - id="linearGradient4206-4-7-7"> - <stop - id="stop4208-5-9-9" - offset="0.0000000" - style="stop-color:#3465a4;stop-opacity:1" /> - <stop - id="stop4210-5-3-6" - offset="1.0000000" - style="stop-color:#3465a4;stop-opacity:1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4176-3-7" - id="linearGradient17809" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.4954152,0,0,1.4954152,382.15258,-12.162834)" - x1="17.160095" - y1="14.004482" - x2="37.969398" - y2="56.575912" /> - <linearGradient - id="linearGradient4176-3-7" - inkscape:collect="always"> - <stop - id="stop4178-8-8" - offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - id="stop4180-1-8" - offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient7210-7-1" - id="linearGradient17811" - gradientUnits="userSpaceOnUse" - x1="24" - y1="16.525082" - x2="24" - y2="13.284962" /> - <linearGradient - id="linearGradient7210-7-1"> - <stop - id="stop7212-33-7" - offset="0.0000000" - style="stop-color:#ffffff;stop-opacity:1.0000000;" /> - <stop - id="stop7214-0-1" - offset="1.0000000" - style="stop-color:#bfbebf;stop-opacity:1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6924-6-5" - id="linearGradient17813" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.4954152,0,0,1.4954152,381.93895,-8.2106577)" - x1="16.07143" - y1="19.5" - x2="15.785715" - y2="30" /> - <linearGradient - id="linearGradient6924-6-5" - inkscape:collect="always"> - <stop - id="stop6926-8-2" - offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - id="stop6928-76-3" - offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4134-9-6-2" - id="linearGradient17825-4" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.47256308,0,0,0.47256308,-19.884513,6.8263032)" - x1="9.9747334" - y1="31.09375" - x2="37.077564" - y2="31.09375" /> - <linearGradient - id="linearGradient4134-9-6-2"> - <stop - id="stop4136-4-9-1" - offset="0" - style="stop-color:#4f79a6;stop-opacity:1;" /> - <stop - style="stop-color:#7fa8d3;stop-opacity:1" - offset="0.25000000" - id="stop4148-8-6-9" /> - <stop - style="stop-color:#7fa8d3;stop-opacity:1" - offset="0.45037496" - id="stop4142-8-9-7" /> - <stop - id="stop4138-2-8-2" - offset="1" - style="stop-color:#547ba6;stop-opacity:1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4206-4-8-2" - id="linearGradient17827-8" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.47256308,0,0,0.47256308,-19.884513,6.8263032)" - x1="25.064732" - y1="21.857143" - x2="25.207588" - y2="25.428572" /> - <linearGradient - id="linearGradient4206-4-8-2"> - <stop - id="stop4208-5-3-8" - offset="0.0000000" - style="stop-color:#2b558c;stop-opacity:1" /> - <stop - id="stop4210-5-8-2" - offset="1.0000000" - style="stop-color:#2c568c;stop-opacity:1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4176-9-0" - id="linearGradient17829-6" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.45408812,0,0,0.45408812,-19.439922,7.2711048)" - x1="17.160095" - y1="14.004482" - x2="37.969398" - y2="56.575912" /> - <linearGradient - id="linearGradient4176-9-0" - inkscape:collect="always"> - <stop - id="stop4178-6-7" - offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - id="stop4180-7-9" - offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient7210-8-1" - id="linearGradient17831-4" - gradientUnits="userSpaceOnUse" - x1="24" - y1="16.525082" - x2="24" - y2="13.284962" /> - <linearGradient - id="linearGradient7210-8-1"> - <stop - id="stop7212-7-8" - offset="0.0000000" - style="stop-color:#ffffff;stop-opacity:1.0000000;" /> - <stop - id="stop7214-5-6" - offset="1.0000000" - style="stop-color:#bfbebf;stop-opacity:1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6924-1-0" - id="linearGradient17833-1" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.47256308,0,0,0.47256308,-19.765711,7.8656218)" - x1="15.972866" - y1="16.641634" - x2="15.785715" - y2="30" /> - <linearGradient - id="linearGradient6924-1-0" - inkscape:collect="always"> - <stop - id="stop6926-3-7" - offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - id="stop6928-9-8" - offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4134-9-5-6-5" - id="linearGradient17805-9" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.4954152,0,0,1.4906315,382.15258,-11.973727)" - x1="9.9747334" - y1="31.09375" - x2="37.077564" - y2="31.09375" /> - <linearGradient - id="linearGradient4134-9-5-6-5"> - <stop - id="stop4136-4-7-1" - offset="0" - style="stop-color:#4f79a6;stop-opacity:1;" /> - <stop - style="stop-color:#7fa8d3;stop-opacity:1" - offset="0.25000000" - id="stop4148-8-9-9-8" /> - <stop - style="stop-color:#7fa8d3;stop-opacity:1" - offset="0.45037496" - id="stop4142-8-2-2-4" /> - <stop - id="stop4138-2-3-1" - offset="1" - style="stop-color:#547ba6;stop-opacity:1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4206-4-7-47" - id="linearGradient17807-6" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.4954152,0,0,1.4906315,382.15258,-11.973727)" - x1="25.064732" - y1="21.857143" - x2="25.207588" - y2="25.428572" /> - <linearGradient - id="linearGradient4206-4-7-47"> - <stop - id="stop4208-5-9-5" - offset="0.0000000" - style="stop-color:#3465a4;stop-opacity:1" /> - <stop - id="stop4210-5-3-7" - offset="1.0000000" - style="stop-color:#3465a4;stop-opacity:1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4176-3-3" - id="linearGradient17809-9" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.4954152,0,0,1.4954152,382.15258,-12.162834)" - x1="17.160095" - y1="14.004482" - x2="37.969398" - y2="56.575912" /> - <linearGradient - id="linearGradient4176-3-3" - inkscape:collect="always"> - <stop - id="stop4178-8-0" - offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - id="stop4180-1-4" - offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient7210-7-1-9" - id="linearGradient17811-4" - gradientUnits="userSpaceOnUse" - x1="24" - y1="16.525082" - x2="24" - y2="13.284962" /> - <linearGradient - id="linearGradient7210-7-1-9"> - <stop - id="stop7212-33-5" - offset="0.0000000" - style="stop-color:#ffffff;stop-opacity:1.0000000;" /> - <stop - id="stop7214-0-0" - offset="1.0000000" - style="stop-color:#bfbebf;stop-opacity:1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6924-6-4" - id="linearGradient17813-7" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.4954152,0,0,1.4954152,381.93895,-8.2106577)" - x1="16.07143" - y1="19.5" - x2="15.785715" - y2="30" /> - <linearGradient - id="linearGradient6924-6-4" - inkscape:collect="always"> - <stop - id="stop6926-8-9" - offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - id="stop6928-76-6" - offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4134-9-5-6-5" - id="linearGradient13453" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.4954152,0,0,1.4906315,382.15258,-11.973727)" - x1="9.9747334" - y1="31.09375" - x2="37.077564" - y2="31.09375" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4206-4-7-47" - id="linearGradient13455" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.4954152,0,0,1.4906315,382.15258,-11.973727)" - x1="25.064732" - y1="21.857143" - x2="25.207588" - y2="25.428572" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4176-3-3" - id="linearGradient13457" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.4954152,0,0,1.4954152,382.15258,-12.162834)" - x1="17.160095" - y1="14.004482" - x2="37.969398" - y2="56.575912" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient7210-7-1-9" - id="linearGradient13459" - gradientUnits="userSpaceOnUse" - x1="24" - y1="16.525082" - x2="24" - y2="13.284962" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6924-6-4" - id="linearGradient13461" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.4954152,0,0,1.4954152,381.93895,-8.2106577)" - x1="16.07143" - y1="19.5" - x2="15.785715" - y2="30" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4134-9-6-2" - id="linearGradient13463" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.47256308,0,0,0.47256308,-19.884513,6.8263032)" - x1="9.9747334" - y1="31.09375" - x2="37.077564" - y2="31.09375" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4206-4-8-2" - id="linearGradient13465" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.47256308,0,0,0.47256308,-19.884513,6.8263032)" - x1="25.064732" - y1="21.857143" - x2="25.207588" - y2="25.428572" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4176-9-0" - id="linearGradient13467" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.45408812,0,0,0.45408812,-19.439922,7.2711048)" - x1="17.160095" - y1="14.004482" - x2="37.969398" - y2="56.575912" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient7210-8-1" - id="linearGradient13469" - gradientUnits="userSpaceOnUse" - x1="24" - y1="16.525082" - x2="24" - y2="13.284962" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6924-1-0" - id="linearGradient13471" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.47256308,0,0,0.47256308,-19.765711,7.8656218)" - x1="15.972866" - y1="16.641634" - x2="15.785715" - y2="30" /> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="1" - inkscape:cx="19.493077" - inkscape:cy="3.7728551" - inkscape:current-layer="layer1" - showgrid="true" - inkscape:grid-bbox="true" - inkscape:document-units="px" - inkscape:window-width="1600" - inkscape:window-height="838" - inkscape:window-x="-8" - inkscape:window-y="-8" - inkscape:window-maximized="1" /> - <metadata - id="metadata10062"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - id="layer1" - inkscape:label="Layer 1" - inkscape:groupmode="layer"> - <g - id="g13434" - transform="translate(0,2.9173594)"> - <g - id="g17793" - transform="matrix(-0.44348417,0.06245045,0.06245045,0.44348417,52.856902,5.0209674)"> - <g - transform="matrix(-1.0837219,0.15260732,0.15230446,1.0815712,533.59674,-76.67915)" - id="g17795"> - <path - inkscape:connector-curvature="0" - sodipodi:nodetypes="zsszssz" - id="path17797" - d="m 417.94908,1.3022136 c -11.7531,0 -21.30966,4.1775019 -21.30966,9.3164454 0,0.368755 0,26.633651 0,27.017694 0,5.138961 9.55656,9.316446 21.30966,9.316446 11.75311,0 21.6902,-4.177485 21.6902,-9.316446 0,-0.304179 0,-26.713514 0,-27.017694 0,-5.1389604 -9.93709,-9.3164454 -21.6902,-9.3164454 z" - style="color:#000000;fill:url(#linearGradient13453);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient13455);stroke-width:1.49302125;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible" /> - <path - inkscape:connector-curvature="0" - style="opacity:0.70796461;color:#000000;fill:none;stroke:url(#linearGradient13457);stroke-width:1.49541509;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible" - d="m 417.96197,2.3211206 c -10.95803,0 -19.86811,3.9074022 -19.86811,8.7140914 0,0.34492 0,25.251673 0,25.61088 0,4.80669 8.91008,8.714092 19.86811,8.714092 10.95804,0 20.22293,-3.907402 20.22291,-8.714092 0,-0.284505 0,-25.326375 0,-25.61088 0,-4.8066892 -9.26487,-8.7140914 -20.22291,-8.7140914 z" - id="path17799" - sodipodi:nodetypes="zsszssz" /> - <path - transform="matrix(1.5511807,0,0,1.5116482,380.81421,-10.643499)" - d="m 36.857142,14.071428 c 0,3.037566 -5.756338,5.5 -12.857142,5.5 -7.100804,0 -12.857142,-2.462434 -12.857142,-5.5 0,-3.037566 5.756338,-5.4999997 12.857142,-5.4999997 7.100804,0 12.857142,2.4624337 12.857142,5.4999997 z" - sodipodi:ry="5.5" - sodipodi:rx="12.857142" - sodipodi:cy="14.071428" - sodipodi:cx="24" - id="path17801" - style="color:#000000;fill:#3a3a3a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient13459);stroke-width:1.00492704;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible" - sodipodi:type="arc" /> - <path - inkscape:connector-curvature="0" - sodipodi:nodetypes="ccccccc" - id="path17803" - d="m 402.55432,17.318206 0.53407,17.62453 6.8362,1.922689 -0.21365,-17.517733 c 0,0 3.09765,0 8.11798,-0.320442 -7.7997,-0.348543 -16.72378,-3.700664 -19.76084,-5.874849 2.11884,3.128674 4.48624,4.165805 4.48624,4.165805 z" - style="opacity:0.49367083;color:#000000;fill:url(#linearGradient13461);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible" /> - </g> - </g> - <g - transform="matrix(1.5088326,1.0616208e-8,-1.0616208e-8,1.5088326,29.21121,-11.49056)" - id="g17815"> - <path - style="color:#000000;fill:url(#linearGradient13463);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient13465);stroke-width:0.77058458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible" - d="m -8.5725348,11.035069 c -3.7140732,0 -6.7340192,1.324361 -6.7340192,2.953519 0,0.116904 0,8.443456 0,8.565206 0,1.629164 3.019946,2.953519 6.7340192,2.953519 3.714079,0 6.854278,-1.324355 6.854278,-2.953519 0,-0.09643 0,-8.468774 0,-8.565206 0,-1.629164 -3.140199,-2.953519 -6.854278,-2.953519 z" - id="path17817" - sodipodi:nodetypes="zsszssz" - inkscape:connector-curvature="0" /> - <path - sodipodi:nodetypes="zsszssz" - id="path17819" - d="m -8.5662708,11.669209 c -3.3274462,0 -6.0330192,1.186496 -6.0330192,2.646065 0,0.104736 0,7.667759 0,7.776834 0,1.459568 2.705573,2.646065 6.0330192,2.646065 3.327452,0 6.140765,-1.186497 6.14076,-2.646065 0,-0.08639 0,-7.690444 0,-7.776834 0,-1.459569 -2.813308,-2.646065 -6.14076,-2.646065 z" - style="opacity:0.8982301;color:#000000;fill:none;stroke:url(#linearGradient13467);stroke-width:0.66884732;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible" - inkscape:connector-curvature="0" /> - <path - sodipodi:type="arc" - style="color:#000000;fill:#3a3a3a;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient13469);stroke-width:1.00492704;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible" - id="path17821" - sodipodi:cx="24" - sodipodi:cy="14.071428" - sodipodi:rx="12.857142" - sodipodi:ry="5.5" - d="m 36.857142,14.071428 c 0,3.037566 -5.756338,5.5 -12.857142,5.5 -7.100804,0 -12.857142,-2.462434 -12.857142,-5.5 0,-3.037566 5.756338,-5.4999997 12.857142,-5.4999997 7.100804,0 12.857142,2.4624337 12.857142,5.4999997 z" - transform="matrix(0.47968295,0,0,0.44145226,-20.055386,7.7366328)" /> - <path - style="opacity:0.64159324;color:#000000;fill:url(#linearGradient13471);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible" - d="m -13.251088,15.932946 -0.04081,5.569491 2.253444,0.607585 0.04895,-5.535743 c 0,0 0.978881,0 2.5653472,-0.101262 -2.4647692,-0.110142 -5.2848492,-1.169439 -6.2445852,-1.856499 0.669573,0.988686 1.41769,1.316428 1.41769,1.316428 z" - id="path17823" - sodipodi:nodetypes="ccccccc" - inkscape:connector-curvature="0" /> - </g> - <g - transform="matrix(0.44638113,0,0,0.47447387,-7.358114,5.1334974)" - id="g4937"> - <rect - ry="2.2097087" - rx="2.2097087" - inkscape:r_cy="true" - inkscape:r_cx="true" - y="27.5" - x="56.784271" - height="19" - width="20" - id="rect1686-7" - style="color:#000000;fill:#cc0000;fill-opacity:1;fill-rule:evenodd;stroke:#a40000;stroke-width:1.58558428;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" /> - <g - inkscape:r_cy="true" - inkscape:r_cx="true" - transform="matrix(0.779029,0,0,0.779029,57.156892,8.175921)" - id="g2254-4"> - <path - inkscape:connector-curvature="0" - style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2.56729817;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" - d="M 8,32 18,42" - id="path1377-0" - inkscape:r_cx="true" - inkscape:r_cy="true" /> - <path - inkscape:connector-curvature="0" - inkscape:r_cy="true" - inkscape:r_cx="true" - id="path2252-9" - d="M 18,32 8,42" - style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2.56729817;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" /> - </g> - <rect - style="opacity:0.45132745;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.23678398;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" - id="rect2258-4" - width="17.311575" - height="16.445995" - x="58.128487" - y="28.777004" - inkscape:r_cx="true" - inkscape:r_cy="true" - rx="1.5160787" - ry="1.5160787" /> - </g> - </g> - </g> -</svg> diff --git a/src/com.gluster.storage.management.gui/icons/tango/48x48/add-server.svg b/src/com.gluster.storage.management.gui/icons/tango/48x48/add-server.svg new file mode 100644 index 00000000..233ee823 --- /dev/null +++ b/src/com.gluster.storage.management.gui/icons/tango/48x48/add-server.svg @@ -0,0 +1,126 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg id="svg2327" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <defs id="defs3"> + <linearGradient id="linearGradient2752"> + <stop id="stop2754" stop-color="#9d9d9d" offset="0"/> + <stop id="stop2756" stop-color="#b9b9b9" offset="1"/> + </linearGradient> + <linearGradient id="linearGradient2711"> + <stop id="stop2713" stop-color="#909090" offset="0"/> + <stop id="stop2715" stop-color="#bebebe" stop-opacity="0.0000000" offset="1"/> + </linearGradient> + <linearGradient id="linearGradient2454"> + <stop id="stop2456" stop-color="#000" offset="0"/> + <stop id="stop2458" stop-color="#000" stop-opacity="0" offset="1"/> + </linearGradient> + <linearGradient id="linearGradient2253"> + <stop id="stop2255" stop-color="#8f8f8f" offset="0"/> + <stop id="stop2257" stop-color="#494949" offset="1"/> + </linearGradient> + <linearGradient id="linearGradient2245"> + <stop id="stop2247" stop-color="#dde1d9" offset="0"/> + <stop id="stop2249" stop-color="#cacdc6" offset="1"/> + </linearGradient> + <linearGradient id="linearGradient2251" y2="33.34" xlink:href="#linearGradient2245" gradientUnits="userSpaceOnUse" x2="34.784" gradientTransform="matrix(1.129863,0.000000,0.000000,0.885063,-1.625000,-1.304372)" y1="7.2294" x1="8.6116"/> + <linearGradient id="linearGradient2421" y2="55.201" gradientUnits="userSpaceOnUse" x2="34.975" gradientTransform="matrix(1.108069,0.000000,0.000000,0.902471,1.000000,1.000000)" y1="13.005" x1="17.698"> + <stop id="stop2417" stop-color="#FFF" offset="0"/> + <stop id="stop2419" stop-color="#FFF" stop-opacity="0" offset="1"/> + </linearGradient> + <radialGradient id="radialGradient2460" xlink:href="#linearGradient2454" gradientUnits="userSpaceOnUse" cy="67.502" cx="12.576" gradientTransform="scale(1.925808,0.519262)" r="8.7663"/> + <linearGradient id="linearGradient2673" y2="26.729" gradientUnits="userSpaceOnUse" y1="1.6538" gradientTransform="matrix(1.238977,0.000000,0.000000,0.895955,0.590553,-1.331524)" x2="17.199" x1="11.492"> + <stop id="stop2669" stop-color="#FFF" offset="0"/> + <stop id="stop2671" stop-color="#fcfcff" stop-opacity="0.0000000" offset="1"/> + </linearGradient> + <linearGradient id="linearGradient2681" y2="8.8666" gradientUnits="userSpaceOnUse" y1="32.622" gradientTransform="matrix(1.174139,0.000000,0.000000,0.945431,0.721825,-1.331524)" x2="16.316" x1="19.15"> + <stop id="stop2677" stop-color="#5b5b97" offset="0"/> + <stop id="stop2679" stop-color="#1b1b43" offset="1"/> + </linearGradient> + <linearGradient id="linearGradient2689" y2="162.45" gradientUnits="userSpaceOnUse" y1="171.29" gradientTransform="matrix(5.705159,0.000000,0.000000,0.175280,1.000000,-0.679373)" x2="3.707" x1="3.707"> + <stop id="stop2685" stop-color="#000" offset="0"/> + <stop id="stop2687" stop-color="#000" stop-opacity="0" offset="1"/> + </linearGradient> + <linearGradient id="linearGradient2707" y2="64.893" gradientUnits="userSpaceOnUse" y1="53.535" gradientTransform="scale(1.816345,0.550556)" x2="12.128" x1="12.207"> + <stop id="stop2703" stop-color="#585956" offset="0"/> + <stop id="stop2705" stop-color="#bbbeb8" offset="1"/> + </linearGradient> + <linearGradient id="linearGradient2717" y2="3.8451" xlink:href="#linearGradient2711" gradientUnits="userSpaceOnUse" y1="3.9384" x2="35.521" x1="34.301"/> + <linearGradient id="linearGradient2741" y2="74.098" gradientUnits="userSpaceOnUse" y1="101.28" gradientTransform="matrix(2.143634,0.000000,0.000000,0.466498,1.000000,-0.508826)" x2="8.6485" x1="13.629"> + <stop id="stop2637" stop-color="#f9fff5" offset="0"/> + <stop id="stop2639" stop-color="#f9fff5" stop-opacity="0" offset="1"/> + </linearGradient> + <linearGradient id="linearGradient2758" y2="100.2" xlink:href="#linearGradient2752" gradientUnits="userSpaceOnUse" y1="88.509" gradientTransform="scale(2.309851,0.432928)" x2="8.1134" x1="8.1134"/> + <linearGradient id="linearGradient2979" y2="31.246" xlink:href="#linearGradient2253" gradientUnits="userSpaceOnUse" y1="5.3818" gradientTransform="scale(1.104397,0.905471)" x2="32.537" x1="10.391"/> + <linearGradient id="linearGradient2981" y2="52.536" xlink:href="#linearGradient2245" gradientUnits="userSpaceOnUse" y1="48.643" gradientTransform="scale(1.129863,0.885063)" x2="18.177" x1="18.317"/> + <linearGradient id="linearGradient2991" y2="44.879" gradientUnits="userSpaceOnUse" y1="49.953" gradientTransform="scale(1.492875,0.669848)" x2="-23.886" x1="-23.886"> + <stop id="stop2987" stop-color="#d8dfd6" offset="0"/> + <stop id="stop2989" stop-color="#d8dfd6" stop-opacity="0" offset="1"/> + </linearGradient> + <radialGradient id="radialGradient3302" cx="55" gradientUnits="userSpaceOnUse" cy="125" r="14.375"> + <stop id="stop12513" stop-color="#FFF" offset="0"/> + <stop id="stop12517" stop-color="#fff520" stop-opacity="0.89108908" offset="0.5"/> + <stop id="stop12514" stop-color="#fff300" stop-opacity="0.0000000" offset="1"/> + </radialGradient> + </defs> + <metadata id="metadata4"> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + <dc:date>2005-03-08</dc:date> + <dc:creator> + <cc:Agent> + <dc:title>Jakub Steiner</dc:title> + </cc:Agent> + </dc:creator> + <dc:subject> + <rdf:Bag> + <rdf:li>workstation</rdf:li> + <rdf:li>computer</rdf:li> + <rdf:li>node</rdf:li> + <rdf:li>client</rdf:li> + </rdf:Bag> + </dc:subject> + <cc:license rdf:resource="http://creativecommons.org/licenses/publicdomain/"/> + <dc:source>http://jimmac.musichall.cz/</dc:source> + </cc:Work> + <cc:License rdf:about="http://creativecommons.org/licenses/publicdomain/"> + <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction"/> + <cc:permits rdf:resource="http://creativecommons.org/ns#Distribution"/> + <cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks"/> + </cc:License> + </rdf:RDF> + </metadata> + <g id="layer1"> + <path id="path2452" style="marker-end:none;color:#000000;marker-start:none;marker-mid:none;" d="M41.101,35.051a16.882,4.552,0,1,1,-33.765,0,16.882,4.552,0,1,1,33.765,0z" fill-rule="evenodd" transform="matrix(1.000000,0.000000,0.000000,1.368932,-1.978553,-13.61713)" fill="url(#radialGradient2460)"/> + <path id="path2407" stroke-linejoin="miter" style="marker-end:none;color:#000000;marker-start:none;marker-mid:none;" d="M-26.264,29.716a9.3944,3.9396,0,1,1,-18.789,0,9.3944,3.9396,0,1,1,18.789,0z" fill-rule="evenodd" transform="translate(57.53339,3.203427)" stroke-dashoffset="0.0000000" stroke="#4b4d4a" stroke-linecap="butt" stroke-miterlimit="4.0000000" stroke-width="1.0000000" fill="#adb0aa"/> + <path id="path1825" stroke-linejoin="miter" style="marker-end:none;color:#000000;marker-start:none;marker-mid:none;" d="M-26.264,29.716a9.3944,3.9396,0,1,1,-18.789,0,9.3944,3.9396,0,1,1,18.789,0z" transform="matrix(0.940273,0.000000,0.000000,0.940273,55.40361,4.271194)" stroke-dashoffset="0.0000000" stroke="#7b7f7a" stroke-linecap="butt" stroke-miterlimit="4.0000000" stroke-width="1.0000000" fill="none"/> + <path id="path2983" stroke-linejoin="miter" style="marker-end:none;color:#000000;marker-start:none;marker-mid:none;" d="M-26.264,29.716a9.3944,3.9396,0,1,1,-18.789,0,9.3944,3.9396,0,1,1,18.789,0z" transform="matrix(0.940273,0.000000,0.000000,0.940273,55.40361,3.521194)" stroke-dashoffset="0.0000000" stroke="url(#linearGradient2991)" stroke-linecap="butt" stroke-miterlimit="4.0000000" stroke-width="0.68065339" fill="none"/> + <path id="path2411" stroke-linejoin="round" d="M25.688,28.766l-0.063,1s4.324,3.599,9,4.203c2.338,0.301,4.754,0.702,6.75,1.187s3.588,1.12,4.125,1.656c0.31,0.311,0.451,0.574,0.5,0.782,0.049,0.207,0.038,0.355-0.094,0.562-0.264,0.416-1.08,0.968-2.468,1.406-2.778,0.878-7.721,1.438-14.563,1.438v1c6.896,0,11.864-0.528,14.844-1.469,1.49-0.47,2.525-1.015,3.031-1.812,0.253-0.399,0.357-0.889,0.25-1.344s-0.385-0.885-0.781-1.281c-0.878-0.878-2.537-1.407-4.594-1.906-2.057-0.5-4.516-0.915-6.875-1.219-4.719-0.609-9.062-4.203-9.062-4.203z" fill-rule="evenodd" stroke="#979797" stroke-linecap="butt" stroke-miterlimit="4.0000000" stroke-width="0.40000001" fill="#d0d0d0"/> + <path id="path2462" style="marker-end:none;color:#000000;marker-start:none;marker-mid:none;" d="M41.101,35.051a16.882,4.552,0,1,1,-33.765,0,16.882,4.552,0,1,1,33.765,0z" fill-rule="evenodd" transform="matrix(1.000000,0.000000,0.000000,1.368932,-1.978553,-19.02126)" fill="url(#radialGradient2460)"/> + <rect id="rect2699" style="marker-end:none;color:#000000;marker-start:none;marker-mid:none;" fill-rule="evenodd" height="2.74" width="9.0397" y="30.704" x="17.472" fill="url(#linearGradient2707)"/> + <path id="rect2404" stroke-linejoin="miter" style="marker-end:none;color:#000000;marker-start:none;marker-mid:none;" d="M7.0809,1.6956h29.588c0.911,0,1.624,0.5835,1.667,1.4016l1.332,25.578c0.058,1.118-0.901,2.021-2.02,2.021h-31.546c-1.1192,0-2.0785-0.903-2.0203-2.021l1.3321-25.578c0.0402-0.7735,0.5475-1.4016,1.6667-1.4016z" fill-rule="evenodd" stroke-dashoffset="0.0000000" stroke="url(#linearGradient2979)" stroke-linecap="butt" stroke-miterlimit="4.0000000" stroke-width="1.0000000" fill="url(#linearGradient2251)"/> + <path id="path2377" stroke-linejoin="round" style="stroke-dasharray:none;" d="M8.4105,4.3058l-1.2422,22.045h27.651l-1.335-21.952-25.074-0.0935z" fill-rule="evenodd" stroke="#000079" stroke-linecap="butt" stroke-miterlimit="4.0000000" stroke-width="0.50000000" fill="url(#linearGradient2681)"/> + <path id="path2393" stroke-linejoin="miter" d="M6.1774,28.736h31.429" stroke-opacity="0.24840762" stroke="url(#linearGradient2689)" stroke-linecap="round" stroke-miterlimit="4.0000000" stroke-width="0.99618119" fill="none"/> + <path id="path2397" stroke-linejoin="miter" style="marker-end:none;color:#000000;marker-start:none;marker-mid:none;" d="M6.9146,2.7063l29.845-0.0378c0.284-0.0003,0.559,0.2373,0.582,0.6526l1.362,24.803c0.058,1.057-0.54,1.786-1.598,1.786h-30.524c-1.0587,0-1.5931-0.729-1.5359-1.786l1.3241-24.494c0.0387-0.7159,0.1664-0.9234,0.5446-0.9239z" stroke-opacity="0.70063692" stroke-dashoffset="0.0000000" stroke="url(#linearGradient2421)" stroke-linecap="butt" stroke-miterlimit="4.0000000" stroke-width="0.99999964" fill="none"/> + <path id="path2443" opacity="0.53142858" d="M8.7115,4.7464l-0.8025,17.871c11.045-2.401,11.421-10.493,25.154-13.147l-0.161-4.6575-24.19-0.066z" fill-rule="evenodd" fill="url(#linearGradient2673)"/> + <path id="path2657" style="marker-end:none;color:#000000;marker-start:none;marker-mid:none;" d="M41.101,35.051a16.882,4.552,0,1,1,-33.765,0,16.882,4.552,0,1,1,33.765,0z" fill-rule="evenodd" transform="matrix(1.264398,0.000000,0.000000,1.291262,-6.216332,-4.000423)" fill="url(#radialGradient2460)"/> + <path id="path2409" stroke-linejoin="miter" style="marker-end:none;color:#000000;marker-start:none;stroke-dasharray:none;marker-mid:none;" d="M6.4622,36.817h31.003c1.119,0,0.977,0.272,1.092,0.613l2.834,8.425c0.115,0.342,0.027,0.613-1.092,0.613h-36.672c-1.1192,0-1.2071-0.271-1.0922-0.613l2.8347-8.425c0.1148-0.341-0.0271-0.613,1.0922-0.613z" fill-rule="evenodd" stroke-dashoffset="0.0000000" stroke="url(#linearGradient2979)" stroke-linecap="butt" stroke-miterlimit="4.0000000" stroke-width="1.0000000" fill="url(#linearGradient2981)"/> + <path id="path2611" d="M6.3917,38.829l-1.7678,5.127h5.4801l0.53-2.033h14.85l0.549,2.075h6.168l-1.679-5.169h-24.13z" fill-rule="evenodd" fill="#7a7d77"/> + <path id="path2613" fill-rule="evenodd" fill="#777874" d="M11.076,42.276l-0.442,1.68h14.761l-0.442-1.768-13.877,0.088z"/> + <path id="path2619" style="marker-end:none;color:#000000;marker-start:none;marker-mid:none;" fill-rule="evenodd" fill="#777a75" d="M37.593,38.829l1.679,5.038-5.48-0.088-1.503-4.861,5.304-0.089z"/> + <path id="path2615" style="marker-end:none;color:#000000;marker-start:none;marker-mid:none;" fill-rule="evenodd" fill="url(#linearGradient2758)" d="M37.593,38.299l1.679,5.038-5.48-0.088-1.503-4.862,5.304-0.088z"/> + <path id="path2617" d="M6.3917,38.21l-1.7678,5.127h5.4801l0.53-2.033h14.85l0.549,2.075h6.168l-1.679-5.169h-24.13z" fill-rule="evenodd" fill="url(#linearGradient2758)"/> + <path id="path2621" style="marker-end:none;color:#000000;marker-start:none;marker-mid:none;" fill-rule="evenodd" fill="url(#linearGradient2758)" d="M11.076,41.746l-0.442,1.679h14.761l-0.442-1.767-13.877,0.088z"/> + <path id="path2631" stroke-linejoin="round" style="marker-end:none;color:#000000;marker-start:none;marker-mid:none;" d="M6.1278,37.578h31.826l2.637,8.093h-37.261l2.7981-8.093z" stroke-dashoffset="0.0000000" stroke="url(#linearGradient2741)" stroke-linecap="butt" stroke-miterlimit="4.0000000" stroke-width="0.50000000" fill="none"/> + <path id="path2709" style="marker-end:none;color:#000000;marker-start:none;marker-mid:none;" d="M35.621,3.9384a0.83969,0.83969,0,1,1,-1.68,0,0.83969,0.83969,0,1,1,1.68,0z" fill-rule="evenodd" transform="matrix(1.331237,0.000000,0.000000,0.658449,-10.41933,2.853866)" fill="url(#linearGradient2717)"/> + <path id="path2719" style="marker-end:none;color:#000000;marker-start:none;marker-mid:none;" d="M35.621,3.9384a0.83969,0.83969,0,1,1,-1.68,0,0.83969,0.83969,0,1,1,1.68,0z" fill-rule="evenodd" transform="matrix(1.331237,0.000000,0.000000,0.658449,-10.30573,4.959651)" fill="url(#linearGradient2717)"/> + <path id="path2723" style="marker-end:none;color:#000000;marker-start:none;marker-mid:none;" d="M35.621,3.9384a0.83969,0.83969,0,1,1,-1.68,0,0.83969,0.83969,0,1,1,1.68,0z" fill-rule="evenodd" transform="matrix(1.331237,0.000000,0.000000,0.658449,-10.19213,6.959651)" fill="url(#linearGradient2717)"/> + <path id="path2727" style="marker-end:none;color:#000000;marker-start:none;marker-mid:none;" d="M35.621,3.9384a0.83969,0.83969,0,1,1,-1.68,0,0.83969,0.83969,0,1,1,1.68,0z" fill-rule="evenodd" transform="matrix(1.331237,0.000000,0.000000,0.658449,-10.07853,8.959651)" fill="url(#linearGradient2717)"/> + <path id="path2731" style="marker-end:none;color:#000000;marker-start:none;marker-mid:none;" d="M35.621,3.9384a0.83969,0.83969,0,1,1,-1.68,0,0.83969,0.83969,0,1,1,1.68,0z" fill-rule="evenodd" transform="matrix(1.331237,0.000000,0.000000,0.658449,-9.964930,10.95965)" fill="url(#linearGradient2717)"/> + <path id="text2735" fill="#4a4a4a" d="M20,27.318h0.282c0.083,0,0.148,0.018,0.192,0.056,0.045,0.037,0.068,0.09,0.068,0.158,0,0.069-0.023,0.123-0.068,0.16-0.044,0.037-0.109,0.056-0.192,0.056h-0.112v0.228h-0.17v-0.658m0.17,0.123v0.184h0.094c0.033,0,0.058-0.008,0.076-0.024s0.027-0.039,0.027-0.069c0-0.029-0.009-0.052-0.027-0.068-0.018-0.015-0.043-0.023-0.076-0.023h-0.094m0.792-0.012c-0.052,0-0.092,0.019-0.12,0.057-0.029,0.038-0.043,0.092-0.043,0.161,0,0.07,0.014,0.123,0.043,0.161,0.028,0.039,0.068,0.058,0.12,0.058s0.092-0.019,0.121-0.058c0.028-0.038,0.043-0.091,0.043-0.161,0-0.069-0.015-0.123-0.043-0.161-0.029-0.038-0.069-0.057-0.121-0.057m0-0.123c0.106,0,0.189,0.03,0.249,0.091,0.06,0.06,0.09,0.144,0.09,0.25,0,0.107-0.03,0.19-0.09,0.251-0.06,0.06-0.143,0.091-0.249,0.091s-0.188-0.031-0.249-0.091c-0.06-0.061-0.09-0.144-0.09-0.251,0-0.106,0.03-0.19,0.09-0.25,0.061-0.061,0.143-0.091,0.249-0.091m0.466,0.012h0.19l0.239,0.451v-0.451h0.161v0.658h-0.189l-0.24-0.452v0.452h-0.161v-0.658m0.663,0h0.186l0.15,0.234,0.15-0.234h0.186l-0.251,0.381v0.277h-0.17v-0.277l-0.251-0.381"/> + <g id="layer4" transform="translate(-0.74018,-3.25982)"> + <path id="path12511" style="color:#000000;" d="m69.375,125c0,7.9391-6.4359,14.375-14.375,14.375s-14.375-6.4359-14.375-14.375,6.4359-14.375,14.375-14.375,14.375,6.4359,14.375,14.375z" fill-rule="nonzero" transform="matrix(0.783292,0,0,0.783292,-6.340883,-86.65168)" display="block" fill="url(#radialGradient3302)"/> + </g> + </g> +</svg>
\ No newline at end of file diff --git a/src/com.gluster.storage.management.gui/plugin.xml b/src/com.gluster.storage.management.gui/plugin.xml index db5605f3..f1ac0e73 100644 --- a/src/com.gluster.storage.management.gui/plugin.xml +++ b/src/com.gluster.storage.management.gui/plugin.xml @@ -406,7 +406,7 @@ allowLabelUpdate="false" class="com.gluster.storage.management.gui.actions.DeleteVolumeAction" definitionId="com.gluster.storage.management.gui.commands.DeleteVolume" - icon="icons/tango/32x32/remove-volume.svg" + icon="icons/tango/32x32/remove-volume.png" id="com.gluster.storage.management.gui.actions.DeleteVolumeAction" label="&Delete Volume(s)" menubarPath="com.gluster.storage.management.gui.actionsets.volumes/volumes" @@ -514,7 +514,7 @@ allowLabelUpdate="false" class="com.gluster.storage.management.gui.actions.DeleteVolumeAction" definitionId="com.gluster.storage.management.gui.commands.DeleteVolume" - icon="icons/tango/32x32/remove-volume.svg" + icon="icons/tango/32x32/remove-volume.png" id="com.gluster.storage.management.gui.actions.DeleteVolumeAction" label="&Delete Volume" menubarPath="com.gluster.storage.management.gui.menu.volume/volume" @@ -793,7 +793,7 @@ allowLabelUpdate="false" class="com.gluster.storage.management.gui.actions.AddServerAction" definitionId="com.gluster.storage.management.gui.commands.AddServer" - icon="icons/server-add.png" + icon="icons/tango/32x32/add-server.png" id="com.gluster.storage.management.gui.actions.AddServerAction" label="&Add Server(s)" menubarPath="com.gluster.storage.management.gui.menu.discoveredservers/discoveredservers" @@ -851,7 +851,7 @@ allowLabelUpdate="false" class="com.gluster.storage.management.gui.actions.AddServerAction" definitionId="com.gluster.storage.management.gui.commands.AddServer" - icon="icons/server-add.png" + icon="icons/tango/32x32/add-server.png" id="com.gluster.storage.management.gui.actions.AddServerAction" label="&Add Server(s)" menubarPath="com.gluster.storage.management.gui.menu.discoveredserver/discoveredserver" diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DeviceTableLabelProvider.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DeviceTableLabelProvider.java index 62d67e43..d4000fab 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DeviceTableLabelProvider.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DeviceTableLabelProvider.java @@ -83,7 +83,7 @@ public class DeviceTableLabelProvider extends LabelProvider implements ITableLab case UNINITIALIZED: return guiHelper.getImage(IImageKeys.DISK_UNINITIALIZED); case INITIALIZING: - return guiHelper.getImage(IImageKeys.DISK_INITIALIZING); + return guiHelper.getImage(IImageKeys.DISK_INITIALIZING_SMALL); default: throw new GlusterRuntimeException("Invalid disk status [" + status + "]"); } diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java index 54407fbd..07aa37da 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java @@ -396,7 +396,7 @@ public class GlusterDataModelManager { public void initializeTasks(Cluster cluster) { List<TaskInfo> taskInfoList = new TasksClient(cluster.getName()).getAllTasks(); - // List<TaskInfo> taskInfoList = getDummyTasks(); + //List<TaskInfo> taskInfoList = getDummyTasks(); cluster.setTaskInfoList(taskInfoList); } @@ -409,40 +409,65 @@ public class GlusterDataModelManager { taskInfo.setName("Migrate Brick-music"); taskInfo.setPauseSupported(true); taskInfo.setStopSupported(true); - taskInfo.setStatus(new TaskStatus(new Status(Status.STATUS_CODE_RUNNING, ""))); + taskInfo.setStatus(new TaskStatus(new Status(Status.STATUS_CODE_PAUSE, ""))); - taskInfo.getStatus().setMessage("Migrating file xxxxx to yyyy"); - taskInfo.setDescription("Migrate Brick on volume [music] from /export/adb/music to /export/sdc/music."); + taskInfo.getStatus().setMessage("Paused"); + taskInfo.setDescription("Migrate Brick on volume [Movies] from /export/adb/music to /export/sdc/music."); taskInfoList.add(taskInfo); + // Task #2 taskInfo = new TaskInfo(); taskInfo.setType(TASK_TYPE.DISK_FORMAT); - taskInfo.setName("Format Disk-server1:sdc"); + taskInfo.setName("Initialize disk [KVM-GVSA1:sdc]"); taskInfo.setPauseSupported(false); taskInfo.setStopSupported(false); - taskInfo.setStatus( new TaskStatus(new Status(Status.STATUS_CODE_FAILURE, ""))); - taskInfo.getStatus().setMessage("Format completes 80% ..."); - taskInfo.setDescription("Formatting disk server1:sdc."); + taskInfo.setStatus( new TaskStatus(new Status(Status.STATUS_CODE_RUNNING, ""))); + taskInfo.getStatus().setMessage("Format completed 80% ..."); + taskInfo.setDescription("Formatting disk [KVM-GVSA1:sdc]"); taskInfoList.add(taskInfo); + // Task #2 + taskInfo = new TaskInfo(); + taskInfo.setType(TASK_TYPE.VOLUME_REBALANCE); + taskInfo.setName("Rebalance volume [songs]"); + taskInfo.setPauseSupported(false); + taskInfo.setStopSupported(false); + taskInfo.setStatus( new TaskStatus(new Status(Status.STATUS_CODE_RUNNING, ""))); + taskInfo.getStatus().setMessage("Rebalance step1: layout fix in progress"); + taskInfo.setDescription("Rebalance volume [songs]"); + taskInfoList.add(taskInfo); + return taskInfoList; } - private List<Alert> getDummyAlerts() { + private List<Alert> getDummyAlerts(Cluster cluster) { List<Alert> alerts = new ArrayList<Alert>(); - for (Server server : model.getCluster().getServers()) { + for (Server server : cluster.getServers()) { if (alerts.size() == 0) { alerts.add(new Alert(ALERT_TYPES.CPU_USAGE_ALERT, server.getName(), - Alert.ALERT_TYPE_STR[ALERT_TYPES.CPU_USAGE_ALERT.ordinal()] + "[" + server.getCpuUsage() - + "] in " + server.getName())); + Alert.ALERT_TYPE_STR[ALERT_TYPES.CPU_USAGE_ALERT.ordinal()] + " [93.42 %] in " + + server.getName())); continue; } if (alerts.size() == 1) { - Double memoryUtilized = server.getMemoryInUse() / server.getTotalMemory() * 100d; alerts.add(new Alert(ALERT_TYPES.MEMORY_USAGE_ALERT, server.getName(), - Alert.ALERT_TYPE_STR[ALERT_TYPES.MEMORY_USAGE_ALERT.ordinal()] + "[" + memoryUtilized + "%] in " - + server.getName())); + Alert.ALERT_TYPE_STR[ALERT_TYPES.MEMORY_USAGE_ALERT.ordinal()] + " [91.83 %] in " + + server.getName())); + continue; + } + + if (alerts.size() == 2) { + alerts.add(new Alert(ALERT_TYPES.OFFLINE_SERVERS_ALERT, server.getName(), + Alert.ALERT_TYPE_STR[ALERT_TYPES.OFFLINE_SERVERS_ALERT.ordinal()] + " " + server.getName())); + continue; + } + + if (alerts.size() == 3) { + alerts.add(new Alert(ALERT_TYPES.DISK_USAGE_ALERT, server.getName(), + Alert.ALERT_TYPE_STR[ALERT_TYPES.DISK_USAGE_ALERT.ordinal()] + " in " + server.getName() + ":" + "sdc")); + alerts.add(new Alert(ALERT_TYPES.OFFLINE_VOLUME_BRICKS_ALERT, "songs", + Alert.ALERT_TYPE_STR[ALERT_TYPES.OFFLINE_VOLUME_BRICKS_ALERT.ordinal()] + " [KVM-GVSA4:/export/hdb4/songs] in volume [songs]")); continue; } } @@ -453,7 +478,7 @@ public class GlusterDataModelManager { AlertsManager alertsManager = new AlertsManager(cluster); alertsManager.buildAlerts(); cluster.setAlerts( alertsManager.getAlerts() ); - // cluster.addAlerts( getDummyAlerts() ); + //cluster.setAlerts( getDummyAlerts(cluster) ); } diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/IImageKeys.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/IImageKeys.java index 49e2871b..1b895337 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/IImageKeys.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/IImageKeys.java @@ -24,8 +24,8 @@ public interface IImageKeys { public static final String SERVERS = "icons/tango/16x16/servers.png"; public static final String VOLUME = "icons/tango/16x16/volume.png"; public static final String SERVER = "icons/tango/16x16/server.png"; - public static final String SERVER_WARNING = "icons/server-warning.png"; - public static final String MEMORY_USAGE_ALERT = "icons/tango/16x16/high-memory-usage.svg"; + public static final String SERVER_WARNING = "icons/tango/22x22/server-warning.png"; + public static final String MEMORY_USAGE_ALERT = "icons/tango/22x22/high-memory-usage.png"; public static final String GSN = "icons/gsn.png"; public static final String SETTINGS = "icons/settings.png"; public static final String ADD = "icons/plus-white.png"; @@ -35,12 +35,12 @@ public interface IImageKeys { public static final String STOP_VOLUME = "icons/tango/32x32/stop-volume.svg"; public static final String RESET_VOLUME_OPTIONS = "icons/tango/32x32/reset-volume-option.svg"; public static final String VOLUME_OPTIONS = "icons/tango/16x16/volume-options.png"; - public static final String SERVER_OFFLINE = "icons/tango/16x16/offline-server.png"; + public static final String SERVER_OFFLINE = "icons/tango/22x22/offline-server.png"; public static final String CREATE_VOLUME_BIG = "icons/tango/48x48/create-volume.svg"; - public static final String REMOVE_VOLUME = "icons/tango/32x32/remove-volume.svg"; - public static final String ADD_SERVER = "icons/server-add.png"; - public static final String ADD_SERVER_BIG = "icons/tango/48x48/server.png"; + public static final String REMOVE_VOLUME = "icons/tango/32x32/remove-volume.png"; + public static final String ADD_SERVER = "icons/tango/32x32/add-server.png"; + public static final String ADD_SERVER_BIG = "icons/tango/48x48/add-server.svg"; public static final String REMOVE_SERVER = "icons/server-remove.png"; public static final String HELP = "icons/question.png"; public static final String STATUS_OFFLINE = "icons/status-offline.png"; @@ -55,20 +55,23 @@ public interface IImageKeys { public static final String DISK_UNINITIALIZED = "icons/tango/16x16/disk-uninitialized.png"; public static final String IO_ERROR = "icons/tango/16x16/disk-error.png"; public static final String DISK_AVAILABLE = "icons/tango/16x16/disk-available.png"; - public static final String DISK_INITIALIZING = "icons/tango/16x16/disk-initialisation.png"; + public static final String DISK_INITIALIZING_SMALL = "icons/tango/16x16/disk-initialisation.png"; + public static final String DISK_INITIALIZING = "icons/tango/22x22/disk-initialisation.png"; public static final String DISK_IN_USE = "icons/tango/16x16/disk-inuse.png"; public static final String SEARCH = "icons/tango/22x22/system-search.png"; public static final String ARROW_UP = "icons/arrow-up.png"; public static final String ARROW_DOWN = "icons/arrow-down.png"; public static final String VOLUME_REBALANCE = "icons/tango/32x32/volume-rebalance.svg"; + public static final String VOLUME_REBALANCE_SMALL = "icons/tango/22x22/volume-rebalance.png"; public static final String BRICK_MIGRATE = "icons/tango/32x32/replace-brick.svg"; + public static final String BRICK_MIGRATE_SMALL = "icons/tango/22x22/replace-brick.png"; public static final String DOWNLOAD_LOG = "icons/tango/32x32/download-log.svg"; public static final String ADD_BRICK = "icons/tango/32x32/add-brick.svg"; public static final String REMOVE_BRICK = "icons/tango/32x32/remove-brick.svg"; - public static final String LOW_DISK_SPACE = "icons/tango/16x16/low-diskspace.svg"; + public static final String LOW_DISK_SPACE = "icons/tango/22x22/low-diskspace.png"; public static final String DISK_OFFLINE = "icons/status-offline.png"; - public static final String BRICK_OFFLINE = "icons/status-offline.png"; + public static final String BRICK_OFFLINE = "icons/tango/22x22/offline-brick.png"; public static final String bricks = "icons/tango/16x16/bricks.png"; diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ServerDiskTableLabelProvider.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ServerDiskTableLabelProvider.java index a5b64e28..5da0353a 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ServerDiskTableLabelProvider.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ServerDiskTableLabelProvider.java @@ -65,7 +65,7 @@ public class ServerDiskTableLabelProvider extends TableLabelProviderAdapter { case UNINITIALIZED: return guiHelper.getImage(IImageKeys.DISK_UNINITIALIZED); case INITIALIZING: - return guiHelper.getImage(IImageKeys.DISK_INITIALIZING); + return guiHelper.getImage(IImageKeys.DISK_INITIALIZING_SMALL); default: throw new GlusterRuntimeException("Invalid disk status [" + status + "]"); } diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/ClusterSelectionDialog.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/ClusterSelectionDialog.java index 82df0c46..37381172 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/ClusterSelectionDialog.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/ClusterSelectionDialog.java @@ -159,7 +159,7 @@ public class ClusterSelectionDialog extends Dialog { @Override protected Control createDialogArea(Composite parent) { - parent.setBackgroundImage(guiHelper.getImage(IImageKeys.DIALOG_SPLASH_IMAGE)); + //parent.setBackgroundImage(guiHelper.getImage(IImageKeys.DIALOG_SPLASH_IMAGE)); // Makes sure that child composites inherit the same background parent.setBackgroundMode(SWT.INHERIT_FORCE); diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateBrickPage1.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateBrickPage1.java index cb59c310..e4bb2692 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateBrickPage1.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateBrickPage1.java @@ -76,16 +76,14 @@ public class MigrateBrickPage1 extends WizardPage { @Override public String getColumnText(Object element, int columnIndex) { - if (!(element instanceof Disk)) { + if (!(element instanceof Device)) { return null; } - Disk disk = (Disk) element; - return (columnIndex == DISK_TABLE_COLUMN_INDICES.SERVER.ordinal() ? disk.getServerName() - : columnIndex == DISK_TABLE_COLUMN_INDICES.BRICK_DIRECTORY.ordinal() ? disk.getMountPoint() + "/" + volumeName - : columnIndex == DISK_TABLE_COLUMN_INDICES.FREE_SPACE.ordinal() ? NumberUtil - .formatNumber(disk.getFreeSpace() / 1024 ) /* Coverted to GB */ - : columnIndex == DISK_TABLE_COLUMN_INDICES.TOTAL_SPACE.ordinal() ? NumberUtil - .formatNumber(disk.getSpace() / 1024) : "Invalid"); + Device device = (Device) element; + return (columnIndex == DISK_TABLE_COLUMN_INDICES.SERVER.ordinal() ? device.getServerName() + : columnIndex == DISK_TABLE_COLUMN_INDICES.BRICK_DIRECTORY.ordinal() ? device.getMountPoint() + "/" + volumeName + : columnIndex == DISK_TABLE_COLUMN_INDICES.FREE_SPACE.ordinal() ? NumberUtil.formatNumber(device.getFreeSpace() / 1024 ) /* Coverted to GB */ + : columnIndex == DISK_TABLE_COLUMN_INDICES.TOTAL_SPACE.ordinal() ? NumberUtil.formatNumber(device.getSpace() / 1024) : "Invalid"); } }; } @@ -207,18 +205,18 @@ public class MigrateBrickPage1 extends WizardPage { Text txtFilterFrom = guiHelper.createFilterText(container); Text txtFilterTo = guiHelper.createFilterText(container); - ITableLabelProvider diskLabelProvider = getDiskLabelProvider(volume.getName()); + ITableLabelProvider deviceLabelProvider = getDiskLabelProvider(volume.getName()); GlusterDataModelManager glusterDataModelManager = GlusterDataModelManager.getInstance(); List<Device> fromBricks = glusterDataModelManager.getReadyDevicesOfVolume(volume); List<Device> toDevices = glusterDataModelManager.getReadyDevicesOfAllServersExcluding( fromBricks ); - tableViewerFrom = createTableViewer(container, diskLabelProvider, fromBricks, txtFilterFrom); + tableViewerFrom = createTableViewer(container, deviceLabelProvider, fromBricks, txtFilterFrom); if(fromBrick != null) { setFromDisk(tableViewerFrom, fromBrick); } - tableViewerTo = createTableViewer(container, diskLabelProvider, toDevices, txtFilterTo); + tableViewerTo = createTableViewer(container, deviceLabelProvider, toDevices, txtFilterTo); // Auto commit selection field Composite autoCommitContainer = new Composite(container, SWT.NONE); diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java index 3f344d8b..a358066d 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java @@ -20,7 +20,6 @@ */ package com.gluster.storage.management.gui.views; -import java.util.ArrayList; import java.util.List; import org.eclipse.birt.chart.util.CDateTime; @@ -28,18 +27,19 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.custom.CLabel; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Label; import org.eclipse.ui.forms.events.HyperlinkAdapter; import org.eclipse.ui.forms.events.HyperlinkEvent; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.eclipse.ui.forms.widgets.Hyperlink; import org.eclipse.ui.forms.widgets.ImageHyperlink; import org.eclipse.ui.forms.widgets.ScrolledForm; import org.eclipse.ui.handlers.IHandlerService; import org.eclipse.ui.part.ViewPart; -import com.gluster.storage.management.client.GlusterServersClient; import com.gluster.storage.management.core.model.Alert; import com.gluster.storage.management.core.model.Cluster; import com.gluster.storage.management.core.model.EntityGroup; @@ -47,8 +47,6 @@ import com.gluster.storage.management.core.model.GlusterDataModel; import com.gluster.storage.management.core.model.GlusterServer; import com.gluster.storage.management.core.model.GlusterServer.SERVER_STATUS; import com.gluster.storage.management.core.model.Server; -import com.gluster.storage.management.core.model.ServerStats; -import com.gluster.storage.management.core.model.ServerStatsRow; import com.gluster.storage.management.core.model.TaskInfo; import com.gluster.storage.management.core.utils.NumberUtil; import com.gluster.storage.management.gui.GlusterDataModelManager; @@ -68,6 +66,7 @@ public class ClusterSummaryView extends ViewPart { private ScrolledForm form; private Cluster cluster; private GlusterDataModel model = GlusterDataModelManager.getInstance().getModel(); + private static final int CHART_WIDTH = 350; /* * (non-Javadoc) @@ -133,11 +132,30 @@ public class ClusterSummaryView extends ViewPart { chartViewerComposite.setLayoutData(data); } + private Composite createChartLinks(Composite section, int columnCount) { + GridLayout layout = new org.eclipse.swt.layout.GridLayout(columnCount, false); + layout.marginBottom = 0; + layout.marginTop = 0; + layout.marginLeft = (CHART_WIDTH - (50*columnCount)) / 2; + Composite graphComposite = toolkit.createComposite(section, SWT.NONE); + graphComposite.setLayout(layout); + GridData data = new GridData(SWT.FILL, SWT.FILL, false, false); + data.widthHint = CHART_WIDTH; + graphComposite.setLayoutData(data); + + Label label1 = toolkit.createLabel(graphComposite, "1 day"); + Hyperlink link1 = toolkit.createHyperlink(graphComposite, "1 week", SWT.NONE); + Hyperlink link2 = toolkit.createHyperlink(graphComposite, "1 month", SWT.NONE); + Hyperlink link3 = toolkit.createHyperlink(graphComposite, "1 year", SWT.NONE); + + return graphComposite; + } + private void createLineChart(Composite section, Calendar timestamps[], Double values[], String unit) { ChartViewerComposite chartViewerComposite = new ChartViewerComposite(section, SWT.NONE, timestamps, values, unit); GridData data = new GridData(SWT.FILL, SWT.FILL, false, false); - data.widthHint = 400; - data.heightHint = 300; + data.widthHint = CHART_WIDTH; + data.heightHint = 250; data.verticalAlignment = SWT.CENTER; chartViewerComposite.setLayoutData(data); } @@ -254,10 +272,11 @@ public class ClusterSummaryView extends ViewPart { Double[] values = new Double[] { 10d, 11.23d, 17.92d, 18.69d, 78.62d, 89.11d, 92.43d, 89.31d, 57.39d, 18.46d, 10.44d, 16.28d, 13.51d, 17.53d, 12.21, 20d, 21.43d, 16.45d, 14.86d, 15.27d }; createLineChart(section, timestamps, values, "%"); + createChartLinks(section, 4); } private void createNetworkUsageSection() { - Composite section = guiHelper.createSection(form, toolkit, "Network Usage", null, 1, false); + Composite section = guiHelper.createSection(form, toolkit, "Network Usage (Aggregated)", null, 1, false); //toolkit.createLabel(section, "Historical Network Usage graph will be displayed here."); Calendar[] timestamps = new Calendar[] { new CDateTime(1000l*1310468100), new CDateTime(1000l*1310468400), new CDateTime(1000l*1310468700), @@ -274,6 +293,7 @@ public class ClusterSummaryView extends ViewPart { // new Date(1310473800) }; Double[] values = new Double[] { 32d, 31.23d, 27.92d, 48.69d, 58.62d, 49.11d, 72.43d, 69.31d, 87.39d, 78.46d, 60.44d, 56.28d, 33.51d, 27.53d, 12.21, 10d, 21.43d, 36.45d, 34.86d, 35.27d }; createLineChart(section, timestamps, values, "KiB/s"); + createChartLinks(section, 4); } private void createRunningTasksSection() { @@ -292,13 +312,13 @@ public class ClusterSummaryView extends ViewPart { Image taskImage = null; switch(taskInfo.getType()) { case DISK_FORMAT: - taskImage = guiHelper.getImage(IImageKeys.DISK); + taskImage = guiHelper.getImage(IImageKeys.DISK_INITIALIZING); break; case BRICK_MIGRATE: - taskImage = guiHelper.getImage(IImageKeys.BRICK_MIGRATE); + taskImage = guiHelper.getImage(IImageKeys.BRICK_MIGRATE_SMALL); break; case VOLUME_REBALANCE: - taskImage = guiHelper.getImage(IImageKeys.VOLUME_REBALANCE); + taskImage = guiHelper.getImage(IImageKeys.VOLUME_REBALANCE_SMALL); break; } lblAlert.setImage(taskImage); diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerSummaryView.java index bae6b9e3..fbf787e3 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerSummaryView.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerSummaryView.java @@ -113,7 +113,7 @@ public class GlusterServerSummaryView extends ViewPart { private void createLineChart(Composite section, Calendar timestamps[], Double values[], String unit) { ChartViewerComposite chartViewerComposite = new ChartViewerComposite(section, SWT.NONE, timestamps, values, unit); GridData data = new GridData(SWT.FILL, SWT.FILL, false, false); -// data.widthHint = CHART_WIDTH; + data.widthHint = CHART_WIDTH; data.heightHint = 250; // data.verticalAlignment = SWT.CENTER; // data.grabExcessVerticalSpace = false; @@ -134,7 +134,7 @@ public class GlusterServerSummaryView extends ViewPart { //Double[] values = new Double[] { 10d, 11.23d, 17.92d, 18.69d, 78.62d, 89.11d, 92.43d, 20.31d, 19.63d, 18.46d, 10.44d, 16.28d, 13.51d, 17.53d, 12.21, 20d, 40d, 10d, 90d, 40d }; Double[] values = new Double[] { 35d, 34.23d, 37.92d, 28.69d, 38.62d, 39.11d, 38.46d, 30.44d, 36.28d, 72.43d, 79.31d, 77.39d, 33.51d, 37.53d, 32.21, 30d, 31.43d, 36.45d, 34.86d, 35.27d }; createLineChart(section, timestamps, values, "%"); - Composite graphComposite = createChartLinks(section, 4); + createChartLinks(section, 4); } private void createNetworkUsageSection() { @@ -151,9 +151,10 @@ public class GlusterServerSummaryView extends ViewPart { createLineChart(section, timestamps, values, "Kib/s"); Composite graphComposite = createChartLinks(section, 5); + CCombo interfaceCombo = new CCombo(graphComposite, SWT.DROP_DOWN | SWT.READ_ONLY | SWT.BORDER | SWT.FLAT); interfaceCombo.setItems(new String[] {"eth0"}); - interfaceCombo.select(0); + interfaceCombo.select(0); } @@ -181,7 +182,7 @@ public class GlusterServerSummaryView extends ViewPart { // } // // createLineChart(section, timestamps.toArray(new Calendar[0]), data.toArray(new Double[0])); - Composite graphComposite = createChartLinks(section, 4); + createChartLinks(section, 4); } private Composite createChartLinks(Composite section, int columnCount) { diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServersSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServersSummaryView.java index b064d997..197b925f 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServersSummaryView.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServersSummaryView.java @@ -154,7 +154,7 @@ public class GlusterServersSummaryView extends ViewPart { Composite section = guiHelper.createSection(form, toolkit, "Running Tasks", null, 1, false); for (TaskInfo taskInfo : GlusterDataModelManager.getInstance().getModel().getCluster().getTaskInfoList()) { - if (taskInfo.getType() != TASK_TYPE.VOLUME_REBALANCE) { // Exclude volume related tasks + if (taskInfo.getType() != TASK_TYPE.VOLUME_REBALANCE && taskInfo.getType() != TASK_TYPE.BRICK_MIGRATE) { // Exclude volume related tasks addTaskLabel(section, taskInfo); } } @@ -167,13 +167,13 @@ public class GlusterServersSummaryView extends ViewPart { Image taskImage = null; switch(taskInfo.getType()) { case DISK_FORMAT: - taskImage = guiHelper.getImage(IImageKeys.DISK); + taskImage = guiHelper.getImage(IImageKeys.DISK_INITIALIZING); break; case BRICK_MIGRATE: - taskImage = guiHelper.getImage(IImageKeys.BRICK_MIGRATE); + taskImage = guiHelper.getImage(IImageKeys.BRICK_MIGRATE_SMALL); break; case VOLUME_REBALANCE: - taskImage = guiHelper.getImage(IImageKeys.VOLUME_REBALANCE); + taskImage = guiHelper.getImage(IImageKeys.VOLUME_REBALANCE_SMALL); break; } lblAlert.setImage(taskImage); |
