Skip to content
Snippets Groups Projects
Commit 6bc108e6 authored by Alexander Diewald's avatar Alexander Diewald
Browse files

Revert "[UI] Replace CSS-based JMetro skin with the respective JAR"

Issue-Ref: 3437
This reverts commit 5cebfd73.
parent 077799ad
No related branches found
No related tags found
1 merge request!823437
......@@ -12,10 +12,5 @@
<classpathentry exported="true" kind="lib" path="lib/org.conqat.ide.commons.ui.jar"/>
<classpathentry kind="lib" path="lib/swt-grouplayout.jar"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry exported="true" kind="lib" path="lib/jmetro-11.5.11.jar">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="build"/>
</classpath>
......@@ -24,11 +24,8 @@ Require-Bundle: org.fortiss.tooling.common;visibility:=reexport,
Bundle-ClassPath: .,
lib/org.conqat.ide.commons.gef.jar,
lib/org.conqat.ide.commons.ui.jar,
lib/swt-grouplayout.jar,
lib/jmetro-11.5.11.jar
Export-Package: aerofx,
aquafx,
org.conqat.ide.commons.gef,
lib/swt-grouplayout.jar
Export-Package: org.conqat.ide.commons.gef,
org.conqat.ide.commons.gef.directediting,
org.conqat.ide.commons.gef.draw2d,
org.conqat.ide.commons.gef.editor,
......
......@@ -5,8 +5,7 @@ bin.includes = .,\
lib/org.conqat.ide.commons.gef.jar,\
lib/org.conqat.ide.commons.ui.jar,\
lib/swt-grouplayout.jar,\
res/,\
lib/jmetro-11.5.11.jar
res/
jars.compile.order = .
source.. = src/,\
res/,\
......
File deleted
This diff is collapsed.
Copyright (c) 2011-2018, JFXtras
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of the JFXtras project nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
AF3FXViewPart.java 208b300ed4269d3764421a9b515df7356c38208a YELLOW
AF3FXViewPart.java 03924bbf64aaaee3faee7bc913c6694d7038d01b YELLOW
......@@ -182,7 +182,7 @@ public abstract class AF3FXViewPart extends FXViewPart implements Initializable
*/
private void setNativeLook(Pane pane) {
if(SystemUtils.IS_OS_WINDOWS_10 || SystemUtils.IS_OS_WINDOWS_8) {
// new JMetro(pane, Style.LIGHT);
applyStyleSheet(pane, AF3FXViewPart.class, "/jfxtras/JMetroLightTheme.css");
} else if(SystemUtils.IS_OS_WINDOWS) {
applyStyleSheet(pane, AF3FXViewPart.class, "/aerofx/win7.css");
} else if(SystemUtils.IS_OS_MAC_OSX) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment