diff options
author | Dejan Gloszic | 2006-02-13 02:56:31 +0000 |
---|---|---|
committer | Dejan Gloszic | 2006-02-13 02:56:31 +0000 |
commit | f4c7f43883de92eefe36e93265f83f156f254757 (patch) | |
tree | 2af2bd634111379ac8d511d63d8dc5aa1dbdc139 | |
parent | 6d447dfbac3392f75d5f85d1a55a89615a34c6e4 (diff) | |
download | eclipse.platform.ua-f4c7f43883de92eefe36e93265f83f156f254757.tar.gz eclipse.platform.ua-f4c7f43883de92eefe36e93265f83f156f254757.tar.xz eclipse.platform.ua-f4c7f43883de92eefe36e93265f83f156f254757.zip |
*** empty log message ***
23 files changed, 103 insertions, 257 deletions
diff --git a/org.eclipse.ui.intro/plugin.xml b/org.eclipse.ui.intro/plugin.xml index eb4cd359f..0fd4d5598 100644 --- a/org.eclipse.ui.intro/plugin.xml +++ b/org.eclipse.ui.intro/plugin.xml @@ -49,11 +49,13 @@ introId="org.eclipse.ui.intro.shared"> <presentation home-page-id="root" standby-page-id="standby"> + <!-- <implementation style="$nl$/shared/css/shared.css" kind="html" os="win32,linux,macosx"> </implementation> + --> <implementation kind="swt"> </implementation> diff --git a/org.eclipse.ui.intro/shared/css/firststeps/swt.properties b/org.eclipse.ui.intro/shared/css/firststeps/swt.properties index 7d9d3b3b6..cc62a3453 100644 --- a/org.eclipse.ui.intro/shared/css/firststeps/swt.properties +++ b/org.eclipse.ui.intro/shared/css/firststeps/swt.properties @@ -1,16 +1,3 @@ - -firstseps.page-content.news-links.layout.ncolumns = 2 -firstseps.page-content.news-links.layout.vspacing = 30 - -firstseps.page-content.news-links.new-and-noteworthy.link-icon = shared/css/graphics/whatsnew.png -firstseps.page-content.news-links.updates.link-icon = shared/css/graphics/whatsnew.png -firstseps.page-content.news-links.eclipse.link-icon = shared/css/graphics/whatsnew.png - -firstseps.page-content.noteworthy-links.layout.ncolumns = 2 -firstseps.page-content.noteworthy-links.layout.vspacing = 15 -firstseps.page-content.news-links.layout.vspacing = 15 -firstseps.page-content.layout.vspacing = 40 - -firstseps.link-icon = shared/css/graphics/whatsnew.png - -firstseps.subtitle-id = news/page-content/page-title +firststeps.page-content.layout.ncolumns = 2 +firststeps.page-content.bottom.layout.colspan = 2 +firstseps.subtitle-id = firststeps/page-content/page-title diff --git a/org.eclipse.ui.intro/shared/css/graphics/new_obj.gif b/org.eclipse.ui.intro/shared/css/graphics/new_obj.gif Binary files differnew file mode 100644 index 000000000..f46b81bdd --- /dev/null +++ b/org.eclipse.ui.intro/shared/css/graphics/new_obj.gif diff --git a/org.eclipse.ui.intro/shared/css/graphics/newhov_obj.gif b/org.eclipse.ui.intro/shared/css/graphics/newhov_obj.gif Binary files differnew file mode 100644 index 000000000..593e63bc6 --- /dev/null +++ b/org.eclipse.ui.intro/shared/css/graphics/newhov_obj.gif diff --git a/org.eclipse.ui.intro/shared/css/graphics/root/firststeps48.png b/org.eclipse.ui.intro/shared/css/graphics/root/firststeps48.png Binary files differnew file mode 100644 index 000000000..5b0270e1f --- /dev/null +++ b/org.eclipse.ui.intro/shared/css/graphics/root/firststeps48.png diff --git a/org.eclipse.ui.intro/shared/css/graphics/root/migrate48.png b/org.eclipse.ui.intro/shared/css/graphics/root/migrate48.png Binary files differnew file mode 100644 index 000000000..c1379ac75 --- /dev/null +++ b/org.eclipse.ui.intro/shared/css/graphics/root/migrate48.png diff --git a/org.eclipse.ui.intro/shared/css/graphics/root/overview48.png b/org.eclipse.ui.intro/shared/css/graphics/root/overview48.png Binary files differnew file mode 100644 index 000000000..f14e3b887 --- /dev/null +++ b/org.eclipse.ui.intro/shared/css/graphics/root/overview48.png diff --git a/org.eclipse.ui.intro/shared/css/graphics/root/samples48.png b/org.eclipse.ui.intro/shared/css/graphics/root/samples48.png Binary files differnew file mode 100644 index 000000000..5e9bcfc48 --- /dev/null +++ b/org.eclipse.ui.intro/shared/css/graphics/root/samples48.png diff --git a/org.eclipse.ui.intro/shared/css/graphics/root/tutorials48.png b/org.eclipse.ui.intro/shared/css/graphics/root/tutorials48.png Binary files differnew file mode 100644 index 000000000..fd97ecb3a --- /dev/null +++ b/org.eclipse.ui.intro/shared/css/graphics/root/tutorials48.png diff --git a/org.eclipse.ui.intro/shared/css/graphics/root/webresources48.png b/org.eclipse.ui.intro/shared/css/graphics/root/webresources48.png Binary files differnew file mode 100644 index 000000000..095009825 --- /dev/null +++ b/org.eclipse.ui.intro/shared/css/graphics/root/webresources48.png diff --git a/org.eclipse.ui.intro/shared/css/graphics/root/whatsnew48.png b/org.eclipse.ui.intro/shared/css/graphics/root/whatsnew48.png Binary files differnew file mode 100644 index 000000000..37e19e056 --- /dev/null +++ b/org.eclipse.ui.intro/shared/css/graphics/root/whatsnew48.png diff --git a/org.eclipse.ui.intro/shared/css/graphics/root/workbench48.png b/org.eclipse.ui.intro/shared/css/graphics/root/workbench48.png Binary files differnew file mode 100644 index 000000000..d778dfa56 --- /dev/null +++ b/org.eclipse.ui.intro/shared/css/graphics/root/workbench48.png diff --git a/org.eclipse.ui.intro/shared/css/migrate/swt.properties b/org.eclipse.ui.intro/shared/css/migrate/swt.properties index 2f340e367..a45e8d993 100644 --- a/org.eclipse.ui.intro/shared/css/migrate/swt.properties +++ b/org.eclipse.ui.intro/shared/css/migrate/swt.properties @@ -1,16 +1,3 @@ - -news.page-content.news-links.layout.ncolumns = 2 -news.page-content.news-links.layout.vspacing = 30 - -news.page-content.news-links.new-and-noteworthy.link-icon = intro/css/graphics/icons/obj48/new_obj.gif -news.page-content.news-links.updates.link-icon = intro/css/graphics/icons/obj48/updates_obj.gif -news.page-content.news-links.eclipse.link-icon = intro/css/graphics/icons/obj48/community_obj.gif - -news.page-content.noteworthy-links.layout.ncolumns = 2 -news.page-content.noteworthy-links.layout.vspacing = 15 -news.page-content.news-links.layout.vspacing = 15 -news.page-content.layout.vspacing = 40 - -news.link-icon = intro/css/graphics/icons/obj48/new_obj.gif - -news.subtitle-id = news/page-content/page-title +migrate.page-content.layout.ncolumns = 2 +migrate.page-content.bottom.layout.colspan = 2 +migrate.subtitle-id = migrate/page-content/page-title diff --git a/org.eclipse.ui.intro/shared/css/overview/swt.properties b/org.eclipse.ui.intro/shared/css/overview/swt.properties index bdafab692..89a574dc8 100644 --- a/org.eclipse.ui.intro/shared/css/overview/swt.properties +++ b/org.eclipse.ui.intro/shared/css/overview/swt.properties @@ -1,10 +1,6 @@ -overview.layout.ncolumns = 2 -overview.page-content.overview-links.layout.vspacing = 35 - -overview.page-content.overview-links.basics.link-icon = intro/css/graphics/icons/obj48/wbbasics_obj.gif -overview.page-content.overview-links.team.link-icon = intro/css/graphics/icons/obj48/teamsup_obj.gif -overview.page-content.overview-links.layout.ncolumns = 2 +overview.page-content.layout.ncolumns = 2 +overview.page-content.bottom.layout.colspan = 2 overview.subtitle-id = overview/page-content/page-title overview.description-id = overview/page-content/page-description
\ No newline at end of file diff --git a/org.eclipse.ui.intro/shared/css/root_swt.properties b/org.eclipse.ui.intro/shared/css/root_swt.properties new file mode 100644 index 000000000..60c88957c --- /dev/null +++ b/org.eclipse.ui.intro/shared/css/root_swt.properties @@ -0,0 +1,36 @@ + +root.links-background.page-links.overview.link-icon = shared/css/graphics/root/overview.png +root.links-background.page-links.firststeps.link-icon = shared/css/graphics/root/firststeps.png +root.links-background.page-links.tutorials.link-icon = shared/css/graphics/root/tutorials.png +root.links-background.page-links.samples.link-icon= shared/css/graphics/root/samples.png +root.links-background.page-links.whatsnew.link-icon = shared/css/graphics/root/whatsnew.png +root.links-background.page-links.migrate.link-icon = shared/css/graphics/root/migrate.png +root.links-background.page-links.webresources.link-icon = shared/css/graphics/root/webresources.png +root.action-links.workbench.link-icon = shared/css/graphics/root/workbench.png + +#root.links-background.page-links.overview.hover-icon = intro/css/graphics/icons/ctool/overview72.gif +#root.links-background.page-links.tutorials.hover-icon = intro/css/graphics/icons/ctool/tutorials72.gif +#root.links-background.page-links.samples.hover-icon = intro/css/graphics/icons/ctool/samples72.gif +#root.links-background.page-links.news.hover-icon = intro/css/graphics/icons/ctool/whatsnew72.gif +#root.action-links.workbench.hover-icon = intro/css/graphics/icons/ctool/wb48.gif + + +root.links-background.page-links.overview.small-link-icon = shared/css/graphics/root/overview48.png +root.links-background.page-links.firststeps.small-link-icon = shared/css/graphics/root/firststeps48.png +root.links-background.page-links.tutorials.small-link-icon = shared/css/graphics/root/tutorials48.png +root.links-background.page-links.samples.small-link-icon = shared/css/graphics/root/samples48.png +root.links-background.page-links.whatsnew.small-link-icon = shared/css/graphics/root/whatsnew48.png +root.links-background.page-links.migrate.small-link-icon = shared/css/graphics/root/migrate48.png +root.links-background.page-links.webresources.small-link-icon = shared/css/graphics/root/webresources48.png + +root.action-links.workbench.small-link-icon = shared/css/graphics/root/workbench48.png + +#root.links-background.page-links.overview.small-hover-icon = intro/css/graphics/icons/ctool/overview48.gif +#root.links-background.page-links.tutorials.small-hover-icon = intro/css/graphics/icons/ctool/tutorials48.gif +#root.links-background.page-links.samples.small-hover-icon = intro/css/graphics/icons/ctool/samples48.gif +#root.links-background.page-links.news.small-hover-icon = intro/css/graphics/icons/ctool/whatsnew48.gif +#root.action-links.workbench.small-hover-icon = intro/css/graphics/icons/ctool/wb48.gif + +root.layout.ncolumns = 1 +root.links-background.page-links.layout.hspacing = 40 +root.layout.vspacing = 35 diff --git a/org.eclipse.ui.intro/shared/css/samples/swt.properties b/org.eclipse.ui.intro/shared/css/samples/swt.properties index 3a83167e4..fbbe9c49b 100644 --- a/org.eclipse.ui.intro/shared/css/samples/swt.properties +++ b/org.eclipse.ui.intro/shared/css/samples/swt.properties @@ -1,5 +1,7 @@ samples.page-content.layout.vspacing = 40 +samples.page-content.layout.ncolumns = 2 +samples.page-content.bottom.layout.colspan = 2 description-style-id = group-description samples.subtitle-id = samples/page-content/page-title diff --git a/org.eclipse.ui.intro/shared/css/standby_swt.properties b/org.eclipse.ui.intro/shared/css/standby_swt.properties index cc46eefbc..2970e01d4 100644 --- a/org.eclipse.ui.intro/shared/css/standby_swt.properties +++ b/org.eclipse.ui.intro/shared/css/standby_swt.properties @@ -1,13 +1,17 @@ -standby.links-background.page-links.overview.link-icon = intro/css/graphics/icons/etool/overview72.gif -standby.links-background.page-links.tutorials.link-icon = intro/css/graphics/icons/etool/tutorials72.gif -standby.links-background.page-links.samples.link-icon= intro/css/graphics/icons/etool/samples72.gif -standby.links-background.page-links.news.link-icon = intro/css/graphics/icons/etool/whatsnew72.gif +standby.links-background.page-links.overview.link-icon = shared/css/graphics/root/overview48.png +standby.links-background.page-links.firststeps.link-icon = shared/css/graphics/root/firststeps48.png +standby.links-background.page-links.tutorials.link-icon = shared/css/graphics/root/tutorials48.png +standby.links-background.page-links.samples.link-icon = shared/css/graphics/root/samples48.png +standby.links-background.page-links.whatsnew.link-icon = shared/css/graphics/root/whatsnew48.png +standby.links-background.page-links.migrate.link-icon = shared/css/graphics/root/migrate48.png +standby.links-background.page-links.webresources.link-icon = shared/css/graphics/root/webresources48.png +standby.action-links.workbench.link-icon = shared/css/graphics/root/workbench48.png -standby.links-background.page-links.overview.hover-icon = intro/css/graphics/icons/ctool/overview72.gif -standby.links-background.page-links.tutorials.hover-icon = intro/css/graphics/icons/ctool/tutorials72.gif -standby.links-background.page-links.samples.hover-icon = intro/css/graphics/icons/ctool/samples72.gif -standby.links-background.page-links.news.hover-icon = intro/css/graphics/icons/ctool/whatsnew72.gif +#standby.links-background.page-links.overview.hover-icon = intro/css/graphics/icons/ctool/overview72.gif +#standby.links-background.page-links.tutorials.hover-icon = intro/css/graphics/icons/ctool/tutorials72.gif +#standby.links-background.page-links.samples.hover-icon = intro/css/graphics/icons/ctool/samples72.gif +#standby.links-background.page-links.news.hover-icon = intro/css/graphics/icons/ctool/whatsnew72.gif standby.links-background.page-links.layout.vspacing = 30 diff --git a/org.eclipse.ui.intro/shared/css/tutorials/swt.properties b/org.eclipse.ui.intro/shared/css/tutorials/swt.properties index c0ad4723f..de1d07215 100644 --- a/org.eclipse.ui.intro/shared/css/tutorials/swt.properties +++ b/org.eclipse.ui.intro/shared/css/tutorials/swt.properties @@ -1,5 +1,7 @@ tutorials.page-content.layout.vspacing = 40 +tutorials.page-content.layout.ncolumns = 2 +tutorials.page-content.bottom.layout.colspan = 2 tutorials.subtitle-id = tutorials/page-content/page-title tutorials.description-id = tutorials/page-content/page-description
\ No newline at end of file diff --git a/org.eclipse.ui.intro/shared/css/webresources/swt.properties b/org.eclipse.ui.intro/shared/css/webresources/swt.properties index 2f340e367..2d8589fec 100644 --- a/org.eclipse.ui.intro/shared/css/webresources/swt.properties +++ b/org.eclipse.ui.intro/shared/css/webresources/swt.properties @@ -1,16 +1,6 @@ -news.page-content.news-links.layout.ncolumns = 2 -news.page-content.news-links.layout.vspacing = 30 +webresources.page-content.layout.vspacing = 40 +webresources.page-content.layout.ncolumns = 2 +webresources.page-content.bottom.layout.colspan = 2 -news.page-content.news-links.new-and-noteworthy.link-icon = intro/css/graphics/icons/obj48/new_obj.gif -news.page-content.news-links.updates.link-icon = intro/css/graphics/icons/obj48/updates_obj.gif -news.page-content.news-links.eclipse.link-icon = intro/css/graphics/icons/obj48/community_obj.gif - -news.page-content.noteworthy-links.layout.ncolumns = 2 -news.page-content.noteworthy-links.layout.vspacing = 15 -news.page-content.news-links.layout.vspacing = 15 -news.page-content.layout.vspacing = 40 - -news.link-icon = intro/css/graphics/icons/obj48/new_obj.gif - -news.subtitle-id = news/page-content/page-title +webresources.subtitle-id = news/page-content/page-title diff --git a/org.eclipse.ui.intro/shared/css/whatsnew/swt.properties b/org.eclipse.ui.intro/shared/css/whatsnew/swt.properties index 2f340e367..fbbbea97b 100644 --- a/org.eclipse.ui.intro/shared/css/whatsnew/swt.properties +++ b/org.eclipse.ui.intro/shared/css/whatsnew/swt.properties @@ -1,16 +1,9 @@ -news.page-content.news-links.layout.ncolumns = 2 -news.page-content.news-links.layout.vspacing = 30 +whatsnew.page-content.layout.vspacing = 40 +whatsnew.page-content.layout.ncolumns = 2 +whatsnew.page-content.bottom.layout.colspan = 2 -news.page-content.news-links.new-and-noteworthy.link-icon = intro/css/graphics/icons/obj48/new_obj.gif -news.page-content.news-links.updates.link-icon = intro/css/graphics/icons/obj48/updates_obj.gif -news.page-content.news-links.eclipse.link-icon = intro/css/graphics/icons/obj48/community_obj.gif +whatsnew.link-icon = shared/css/graphics/new_obj.gif +whatsnew.hover-icon = shared/css/graphics/newhov_obj.gif -news.page-content.noteworthy-links.layout.ncolumns = 2 -news.page-content.noteworthy-links.layout.vspacing = 15 -news.page-content.news-links.layout.vspacing = 15 -news.page-content.layout.vspacing = 40 - -news.link-icon = intro/css/graphics/icons/obj48/new_obj.gif - -news.subtitle-id = news/page-content/page-title +whatsnew.subtitle-id = whatsnew/page-content/page-title diff --git a/org.eclipse.ui.intro/shared/introContent.xml b/org.eclipse.ui.intro/shared/introContent.xml index a71ba11b7..cb1209f58 100644 --- a/org.eclipse.ui.intro/shared/introContent.xml +++ b/org.eclipse.ui.intro/shared/introContent.xml @@ -188,170 +188,4 @@ <group id="bottom" computed="true"/> </group> </page> - <!-- - <page alt-style="css/root_swt.properties" style="css/root.css" id="root" style-id="page"> - <title style-id="intro-header">Welcome to Eclipse 3.2</title> - <group id="links-background"> - <group id="page-links"> - <anchor id="beginAnchor"/> - <link label="Overview" url="http://org.eclipse.ui.intro/showPage?id=overview" id="overview" style-id="left"> - <img id="overview_img" style-id="content-img" src="css/graphics/icons/etool/overview72.gif" alt="Overview"> - </img> - <text>Find out what Eclipse is all about</text> - </link> - <link label="Tutorials" url="http://org.eclipse.ui.intro/showPage?id=tutorials" id="tutorials" style-id="left"> - <img id="tutorials_img" style-id="content-img" src="css/graphics/icons/etool/tutorials72.gif" alt="Tutorials"> - </img> - <text>Let us guide you through Eclipse end-to-end tutorials</text> - </link> - <link label="Samples" url="http://org.eclipse.ui.intro/showPage?id=samples" id="samples" style-id="right"> - <img id="samples_img" style-id="content-img" src="css/graphics/icons/etool/samples72.gif" alt="Samples"> - </img> - <text>Explore Eclipse development through code samples</text> - </link> - <link label="What's New" url="http://org.eclipse.ui.intro/showPage?id=whatsnew" id="whatsnew" style-id="right"> - <img id="whatsnew_img" style-id="content-img" src="css/graphics/icons/etool/whatsnew72.gif" alt="What's New"> - </img> - <text>Find out what is new in this release</text> - </link> - <anchor id="endAnchor"/> - </group> - </group> - <group id="action-links"> - <link url="http://org.eclipse.ui.intro/switchToLaunchBar" label="Workbench" id="workbench"> - <img id="workbench_img" style-id="content-img" src="css/graphics/icons/etool/wb48.gif" alt="Go to the workbench"> - </img> - <text>Go to the workbench</text> - </link> - </group> - </page> - <page alt-style="css/standby_swt.properties" style="css/standby_root.css" id="standby" style-id="page"> - <title style-id="intro-header">Welcome to Eclipse 3.2</title> - <group id="links-background"> - <group id="page-links"> - <anchor id="beginAnchor"/> - <link label="Overview" url="http://org.eclipse.ui.intro/showPage?id=overview&standby=false" id="overview" style-id="left"> - <text>Find out what Eclipse is all about</text> - </link> - <link label="Tutorials" url="http://org.eclipse.ui.intro/showPage?id=tutorials&standby=false" id="tutorials" style-id="left"> - <text>Let us guide you through Eclipse end-to-end tutorials</text> - </link> - <link label="Samples" url="http://org.eclipse.ui.intro/showPage?id=samples&standby=false" id="samples" style-id="right"> - <text>Explore Eclipse development through code samples</text> - </link> - <link label="What's New" url="http://org.eclipse.ui.intro/showPage?id=whatsnew&standby=false" id="whatsnew" style-id="right"> - <text>Find out what is new in this release</text> - </link> - <anchor id="endAnchor"/> - </group> - </group> - </page> - - <page style="css/overview/overview.css" alt-style="css/overview/swt.properties" id="overview" style-id="page"> - <title style-id="intro-header">Welcome to Eclipse 3.2</title> - <group id="curve-image" filteredFrom="swt"/> - <group id="navigation-links" filteredFrom="swt"> - <group id="page-links"> - <anchor id="navigationBegin"/> - <link label="Overview" url="http://org.eclipse.ui.intro/showPage?id=overview" id="overview" style-id="left"> - <text>Find out what Eclipse is all about</text> - </link> - <link label="Tutorials" url="http://org.eclipse.ui.intro/showPage?id=tutorials" id="tutorials" style-id="left"> - <text>Let us guide you through Eclipse end-to-end tutorials</text> - </link> - <link label="Samples" url="http://org.eclipse.ui.intro/showPage?id=samples" id="samples" style-id="right"> - <text>Explore Eclipse development through code samples</text> - </link> - <link label="What's New" url="http://org.eclipse.ui.intro/showPage?id=whatsnew" id="whatsnew" style-id="right"> - <text>Find out what is new in this release</text> - </link> - <anchor id="navigationEnd"/> - </group> - <group id="action-links"> - <link url="http://org.eclipse.ui.intro/switchToLaunchBar" label="Workbench" id="workbench"> - <text>Go to the workbench</text> - </link> - </group> - </group> - <group id="page-content"> - <group id="content-header" label="OVERVIEW" filteredFrom="swt"> - </group> - <text style-id="page-title" id="page-title" filteredFrom="html">OVERVIEW</text> - <text style-id="page-description" id="page-description">Eclipse is a kind of universal tool platform - an open extensible IDE for anything and nothing in particular. It provides a feature-rich development environment that allows the developer to efficiently create tools that integrate seamlessly into the Eclipse Platform.</text> - <group id="overview-links"> - <anchor id="beginAnchor"/> - <link label="Workbench basics" url="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.platform.doc.user/gettingStarted/intro/overview.htm&embedTarget=page-content" id="basics"> - <text>Learn about basic Eclipse workbench concepts</text> - </link> - <link label="Team support" url="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.platform.doc.user/concepts/concepts-26.htm&embedTarget=page-content" id="team"> - <text>Find out how to collaborate with other developers</text> - </link> - <anchor id="jdtAnchor"/> - <anchor id="pdeAnchor"/> - <anchor id="endAnchor"/> - </group> - </group> - </page> - <page style="css/tutorials/tutorials.css" alt-style="css/tutorials/swt.properties" id="tutorials" style-id="page"> - <title style-id="intro-header">Welcome to Eclipse 3.2</title> - <group id="curve-image" filteredFrom="swt"/> - <include path="overview/navigation-links"/> - <group id="page-content"> - <group id="content-header" label="TUTORIALS" filteredFrom="swt"> - </group> - <text style-id="page-title" id="page-title" filteredFrom="html">TUTORIALS</text> - <text style-id="page-description" id="page-description">Learn how to be productive using Eclipse by completing end-to-end tutorials that will guide you along the way.</text> - <anchor id="beginAnchor"/> - <anchor id="jdtAnchor"/> - <anchor id="pdeAnchor"/> - <anchor id="endAnchor"/> - </group> - </page> - <page style="css/samples/samples.css" alt-style="css/samples/swt.properties" id="samples" style-id="page"> - <title style-id="intro-header">Welcome to Eclipse 3.2</title> - <group id="curve-image" filteredFrom="swt"/> - <include path="overview/navigation-links"/> - <group id="page-content"> - <group id="content-header" label="SAMPLES" filteredFrom="swt"> - </group> - <text style-id="page-title" id="page-title" filteredFrom="html">SAMPLES</text> - <text style-id="page-description" id="page-description">Explore Eclipse by installing prefabricated samples (may require Internet connection).</text> - <anchor id="beginAnchor"/> - <anchor id="jdtAnchor"/> - <anchor id="pdeAnchor"/> - <anchor id="endAnchor"/> - </group> - </page> - - <page style="css/whatsnew/whatsnew.css" alt-style="css/whatsnew/swt.properties" id="whatsnew" style-id="page"> - <title style-id="intro-header">Welcome to Eclipse 3.2</title> - <group id="curve-image" filteredFrom="swt"/> - <include path="overview/navigation-links"/> - <group id="page-content"> - <group id="content-header" label="WHAT'S NEW" filteredFrom="swt"> - </group> - <text style-id="page-title" id="page-title" filteredFrom="html">WHAT'S NEW</text> - <anchor id="beginAnchor"/> - <group id="noteworthy-links" label="New and Noteworthy"> - <link label="Eclipse Platform" url="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.platform.doc.user/whatsNew/platform_whatsnew.html" id="platform-noteworthy" style-id="noteworthy-link"> - <text>Find out about the major new features in this release</text> - </link> - <anchor id="jdtAnchor"/> - <anchor id="pdeAnchor"/> - <anchor id="generalAnchor"/> - </group> - <group id="whatsnew-links" label="General"> - <anchor id="linksBeginAnchor"/> - <link label="New Updates" url="http://org.eclipse.ui.intro/runAction?pluginId=org.eclipse.platform&class=org.eclipse.platform.internal.LaunchUpdateIntroAction" id="updates"> - <text>Get the latest updates from Eclipse.org</text> - </link> - <link label="Eclipse community" url="http://www.eclipse.org" id="eclipse"> - <text>Join the community, read articles and news on Eclipse.org</text> - </link> - <anchor id="linksAnchor"/> - </group> - <anchor id="endAnchor"/> - </group> - </page> ---> </introContent> diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageWidgetFactory.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageWidgetFactory.java index a8ab3d577..1714a163a 100644 --- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageWidgetFactory.java +++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageWidgetFactory.java @@ -239,8 +239,13 @@ public class PageWidgetFactory { layout.numColumns = 2; container.setLayout(layout); - Label ilabel = toolkit.createLabel(container, null); + //Label ilabel = toolkit.createLabel(container, null); + ImageHyperlink ilabel = toolkit.createImageHyperlink(container, SWT.NULL); ilabel.setImage(linkImage); + ilabel.setHoverImage(styleManager.getImage(link, "hover-icon", //$NON-NLS-1$ + null)); + ilabel.setHref(link.getUrl()); + ilabel.addHyperlinkListener(hyperlinkAdapter); TableWrapData td = new TableWrapData(); td.valign = TableWrapData.TOP; td.rowspan = 2; diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/shared/SharedIntroConfigurer.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/shared/SharedIntroConfigurer.java index 85126f5c2..dd63eb29f 100644 --- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/shared/SharedIntroConfigurer.java +++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/shared/SharedIntroConfigurer.java @@ -146,7 +146,7 @@ public class SharedIntroConfigurer extends IntroConfigurer implements ISharedInt StringTokenizer stok = new StringTokenizer(ids, ","); //$NON-NLS-1$ while (stok.hasMoreTokens()) { String id = stok.nextToken().trim(); - IntroElement page = createRootPageLink(id); + IntroElement page = createRootPageLink(id, standby); if (page != null) links.add(page); } @@ -184,48 +184,49 @@ public class SharedIntroConfigurer extends IntroConfigurer implements ISharedInt return new IntroElement[] { clink }; } - private IntroElement createRootPageLink(String id) { + private IntroElement createRootPageLink(String id, boolean standby) { + if (id.equals(ID_OVERVIEW)) return createRootLink( Messages.SharedIntroConfigurer_overview_name, - "http://org.eclipse.ui.intro/showPage?id=overview", id, //$NON-NLS-1$ + createPageURL(id, standby), id, "overview_img", "css/graphics/root/overview.png", Messages.SharedIntroConfigurer_overview_alt, //$NON-NLS-1$ //$NON-NLS-2$ Messages.SharedIntroConfigurer_overview_tooltip); if (id.equals(ID_FIRSTSTEPS)) return createRootLink( Messages.SharedIntroConfigurer_firststeps_name, - "http://org.eclipse.ui.intro/showPage?id=firststeps", //$NON-NLS-1$ + createPageURL(id, standby), id, "firststeps_img", "css/graphics/root/firststeps.png", Messages.SharedIntroConfigurer_firststeps_alt, //$NON-NLS-1$ //$NON-NLS-2$ Messages.SharedIntroConfigurer_firststeps_tooltip); if (id.equals(ID_TUTORIALS)) return createRootLink( Messages.SharedIntroConfigurer_tutorials_name, - "http://org.eclipse.ui.intro/showPage?id=tutorials", //$NON-NLS-1$ + createPageURL(id, standby), id, "tutorials_img", "css/graphics/root/tutorials.png", Messages.SharedIntroConfigurer_tutorials_alt, //$NON-NLS-1$ //$NON-NLS-2$ Messages.SharedIntroConfigurer_tutorials_tooltip); if (id.equals(ID_SAMPLES)) return createRootLink( Messages.SharedIntroConfigurer_samples_name, - "http://org.eclipse.ui.intro/showPage?id=samples", id, //$NON-NLS-1$ + createPageURL(id, standby), id, "samples_img", "css/graphics/root/samples.png", Messages.SharedIntroConfigurer_samples_alt, Messages.SharedIntroConfigurer_samples_tooltip); //$NON-NLS-1$ //$NON-NLS-2$ if (id.equals(ID_WHATSNEW)) return createRootLink( Messages.SharedIntroConfigurer_whatsnew_name, - "http://org.eclipse.ui.intro/showPage?id=whatsnew", //$NON-NLS-1$ + createPageURL(id, standby), id, "whatsnew_img", "css/graphics/root/whatsnew.png", Messages.SharedIntroConfigurer_whatsnew_alt, //$NON-NLS-1$ //$NON-NLS-2$ Messages.SharedIntroConfigurer_whatsnew_tooltip); if (id.equals(ID_MIGRATE)) return createRootLink( Messages.SharedIntroConfigurer_migrate_name, - "http://org.eclipse.ui.intro/showPage?id=migrate", id, //$NON-NLS-1$ + createPageURL(id, standby), id, "migrate_img", "css/graphics/root/migrate.png", Messages.SharedIntroConfigurer_migrate_alt, Messages.SharedIntroConfigurer_migrate_tooltip); //$NON-NLS-1$ //$NON-NLS-2$ if (id.equals(ID_WEBRESOURCES)) return createRootLink( Messages.SharedIntroConfigurer_webresources_name, - "http://org.eclipse.ui.intro/showPage?id=webresources", //$NON-NLS-1$ + createPageURL(id, standby), id, "webresources_img", "css/graphics/root/webresources.png", //$NON-NLS-1$ //$NON-NLS-2$ Messages.SharedIntroConfigurer_webresources_alt, Messages.SharedIntroConfigurer_webresources_tooltip); @@ -235,27 +236,34 @@ public class SharedIntroConfigurer extends IntroConfigurer implements ISharedInt private IntroElement createNavLink(String id, String pageId) { if (id.equals(ID_OVERVIEW)) return createNavLink(Messages.SharedIntroConfigurer_overview_nav, - "http://org.eclipse.ui.intro/showPage?id=" + id, id, "left"); //$NON-NLS-1$//$NON-NLS-2$ + createPageURL(id, false), id, "left"); //$NON-NLS-1$ if (id.equals(ID_FIRSTSTEPS)) return createNavLink(Messages.SharedIntroConfigurer_firststeps_nav, - "http://org.eclipse.ui.intro/showPage?id=" + id, id, "left"); //$NON-NLS-1$//$NON-NLS-2$ + createPageURL(id, false), id, "left"); //$NON-NLS-1$ if (id.equals(ID_TUTORIALS)) return createNavLink(Messages.SharedIntroConfigurer_tutorials_nav, - "http://org.eclipse.ui.intro/showPage?id=" + id, id, "left"); //$NON-NLS-1$//$NON-NLS-2$ + createPageURL(id, false), id, "left"); //$NON-NLS-1$ if (id.equals(ID_SAMPLES)) return createNavLink(Messages.SharedIntroConfigurer_samples_nav, - "http://org.eclipse.ui.intro/showPage?id=" + id, id, "left"); //$NON-NLS-1$//$NON-NLS-2$ + createPageURL(id, false), id, "left"); //$NON-NLS-1$ if (id.equals(ID_WHATSNEW)) return createNavLink(Messages.SharedIntroConfigurer_whatsnew_nav, - "http://org.eclipse.ui.intro/showPage?id=" + id, id, "left"); //$NON-NLS-1$//$NON-NLS-2$ + createPageURL(id, false), id, "left"); //$NON-NLS-1$ if (id.equals(ID_MIGRATE)) return createNavLink(Messages.SharedIntroConfigurer_migrate_nav, - "http://org.eclipse.ui.intro/showPage?id=" + id, id, "left"); //$NON-NLS-1$//$NON-NLS-2$ + createPageURL(id, false), id, "left"); //$NON-NLS-1$ if (id.equals(ID_WEBRESOURCES)) return createNavLink(Messages.SharedIntroConfigurer_webresources_nav, - "http://org.eclipse.ui.intro/showPage?id=" + id, id, "left"); //$NON-NLS-1$//$NON-NLS-2$ + createPageURL(id, false), id, "left"); //$NON-NLS-1$ return null; } + + private String createPageURL(String id, boolean standby) { + String url = "http://org.eclipse.ui.intro/showPage?id=" + id; //$NON-NLS-1$ + if (standby) + url+= "&standby=false"; //$NON-NLS-1$ + return url; + } private IntroElement createLaunchBarShortcut(String id) { if (id.equals(ID_OVERVIEW)) @@ -320,7 +328,7 @@ public class SharedIntroConfigurer extends IntroConfigurer implements ISharedInt IntroElement element = new IntroElement("shortcut"); //$NON-NLS-1$ element.setAttribute("icon", icon); //$NON-NLS-1$ element.setAttribute("tooltip", tooltip); //$NON-NLS-1$ - element.setAttribute("url", "http://org.eclipse.ui.intro/showPage?id=" + id); //$NON-NLS-1$ //$NON-NLS-2$ + element.setAttribute("url", createPageURL(id, false)); //$NON-NLS-1$ return element; } |