Skip to content

[UI][E] UI Migration from E3 to E4 #1135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
antej95 wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

[UI][E] UI Migration from E3 to E4 #1135

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
104e0cf
[UI][E] Menu Migration from Eclipse3 to Eclipse4
meyef95 Dec 14, 2020
e53b3ac
[UI][E] Static Popup Menu Migration
antej95 Mar 6, 2021
05a271c
[UI][E] View Migration
antej95 Mar 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions eclipse/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,14 @@ Export-Package: saros;
org.eclipse.jface.viewers,
saros.invitation,
saros.net",
saros.ui.command_handlers,
saros.ui.decorators;
uses:="org.eclipse.core.runtime,
saros.resource_change_handlers,
org.eclipse.jface.viewers,
saros.editor,
saros.invitation",
saros.ui.e4.command_handlers,
saros.ui.handlers.menu,
saros.ui.model,
saros.ui.preference_pages,
saros.ui.util,
Expand Down Expand Up @@ -142,4 +143,8 @@ Bundle-Vendor: Saros Project
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: javax.annotation;version="1.2.0",
javax.inject,
org.eclipse.core.filesystem
org.eclipse.core.filesystem,
org.eclipse.e4.core.commands,
org.eclipse.e4.core.services.events,
org.eclipse.e4.ui.workbench.modeling,
org.osgi.service.event;version="1.4.0"
9 changes: 4 additions & 5 deletions eclipse/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
source.. = src/,\
ext-src/

output.. = bin/

bin.includes = META-INF/,\
.,\
plugin.xml,\
Expand All @@ -16,4 +12,7 @@ bin.includes = META-INF/,\
CHANGELOG,\
plugin.properties,\
saros.properties,\
lib/
lib/,\
fragment.e4xmi
source.. = src/,\
ext-src/
68 changes: 55 additions & 13 deletions eclipse/fragment.e4xmi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:application="http://www.eclipse.org/ui/2010/UIModel/application" xmlns:commands="http://www.eclipse.org/ui/2010/UIModel/application/commands" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xmlns:ui="http://www.eclipse.org/ui/2010/UIModel/application/ui" xmi:id="_9R0kQDYLEeuIF8EFjFT7JQ">
<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:application="http://www.eclipse.org/ui/2010/UIModel/application" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/descriptor/basic" xmlns:commands="http://www.eclipse.org/ui/2010/UIModel/application/commands" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xmlns:ui="http://www.eclipse.org/ui/2010/UIModel/application/ui" xmi:id="_9R0kQDYLEeuIF8EFjFT7JQ">
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_AA2WUDYMEeuIF8EFjFT7JQ" featurename="commands" parentElementId="xpath:/">
<elements xsi:type="commands:Command" xmi:id="_FiO7QDYMEeuIF8EFjFT7JQ" elementId="saros.ui.commands.Empty" commandName="EMPTY COMMAND"/>
<elements xsi:type="commands:Command" xmi:id="_Ye-coDYNEeuIF8EFjFT7JQ" elementId="saros.ui.commands.GettingStarted" commandName="Getting Started..."/>
Expand All @@ -16,18 +16,18 @@
<elements xsi:type="commands:Command" xmi:id="_8TldkDYPEeuIF8EFjFT7JQ" elementId="saros.ui.commands.SessionAddSelectedContacts" commandName="Add to Saros Session"/>
</fragments>
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_B_wWMDYQEeuIF8EFjFT7JQ" featurename="handlers" parentElementId="xpath:/">
<elements xsi:type="commands:Handler" xmi:id="_Fft18DYQEeuIF8EFjFT7JQ" elementId="saros.eclipse.handler.0" contributionURI="bundleclass://saros.eclipse/saros.ui.command_handlers.GettingStartedHandler" command="_Ye-coDYNEeuIF8EFjFT7JQ"/>
<elements xsi:type="commands:Handler" xmi:id="_ymPZEDYQEeuIF8EFjFT7JQ" elementId="saros.eclipse.handler.1" contributionURI="bundleclass://saros.eclipse/saros.ui.command_handlers.StartSarosConfigurationHandler" command="_hvu2UDYNEeuIF8EFjFT7JQ"/>
<elements xsi:type="commands:Handler" xmi:id="_AIKtADYREeuIF8EFjFT7JQ" elementId="saros.eclipse.handler.2" contributionURI="bundleclass://saros.eclipse/saros.ui.command_handlers.CreateXMPPAccountHandler" command="_VbGKADYPEeuIF8EFjFT7JQ"/>
<elements xsi:type="commands:Handler" xmi:id="_J9snsDYREeuIF8EFjFT7JQ" elementId="saros.eclipse.handler.3" contributionURI="bundleclass://saros.eclipse/saros.ui.command_handlers.AddXMPPAccountHandler" command="_ji39ADYPEeuIF8EFjFT7JQ"/>
<elements xsi:type="commands:Handler" xmi:id="_YHVb4DYREeuIF8EFjFT7JQ" elementId="saros.eclipse.handler.4" contributionURI="bundleclass://saros.eclipse/saros.ui.command_handlers.AddContactHandler" command="_Y_2DIDYPEeuIF8EFjFT7JQ"/>
<elements xsi:type="commands:Handler" xmi:id="_k056sDYREeuIF8EFjFT7JQ" elementId="saros.eclipse.handler.5" contributionURI="bundleclass://saros.eclipse/saros.ui.command_handlers.OpenSarosPreferencesHandler" command="_h9fTkDYPEeuIF8EFjFT7JQ"/>
<elements xsi:type="commands:Handler" xmi:id="_qIwZ8DYREeuIF8EFjFT7JQ" elementId="saros.eclipse.handler.6" contributionURI="bundleclass://saros.eclipse/saros.ui.command_handlers.ShareResourcesHandler" command="_pZa5oDYPEeuIF8EFjFT7JQ"/>
<elements xsi:type="commands:Handler" xmi:id="_6dvEUDYREeuIF8EFjFT7JQ" elementId="saros.eclipse.handler.7" contributionURI="bundleclass://saros.eclipse/saros.ui.command_handlers.SessionLeaveHandler" command="_rsWlkDYPEeuIF8EFjFT7JQ"/>
<elements xsi:type="commands:Handler" xmi:id="_FYilADYSEeuIF8EFjFT7JQ" elementId="saros.eclipse.handler.8" contributionURI="bundleclass://saros.eclipse/saros.ui.command_handlers.SessionAddResourcesHandler" command="_wvkAwDYPEeuIF8EFjFT7JQ"/>
<elements xsi:type="commands:Handler" xmi:id="_NFBIgDYSEeuIF8EFjFT7JQ" elementId="saros.eclipse.handler.9" contributionURI="bundleclass://saros.eclipse/saros.ui.command_handlers.SessionAddContactsHandler" command="_0XH9UDYPEeuIF8EFjFT7JQ"/>
<elements xsi:type="commands:Handler" xmi:id="_TUQR8DYSEeuIF8EFjFT7JQ" elementId="saros.eclipse.handler.10" contributionURI="bundleclass://saros.eclipse/saros.ui.command_handlers.SessionAddSelectedResourcesHandler" command="_6kVtgDYPEeuIF8EFjFT7JQ"/>
<elements xsi:type="commands:Handler" xmi:id="_gPUaMDYSEeuIF8EFjFT7JQ" elementId="saros.eclipse.handler.11" contributionURI="bundleclass://saros.eclipse/saros.ui.command_handlers.SessionAddSelectedContactsHandler" command="_8TldkDYPEeuIF8EFjFT7JQ"/>
<elements xsi:type="commands:Handler" xmi:id="_Fft18DYQEeuIF8EFjFT7JQ" elementId="saros.eclipse.handler.0" contributionURI="bundleclass://saros.eclipse/saros.ui.handlers.menu.GettingStartedHandler" command="_Ye-coDYNEeuIF8EFjFT7JQ"/>
<elements xsi:type="commands:Handler" xmi:id="_ymPZEDYQEeuIF8EFjFT7JQ" elementId="saros.eclipse.handler.1" contributionURI="bundleclass://saros.eclipse/saros.ui.handlers.menu.StartSarosConfigurationHandler" command="_hvu2UDYNEeuIF8EFjFT7JQ"/>
<elements xsi:type="commands:Handler" xmi:id="_AIKtADYREeuIF8EFjFT7JQ" elementId="saros.eclipse.handler.2" contributionURI="bundleclass://saros.eclipse/saros.ui.handlers.menu.CreateXMPPAccountHandler" command="_VbGKADYPEeuIF8EFjFT7JQ"/>
<elements xsi:type="commands:Handler" xmi:id="_J9snsDYREeuIF8EFjFT7JQ" elementId="saros.eclipse.handler.3" contributionURI="bundleclass://saros.eclipse/saros.ui.handlers.menu.AddXMPPAccountHandler" command="_ji39ADYPEeuIF8EFjFT7JQ"/>
<elements xsi:type="commands:Handler" xmi:id="_YHVb4DYREeuIF8EFjFT7JQ" elementId="saros.eclipse.handler.4" contributionURI="bundleclass://saros.eclipse/saros.ui.handlers.menu.AddContactHandler" command="_Y_2DIDYPEeuIF8EFjFT7JQ"/>
<elements xsi:type="commands:Handler" xmi:id="_k056sDYREeuIF8EFjFT7JQ" elementId="saros.eclipse.handler.5" contributionURI="bundleclass://saros.eclipse/saros.ui.handlers.menu.OpenSarosPreferencesHandler" command="_h9fTkDYPEeuIF8EFjFT7JQ"/>
<elements xsi:type="commands:Handler" xmi:id="_qIwZ8DYREeuIF8EFjFT7JQ" elementId="saros.eclipse.handler.6" contributionURI="bundleclass://saros.eclipse/saros.ui.handlers.menu.ShareResourcesHandler" command="_pZa5oDYPEeuIF8EFjFT7JQ"/>
<elements xsi:type="commands:Handler" xmi:id="_6dvEUDYREeuIF8EFjFT7JQ" elementId="saros.eclipse.handler.7" contributionURI="bundleclass://saros.eclipse/saros.ui.handlers.menu.SessionLeaveHandler" command="_rsWlkDYPEeuIF8EFjFT7JQ"/>
<elements xsi:type="commands:Handler" xmi:id="_FYilADYSEeuIF8EFjFT7JQ" elementId="saros.eclipse.handler.8" contributionURI="bundleclass://saros.eclipse/saros.ui.handlers.menu.SessionAddResourcesHandler" command="_wvkAwDYPEeuIF8EFjFT7JQ"/>
<elements xsi:type="commands:Handler" xmi:id="_NFBIgDYSEeuIF8EFjFT7JQ" elementId="saros.eclipse.handler.9" contributionURI="bundleclass://saros.eclipse/saros.ui.handlers.menu.SessionAddContactsHandler" command="_0XH9UDYPEeuIF8EFjFT7JQ"/>
<elements xsi:type="commands:Handler" xmi:id="_TUQR8DYSEeuIF8EFjFT7JQ" elementId="saros.eclipse.handler.10" contributionURI="bundleclass://saros.eclipse/saros.ui.handlers.menu.SessionAddSelectedResourcesHandler" command="_6kVtgDYPEeuIF8EFjFT7JQ"/>
<elements xsi:type="commands:Handler" xmi:id="_gPUaMDYSEeuIF8EFjFT7JQ" elementId="saros.eclipse.handler.11" contributionURI="bundleclass://saros.eclipse/saros.ui.handlers.menu.SessionAddSelectedContactsHandler" command="_8TldkDYPEeuIF8EFjFT7JQ"/>
</fragments>
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_w8wA0DYSEeuIF8EFjFT7JQ" featurename="menuContributions" parentElementId="xpath:/">
<elements xsi:type="menu:MenuContribution" xmi:id="_D-FjwDYTEeuIF8EFjFT7JQ" elementId="saros.eclipse.menucontribution.0" positionInParent="after=additions" parentId="org.eclipse.ui.main.menu">
Expand Down Expand Up @@ -85,6 +85,48 @@
</elements>
</fragments>
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_Gf3wkFNKEeu08YCit0yDew" featurename="addons" parentElementId="xpath:/">
<elements xsi:type="application:Addon" xmi:id="_wM054FlrEeuEKZi6t0yNyA" elementId="saros.eclipse.addon.StartupSaros" contributionURI="bundleclass://saros.eclipse/saros.StartupSaros"/>
<elements xsi:type="application:Addon" xmi:id="_HnzB8FNKEeu08YCit0yDew" elementId="saros.eclipse.addon.lifecycle" contributionURI="bundleclass://saros.eclipse/saros.Saros"/>
</fragments>
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_xkz-4H5qEeuGAvmTv33xSw" featurename="descriptors" parentElementId="xpath:/">
<elements xsi:type="basic:PartDescriptor" xmi:id="_zr5AIH5qEeuGAvmTv33xSw" elementId="saros.ui.views.SarosView" label="Saros" iconURI="platform:/plugin/saros.eclipse/icons/view16/saros_misc.png" category="Saros" closeable="true" contributionURI="bundleclass://saros.eclipse/saros.ui.views.SarosView">
<tags>View</tags>
<menus xsi:type="menu:PopupMenu" xmi:id="_Cf1KkFpFEeuz3aO_wpndrQ" elementId="saros.ui.popup.menu" label="SarosViewPopUpMenu">
<children xsi:type="menu:HandledMenuItem" xmi:id="_MXCgQFpFEeuz3aO_wpndrQ" elementId="saros.eclipse.handledmenuitem.9" iconURI="platform:/plugin/saros.eclipse/icons/elcl16/session_tsk.png" command="_pZa5oDYPEeuIF8EFjFT7JQ">
<visibleWhen xsi:type="ui:CoreExpression" xmi:id="_BAjykG4BEeuU94HWMR4Cpw" coreExpressionId="saros.ui.definitions.isConnectedNotIsSarosSessionRunningSessionHeadlineSelected"/>
</children>
<children xsi:type="menu:HandledMenuItem" xmi:id="_YWLGwG4EEeuU94HWMR4Cpw" elementId="saros.eclipse.handledmenuitem.10" iconURI="platform:/plugin/saros.eclipse/icons/elcl16/session_add_reference_points_tsk.png" command="_wvkAwDYPEeuIF8EFjFT7JQ">
<visibleWhen xsi:type="ui:CoreExpression" xmi:id="_be81kG4EEeuU94HWMR4Cpw" coreExpressionId="saros.ui.definitions.isConnectedIsSarosSessionRunningSessionHeadlineSelected"/>
</children>
<children xsi:type="menu:HandledMenuItem" xmi:id="_Yrh2QG4FEeuU94HWMR4Cpw" elementId="saros.eclipse.handledmenuitem.11" iconURI="platform:/plugin/saros.eclipse/icons/elcl16/contact_add_tsk.png" command="_Y_2DIDYPEeuIF8EFjFT7JQ">
<visibleWhen xsi:type="ui:CoreExpression" xmi:id="_Z6s_IG4FEeuU94HWMR4Cpw" coreExpressionId="saros.ui.definitions.notContactsSelectedNotParticipantsSelectedNotSessionHeadlineSelected"/>
</children>
<children xsi:type="menu:HandledMenuItem" xmi:id="_M3lcMG4HEeuU94HWMR4Cpw" elementId="saros.eclipse.handledmenuitem.12" iconURI="platform:/plugin/saros.eclipse/icons/elcl16/session_add_contacts_tsk.png" command="_0XH9UDYPEeuIF8EFjFT7JQ">
<visibleWhen xsi:type="ui:CoreExpression" xmi:id="_RXeu8G4HEeuU94HWMR4Cpw" coreExpressionId="saros.ui.definitions.isConnectedIsSarosSessionRunningSessionHeadlineSelectedIsSarosSessionHost"/>
</children>
<children xsi:type="menu:MenuSeparator" xmi:id="_6rY9IG-pEeuyL4e0Us5MYQ" elementId="menustart" visible="false" accessibilityPhrase=""/>
<children xsi:type="menu:DynamicMenuContribution" xmi:id="_ROHFgG-REeuc6LVEtDwz7A" elementId="saros.eclipse.dynamicmenucontribution.0" contributionURI="bundleclass://saros.eclipse/saros.ui.views.PopupMenu"/>
<children xsi:type="menu:MenuSeparator" xmi:id="_tLuWMG-tEeuyL4e0Us5MYQ" elementId="additions" visible="false"/>
</menus>
<toolbar xmi:id="_WgxKUFo6Eeuz3aO_wpndrQ" elementId="saros.eclipse.toolbar.e4.SarosView">
<children xsi:type="menu:DirectToolItem" xmi:id="_bpvrwFyqEeutX8G7YSyCRA" elementId="saros.ui.handlers.toolbar.ChangeXMPPAccountHandler" iconURI="platform:/plugin/saros.eclipse/icons/elcl16/xmpp_connect_tsk.png" tooltip="Connect" contributionURI="bundleclass://saros.eclipse/saros.ui.handlers.toolbar.ChangeXMPPAccountHandler">
<menu xmi:id="_SuTcoGL-EeuqzJnMI0FALg" elementId="saros.eclipse.sarosView.toolbar.connectToolItem.menu">
<children xsi:type="menu:DynamicMenuContribution" xmi:id="_Oy5aMGMCEeuqzJnMI0FALg" elementId="saros.eclipse.sarosView.toolbar.connectToolItem.menu.AddAccountToMenu" label="" contributionURI="bundleclass://saros.eclipse/saros.ui.handlers.toolbar.XMPPAccountMenu"/>
<children xsi:type="menu:MenuSeparator" xmi:id="_AFfKEHB1EeucHoOln_1qcQ" elementId="saros.eclipse.menuseparator.0"/>
<children xsi:type="menu:HandledMenuItem" xmi:id="_hOAncGL-EeuqzJnMI0FALg" elementId="saros.eclipse.sarosView.toolbar.connectToolItem.menu.addXMPPAccount" label="" command="_ji39ADYPEeuIF8EFjFT7JQ"/>
<children xsi:type="menu:HandledMenuItem" xmi:id="_r56wgGL-EeuqzJnMI0FALg" elementId="saros.eclipse.sarosView.toolbar.connectToolItem.menu.OpenSarosPreferences" label="Configure Accounts..." command="_h9fTkDYPEeuIF8EFjFT7JQ"/>
</menu>
</children>
<children xsi:type="menu:DirectToolItem" xmi:id="_SWzAEFpBEeuz3aO_wpndrQ" elementId="saros.ui.handlers.toolbar.NewContactHandler" label="" iconURI="platform:/plugin/saros.eclipse/icons/elcl16/contact_add_tsk.png" tooltip="Add a New Contact" contributionURI="bundleclass://saros.eclipse/saros.ui.handlers.toolbar.NewContactHandler"/>
<children xsi:type="menu:DirectToolItem" xmi:id="_NjsA8FpCEeuz3aO_wpndrQ" elementId="saros.ui.handlers.toolbar.OpenPreferencesHandler" label="" iconURI="platform:/plugin/saros.eclipse/icons/elcl16/preferences_open_tsk.png" tooltip="Open Saros Preferences" contributionURI="bundleclass://saros.eclipse/saros.ui.handlers.toolbar.OpenPreferencesHandler"/>
<children xsi:type="menu:ToolBarSeparator" xmi:id="_klH_YF17EeuWqNejT8lZfw" elementId="saros.eclipse.toolbarseparator.1"/>
<children xsi:type="menu:DirectToolItem" xmi:id="_lagIMF17EeuWqNejT8lZfw" elementId="saros.ui.handlers.toolbar.FollowModeHandler" iconURI="platform:/plugin/saros.eclipse/icons/merged16/user_saros_followmode_enabled.png" tooltip="Enter follow mode" contributionURI="bundleclass://saros.eclipse/saros.ui.handlers.toolbar.FollowModeHandler">
<menu xmi:id="_yfKRUF17EeuWqNejT8lZfw" elementId="saros.eclipse.menu.0"/>
</children>
<children xsi:type="menu:DirectToolItem" xmi:id="_h_YQsF1xEeuWqNejT8lZfw" elementId="saros.ui.handlers.toolbar.ConsistencyHandler" iconURI="platform:/plugin/saros.eclipse/icons/etool16/in_sync.png" tooltip="No inconsistencies" enabled="false" contributionURI="bundleclass://saros.eclipse/saros.ui.handlers.toolbar.ConsistencyHandler"/>
<children xsi:type="menu:ToolBarSeparator" xmi:id="_hFxp4FyaEeutX8G7YSyCRA" elementId="saros.eclipse.toolbarseparator.0"/>
<children xsi:type="menu:DirectToolItem" xmi:id="_5WSc4FyZEeutX8G7YSyCRA" elementId="saros.ui.handlers.toolbar.LeaveSessionHandler" label="" iconURI="platform:/plugin/saros.eclipse/icons/elcl16/session_leave_tsk.png" tooltip="Leave Session" contributionURI="bundleclass://saros.eclipse/saros.ui.handlers.toolbar.LeaveSessionHandler"/>
</toolbar>
</elements>
</fragments>
</fragment:ModelFragments>
Binary file added eclipse/icons/merged16/contact_saros_obj_followmode.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added eclipse/icons/merged16/contact_saros_obj_readonly.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added eclipse/icons/merged16/user_saros_followmode_disabled.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added eclipse/icons/merged16/user_saros_followmode_enabled.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading