diff options
author | Gabriel Pascual | 2014-04-29 16:24:08 +0000 |
---|---|---|
committer | Gabriel Pascual | 2014-04-30 12:54:50 +0000 |
commit | a174352dd68d69367bcb468722a0bd0938802e2a (patch) | |
tree | 14fc0e595c8b9bdb1528dda11783bd4e8f994509 /plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/Model | |
parent | e770c8764a6f9a9c60315a689d5fc583286616c1 (diff) | |
download | org.eclipse.papyrus-a174352dd68d69367bcb468722a0bd0938802e2a.tar.gz org.eclipse.papyrus-a174352dd68d69367bcb468722a0bd0938802e2a.tar.xz org.eclipse.papyrus-a174352dd68d69367bcb468722a0bd0938802e2a.zip |
430079: [CSS] Papyrus shall provide features to define local theme
https://bugs.eclipse.org/bugs/show_bug.cgi?id=430079
Patch 3 :
- Fix major issue
- Fix comment's remarks
Patch 2 :
- Rebase to pass hudson verification
Pathch 1 :
- Use workspace relative path for selected css files during CSS theme
edition
- Fix "restore default" button action in CSS preference page
- Harmonisation of all UI for theme icon selection
- Add dialog to confirm theme deletion
- Refactor to resolve some dependency problems
- Creation of widget for XWT theme view
- Add embedded style sheets in CSS Workspace engine working
- Fix problems of label provider for CSS themes properties view
- Add workspace themes preference page
- Add definition of theme property view
- Fix saving step of an edited theme from workspace
- Fix loading of theme icon in label provider - Fix behavior of theme
edition dialog fields
- Add edition action on style sheets list
- Add move up and move down actions in edition dialog
- Add actions (add and delete) to dialog
- Resolution staying conflicts after last merge
- Add edition theme dialog from project explorer
- Minor modification of Style sheet metamodel
- Modify CSS engine and theme manager to look at workspace theme
contributions
- Add theme creation by selecting one or more CSS files
- Add dialog to define theme from CSS file in workspace
- Create one menu for two actions to manage local theme
- Manage command ID in handler
- Fix containment relationship in model
- Add draft of theme creation from a CSS selection
- Modification of style sheets model
- Add popup menu on CSS file
Change-Id: Ie46281e334252bfbed727c18a431677761db2a45
Signed-off-by: Gabriel Pascual <gabriel.pascual@all4tec.net>
Diffstat (limited to 'plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/Model')
2 files changed, 53 insertions, 41 deletions
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/Model/StyleSheets.ecore b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/Model/StyleSheets.ecore index 933548c12b1..fe1bb5006d3 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/Model/StyleSheets.ecore +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/Model/StyleSheets.ecore @@ -1,18 +1,30 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="stylesheets" nsURI="http://www.eclipse.org/papyrus/infra/gmfdiag/css"
- nsPrefix="css">
- <eClassifiers xsi:type="ecore:EClass" name="ModelStyleSheets" eSuperTypes="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EModelElement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="stylesheets" upperBound="-1"
- eType="#//StyleSheet" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="StyleSheet" abstract="true" interface="true"/>
- <eClassifiers xsi:type="ecore:EClass" name="StyleSheetReference" eSuperTypes="#//StyleSheet">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="path" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="EmbeddedStyleSheet" eSuperTypes="#//StyleSheet">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="label" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="content" lowerBound="1"
- eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
- </eClassifiers>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?> +<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="stylesheets" nsURI="http://www.eclipse.org/papyrus/infra/gmfdiag/css" + nsPrefix="css"> + <eClassifiers xsi:type="ecore:EClass" name="ModelStyleSheets" eSuperTypes="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EModelElement"> + <eStructuralFeatures xsi:type="ecore:EReference" name="stylesheets" upperBound="-1" + eType="#//StyleSheet" containment="true"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="StyleSheet" abstract="true" interface="true"/> + <eClassifiers xsi:type="ecore:EClass" name="StyleSheetReference" eSuperTypes="#//StyleSheet"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="path" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="EmbeddedStyleSheet" eSuperTypes="#//StyleSheet"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="label" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="content" lowerBound="1" + eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="WorkspaceThemes" eSuperTypes="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EModelElement"> + <eStructuralFeatures xsi:type="ecore:EReference" name="themes" upperBound="-1" + eType="#//Theme" containment="true"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="Theme"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" ordered="false" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString" + defaultValueLiteral="" iD="true"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="label" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="icon" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="stylesheets" upperBound="-1" + eType="#//StyleSheet" containment="true"/> + </eClassifiers> +</ecore:EPackage> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/Model/StyleSheets.genmodel b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/Model/StyleSheets.genmodel index 720a70cd78a..aac7ed7278c 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/Model/StyleSheets.genmodel +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/Model/StyleSheets.genmodel @@ -1,23 +1,23 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.papyrus.infra.gmfdiag.css.model/src-gen"
- editDirectory="/org.eclipse.papyrus.infra.gmfdiag.css.model.edit/src-gen" editorDirectory="/org.eclipse.papyrus.infra.gmfdiag.css.model.editor/src-gen"
- modelPluginID="org.eclipse.papyrus.infra.gmfdiag.css.model" modelName="StyleSheets"
- testsDirectory="/org.eclipse.papyrus.infra.gmfdiag.css.model.tests/src-gen" importerID="org.eclipse.emf.importer.ecore"
- complianceLevel="5.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
- <foreignModel>StyleSheets.ecore</foreignModel>
- <genPackages prefix="Stylesheets" basePackage="org.eclipse.papyrus.infra.gmfdiag.css"
- disposableProviderFactory="true" ecorePackage="StyleSheets.ecore#/">
- <genClasses ecoreClass="StyleSheets.ecore#//ModelStyleSheets">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference StyleSheets.ecore#//ModelStyleSheets/stylesheets"/>
- </genClasses>
- <genClasses image="false" ecoreClass="StyleSheets.ecore#//StyleSheet"/>
- <genClasses ecoreClass="StyleSheets.ecore#//StyleSheetReference">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute StyleSheets.ecore#//StyleSheetReference/path"/>
- </genClasses>
- <genClasses ecoreClass="StyleSheets.ecore#//EmbeddedStyleSheet">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute StyleSheets.ecore#//EmbeddedStyleSheet/label"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute StyleSheets.ecore#//EmbeddedStyleSheet/content"/>
- </genClasses>
- </genPackages>
-</genmodel:GenModel>
+<?xml version="1.0" encoding="UTF-8"?> +<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" + xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.papyrus.infra.gmfdiag.css.model/src-gen" + editDirectory="/org.eclipse.papyrus.infra.gmfdiag.css.model.edit/src-gen" editorDirectory="/org.eclipse.papyrus.infra.gmfdiag.css.model.editor/src-gen" + modelPluginID="org.eclipse.papyrus.infra.gmfdiag.css.model" modelName="StyleSheets" + testsDirectory="/org.eclipse.papyrus.infra.gmfdiag.css.model.tests/src-gen" importerID="org.eclipse.emf.importer.ecore" + complianceLevel="5.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + <foreignModel>StyleSheets.ecore</foreignModel> + <genPackages prefix="Stylesheets" basePackage="org.eclipse.papyrus.infra.gmfdiag.css" + disposableProviderFactory="true" ecorePackage="StyleSheets.ecore#/"> + <genClasses ecoreClass="StyleSheets.ecore#//ModelStyleSheets"> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference StyleSheets.ecore#//ModelStyleSheets/stylesheets"/> + </genClasses> + <genClasses image="false" ecoreClass="StyleSheets.ecore#//StyleSheet"/> + <genClasses ecoreClass="StyleSheets.ecore#//StyleSheetReference"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute StyleSheets.ecore#//StyleSheetReference/path"/> + </genClasses> + <genClasses ecoreClass="StyleSheets.ecore#//EmbeddedStyleSheet"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute StyleSheets.ecore#//EmbeddedStyleSheet/label"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute StyleSheets.ecore#//EmbeddedStyleSheet/content"/> + </genClasses> + </genPackages> +</genmodel:GenModel> |