summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShireesh Anjal <shireesh@gluster.com>2011-05-07 20:57:35 +0530
committerShireesh Anjal <shireesh@gluster.com>2011-05-07 20:57:35 +0530
commit2668c28ff8a4bb678304e73b156c34dc889aea8b (patch)
tree8c5e3bf42b211d6212ba343645ddb86690b20d39
parent740e91a3ad585a7c9e4a58e1e9c8f01c6c85392f (diff)
Added new plug-in project for help, Changed title of all summary views to "Summary", modified not to show the disk usage pie chart when the storage cloud is empty.
-rw-r--r--src/com.gluster.storage.management.console.help/.project22
-rw-r--r--src/com.gluster.storage.management.console.help/META-INF/MANIFEST.MF8
-rw-r--r--src/com.gluster.storage.management.console.help/build.properties4
-rw-r--r--src/com.gluster.storage.management.console.help/html/concepts/maintopic.html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/concepts/subtopic.html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/concepts/subtopic2.html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic.html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic.html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic2.html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/help_home.html10
-rw-r--r--src/com.gluster.storage.management.console.help/html/reference/maintopic.html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/reference/subtopic.html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/reference/subtopic2.html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/tasks/maintopic.html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/tasks/subtopic.html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/tasks/subtopic2.html13
-rw-r--r--src/com.gluster.storage.management.console.help/html/toc.html13
-rw-r--r--src/com.gluster.storage.management.console.help/plugin.xml25
-rw-r--r--src/com.gluster.storage.management.console.help/toc.xml17
-rw-r--r--src/com.gluster.storage.management.console.help/tocconcepts.xml11
-rw-r--r--src/com.gluster.storage.management.console.help/tocgettingstarted.xml11
-rw-r--r--src/com.gluster.storage.management.console.help/tocreference.xml11
-rw-r--r--src/com.gluster.storage.management.console.help/toctasks.xml11
-rw-r--r--src/com.gluster.storage.management.gui.feature/feature.xml6
-rw-r--r--src/com.gluster.storage.management.gui/META-INF/MANIFEST.MF3
-rw-r--r--src/com.gluster.storage.management.gui/preferences.ini3
-rw-r--r--src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ApplicationActionBarAdvisor.java7
-rw-r--r--src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java16
-rw-r--r--src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerSummaryView.java1
-rw-r--r--src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServersSummaryView.java5
-rw-r--r--src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java1
-rw-r--r--src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumesSummaryView.java2
32 files changed, 336 insertions, 7 deletions
diff --git a/src/com.gluster.storage.management.console.help/.project b/src/com.gluster.storage.management.console.help/.project
new file mode 100644
index 00000000..ba39c551
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>com.gluster.storage.management.console.help</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ </natures>
+</projectDescription>
diff --git a/src/com.gluster.storage.management.console.help/META-INF/MANIFEST.MF b/src/com.gluster.storage.management.console.help/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..2bfb3270
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Gluster Management Console - Help
+Bundle-SymbolicName: com.gluster.storage.management.console.help; singleton:=true
+Bundle-Version: 1.0.0
+Bundle-Vendor: GLUSTER
+Require-Bundle: org.eclipse.help.ui;bundle-version="3.5.2",
+ org.eclipse.help.webapp;bundle-version="3.5.2"
diff --git a/src/com.gluster.storage.management.console.help/build.properties b/src/com.gluster.storage.management.console.help/build.properties
new file mode 100644
index 00000000..3c05d072
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/build.properties
@@ -0,0 +1,4 @@
+bin.includes = plugin.xml,\
+ META-INF/,\
+ html/,\
+ *.xml
diff --git a/src/com.gluster.storage.management.console.help/html/concepts/maintopic.html b/src/com.gluster.storage.management.console.help/html/concepts/maintopic.html
new file mode 100644
index 00000000..a476078a
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/concepts/maintopic.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Main Topic</title>
+</head>
+
+<body>
+<h1>Main Topic</h1>
+Please enter your text here.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/concepts/subtopic.html b/src/com.gluster.storage.management.console.help/html/concepts/subtopic.html
new file mode 100644
index 00000000..8a61c501
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/concepts/subtopic.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Sub Topic</title>
+</head>
+
+<body>
+<h1>Sub Topic</h1>
+Please enter your text here.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/concepts/subtopic2.html b/src/com.gluster.storage.management.console.help/html/concepts/subtopic2.html
new file mode 100644
index 00000000..86bcbf9c
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/concepts/subtopic2.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Sub Topic 2</title>
+</head>
+
+<body>
+<h1>Sub Topic 2</h1>
+Please enter your text here.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic.html
new file mode 100644
index 00000000..a476078a
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Main Topic</title>
+</head>
+
+<body>
+<h1>Main Topic</h1>
+Please enter your text here.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic.html
new file mode 100644
index 00000000..8a61c501
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Sub Topic</title>
+</head>
+
+<body>
+<h1>Sub Topic</h1>
+Please enter your text here.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic2.html b/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic2.html
new file mode 100644
index 00000000..86bcbf9c
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic2.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Sub Topic 2</title>
+</head>
+
+<body>
+<h1>Sub Topic 2</h1>
+Please enter your text here.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/help_home.html b/src/com.gluster.storage.management.console.help/html/help_home.html
new file mode 100644
index 00000000..cfd6489d
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/help_home.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Gluster Management Console</title>
+</head>
+<body>
+Gluster Management Console Help Home Page
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/reference/maintopic.html b/src/com.gluster.storage.management.console.help/html/reference/maintopic.html
new file mode 100644
index 00000000..a476078a
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/reference/maintopic.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Main Topic</title>
+</head>
+
+<body>
+<h1>Main Topic</h1>
+Please enter your text here.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/reference/subtopic.html b/src/com.gluster.storage.management.console.help/html/reference/subtopic.html
new file mode 100644
index 00000000..8a61c501
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/reference/subtopic.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Sub Topic</title>
+</head>
+
+<body>
+<h1>Sub Topic</h1>
+Please enter your text here.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/reference/subtopic2.html b/src/com.gluster.storage.management.console.help/html/reference/subtopic2.html
new file mode 100644
index 00000000..86bcbf9c
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/reference/subtopic2.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Sub Topic 2</title>
+</head>
+
+<body>
+<h1>Sub Topic 2</h1>
+Please enter your text here.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/maintopic.html b/src/com.gluster.storage.management.console.help/html/tasks/maintopic.html
new file mode 100644
index 00000000..a476078a
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/tasks/maintopic.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Main Topic</title>
+</head>
+
+<body>
+<h1>Main Topic</h1>
+Please enter your text here.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/subtopic.html b/src/com.gluster.storage.management.console.help/html/tasks/subtopic.html
new file mode 100644
index 00000000..8a61c501
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/tasks/subtopic.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Sub Topic</title>
+</head>
+
+<body>
+<h1>Sub Topic</h1>
+Please enter your text here.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/subtopic2.html b/src/com.gluster.storage.management.console.help/html/tasks/subtopic2.html
new file mode 100644
index 00000000..86bcbf9c
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/tasks/subtopic2.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Sub Topic 2</title>
+</head>
+
+<body>
+<h1>Sub Topic 2</h1>
+Please enter your text here.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/html/toc.html b/src/com.gluster.storage.management.console.help/html/toc.html
new file mode 100644
index 00000000..326f0a9f
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/html/toc.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Table of Contents</title>
+</head>
+
+<body>
+<h1>Table of Contents</h1>
+Please enter your text here.
+</body>
+</html> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.console.help/plugin.xml b/src/com.gluster.storage.management.console.help/plugin.xml
new file mode 100644
index 00000000..0b62d954
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/plugin.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+
+ <extension
+ point="org.eclipse.help.toc">
+ <toc
+ file="toc.xml"
+ primary="true">
+ </toc>
+ <toc
+ file="tocconcepts.xml">
+ </toc>
+ <toc
+ file="tocgettingstarted.xml">
+ </toc>
+ <toc
+ file="tocreference.xml">
+ </toc>
+ <toc
+ file="toctasks.xml">
+ </toc>
+ </extension>
+
+</plugin>
diff --git a/src/com.gluster.storage.management.console.help/toc.xml b/src/com.gluster.storage.management.console.help/toc.xml
new file mode 100644
index 00000000..963995c6
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/toc.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc label="Gluster Management Console - Help" topic="html/toc.html">
+ <topic label="Getting Started">
+ <anchor id="gettingstarted"/>
+ </topic>
+ <topic label="Concepts">
+ <anchor id="concepts"/>
+ </topic>
+ <topic label="Tasks">
+ <anchor id="tasks"/>
+ </topic>
+ <topic label="Reference">
+ <anchor id="reference"/>
+ </topic>
+</toc>
diff --git a/src/com.gluster.storage.management.console.help/tocconcepts.xml b/src/com.gluster.storage.management.console.help/tocconcepts.xml
new file mode 100644
index 00000000..d01f925e
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/tocconcepts.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc label="Concepts" link_to="toc.xml#concepts">
+ <topic label="Main Topic" href="html/concepts/maintopic.html">
+ <topic label="Sub Topic" href="html/concepts/subtopic.html" />
+ </topic>
+ <topic label="Main Topic 2">
+ <topic label="Sub Topic 2" href="html/concepts/subtopic2.html" />
+ </topic>
+</toc>
diff --git a/src/com.gluster.storage.management.console.help/tocgettingstarted.xml b/src/com.gluster.storage.management.console.help/tocgettingstarted.xml
new file mode 100644
index 00000000..38f27e0b
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/tocgettingstarted.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc label="Getting Started" link_to="toc.xml#gettingstarted">
+ <topic label="Main Topic" href="html/gettingstarted/maintopic.html">
+ <topic label="Sub Topic" href="html/gettingstarted/subtopic.html" />
+ </topic>
+ <topic label="Main Topic 2">
+ <topic label="Sub Topic 2" href="html/gettingstarted/subtopic2.html" />
+ </topic>
+</toc>
diff --git a/src/com.gluster.storage.management.console.help/tocreference.xml b/src/com.gluster.storage.management.console.help/tocreference.xml
new file mode 100644
index 00000000..660cdecc
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/tocreference.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc label="Reference" link_to="toc.xml#reference">
+ <topic label="Main Topic" href="html/reference/maintopic.html">
+ <topic label="Sub Topic" href="html/reference/subtopic.html" />
+ </topic>
+ <topic label="Main Topic 2">
+ <topic label="Sub Topic 2" href="html/reference/subtopic2.html" />
+ </topic>
+</toc>
diff --git a/src/com.gluster.storage.management.console.help/toctasks.xml b/src/com.gluster.storage.management.console.help/toctasks.xml
new file mode 100644
index 00000000..c96b94bb
--- /dev/null
+++ b/src/com.gluster.storage.management.console.help/toctasks.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc label="Tasks" link_to="toc.xml#tasks">
+ <topic label="Main Topic" href="html/tasks/maintopic.html">
+ <topic label="Sub Topic" href="html/tasks/subtopic.html" />
+ </topic>
+ <topic label="Main Topic 2">
+ <topic label="Sub Topic 2" href="html/tasks/subtopic2.html" />
+ </topic>
+</toc>
diff --git a/src/com.gluster.storage.management.gui.feature/feature.xml b/src/com.gluster.storage.management.gui.feature/feature.xml
index 7f99803e..06df1a47 100644
--- a/src/com.gluster.storage.management.gui.feature/feature.xml
+++ b/src/com.gluster.storage.management.gui.feature/feature.xml
@@ -779,4 +779,10 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="com.gluster.storage.management.console.help"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
</feature>
diff --git a/src/com.gluster.storage.management.gui/META-INF/MANIFEST.MF b/src/com.gluster.storage.management.gui/META-INF/MANIFEST.MF
index 076a2805..55029ee6 100644
--- a/src/com.gluster.storage.management.gui/META-INF/MANIFEST.MF
+++ b/src/com.gluster.storage.management.gui/META-INF/MANIFEST.MF
@@ -22,7 +22,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.1",
com.ibm.icu;bundle-version="4.2.1",
com.richclientgui.rcptoolbox;bundle-version="1.0.5",
org.eclipse.core.resources,
- org.apache.commons.lang;bundle-version="2.3.0"
+ org.apache.commons.lang;bundle-version="2.3.0",
+ com.gluster.storage.management.console.help;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
diff --git a/src/com.gluster.storage.management.gui/preferences.ini b/src/com.gluster.storage.management.gui/preferences.ini
index 91228592..24389288 100644
--- a/src/com.gluster.storage.management.gui/preferences.ini
+++ b/src/com.gluster.storage.management.gui/preferences.ini
@@ -1 +1,2 @@
-org.eclipse.ui/KEY_CONFIGURATION_ID = com.gluster.storage.management.gui.KeyConfig \ No newline at end of file
+org.eclipse.ui/KEY_CONFIGURATION_ID = com.gluster.storage.management.gui.KeyConfig
+org.eclipse.help.base/help_home=/com.gluster.storage.management.console.help/html/help_home.html \ No newline at end of file
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ApplicationActionBarAdvisor.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ApplicationActionBarAdvisor.java
index 3f6cb7d5..fa613efd 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ApplicationActionBarAdvisor.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ApplicationActionBarAdvisor.java
@@ -46,6 +46,7 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor {
*/
private IWorkbenchAction exitAction;
private IWorkbenchAction aboutAction;
+ private IWorkbenchAction helpContentsAction;
private GUIHelper guiHelper = GUIHelper.getInstance();
@@ -68,6 +69,11 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor {
aboutAction.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(Application.PLUGIN_ID,
IImageKeys.HELP));
register(aboutAction);
+
+ helpContentsAction = ActionFactory.HELP_CONTENTS.create(window);
+ helpContentsAction.setText("&Contents");
+ //helpContentsAction.setImageDescriptor(newImage)
+ register(helpContentsAction);
}
protected void fillMenuBar(IMenuManager menuBar) {
@@ -78,6 +84,7 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor {
// Help
MenuManager helpMenu = new MenuManager("&Help", IWorkbenchActionConstants.M_HELP);
+ helpMenu.add(helpContentsAction);
helpMenu.add(aboutAction);
menuBar.add(fileMenu);
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 4ec1f586..c37bcd76 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
@@ -78,7 +78,7 @@ public class ClusterSummaryView extends ViewPart {
if (cluster == null) {
cluster = model.getCluster();
}
-
+ setPartName("Summary");
createSections(parent);
}
@@ -127,6 +127,10 @@ public class ClusterSummaryView extends ViewPart {
private void createDiskSpaceSection() {
Composite section = guiHelper.createSection(form, toolkit, "Disk Space", null, 3, false);
+ if (cluster.getServers().size() == 0) {
+ toolkit.createLabel(section, "This section will be populated after at least one server is added to the storage cloud.");
+ return;
+ }
double totalDiskSpace = cluster.getTotalDiskSpace();
double diskSpaceInUse = cluster.getDiskSpaceInUse();
@@ -241,6 +245,7 @@ public class ClusterSummaryView extends ViewPart {
createServersSection();
createDiskSpaceSection();
createCPUUsageSection();
+ createNetworkUsageSection();
//createMemoryUsageSection();
createActionsSection();
createAlertsSection();
@@ -256,9 +261,18 @@ public class ClusterSummaryView extends ViewPart {
private void createCPUUsageSection() {
Composite section = guiHelper.createSection(form, toolkit, "CPU Usage (aggregated)", null, 1, false);
+ if (cluster.getServers().size() == 0) {
+ toolkit.createLabel(section, "This section will be populated after at least one server is added to the storage cloud.");
+ return;
+ }
toolkit.createLabel(section, "Historical CPU Usage graph aggregated across all servers will be displayed here.");
}
+ private void createNetworkUsageSection() {
+ Composite section = guiHelper.createSection(form, toolkit, "Network Usage", null, 1, false);
+ toolkit.createLabel(section, "Historical Network Usage graph will be displayed here.");
+ }
+
private void createRunningTasksSection() {
Composite section = guiHelper.createSection(form, toolkit, "Running Tasks", null, 1, false);
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 87ad17d6..d43cab15 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
@@ -68,6 +68,7 @@ public class GlusterServerSummaryView extends ViewPart {
if (server == null) {
server = (GlusterServer) guiHelper.getSelectedEntity(getSite(), GlusterServer.class);
}
+ setPartName("Summary");
createSections(parent);
}
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 bb9114b3..080ebace 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
@@ -54,7 +54,7 @@ public class GlusterServersSummaryView extends ViewPart {
if (servers == null) {
servers = (EntityGroup<GlusterServer>)guiHelper.getSelectedEntity(getSite(), EntityGroup.class);
}
-
+ setPartName("Summary");
createSections(parent);
}
@@ -62,12 +62,11 @@ public class GlusterServersSummaryView extends ViewPart {
* @param parent
*/
private void createSections(Composite parent) {
- form = guiHelper.setupForm(parent, toolkit, "Volumes - Summary");
+ form = guiHelper.setupForm(parent, toolkit, "Servers - Summary");
createSummarySection();
createRunningTasksSection();
createAlertsSection();
-
parent.layout(); // IMP: lays out the form properly
}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java
index 1c9577ac..3c633bf4 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java
@@ -64,6 +64,7 @@ public class VolumeSummaryView extends ViewPart {
}
this.parent = parent;
+ setPartName("Summary");
createSections();
// Refresh the navigation tree whenever there is a change to the data model
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumesSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumesSummaryView.java
index 2b9d7178..bc136b61 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumesSummaryView.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumesSummaryView.java
@@ -72,7 +72,7 @@ public class VolumesSummaryView extends ViewPart {
volumes = (EntityGroup<Volume>) selectedObj;
}
}
-
+ setPartName("Summary");
createSections(parent);
}