Skip to content

Commit ad94da6

Browse files
committed
Merge pull request #159 from wimjongman/master
Theming support
2 parents d7d6404 + 7ae8e55 commit ad94da6

File tree

8 files changed

+36
-54
lines changed

8 files changed

+36
-54
lines changed

it.baeyens.arduino.core/plugin.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
class="it.baeyens.arduino.ui.NewArduinoSketchWizard"
105105
name="%wizard.name"
106106
icon="icons/arduino.png"
107-
finalPerspective ="org.eclipse.cdt.ui.CPerspective"
107+
finalPerspective ="it.baeyens.arduino.application.perspective"
108108
project="true">
109109
<description>
110110
%wizard.description

it.baeyens.arduino.parent/pom.xml

+4-43
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<packaging>pom</packaging>
88

99
<properties>
10-
<tycho.version>0.18.1</tycho.version>
10+
<tycho.version>0.20.0</tycho.version>
1111
<built.repo.dir>${project.build.directory}/repo</built.repo.dir>
1212
</properties>
1313

@@ -330,53 +330,14 @@
330330
</profile>
331331

332332
<profile>
333-
<id>juno</id>
333+
<id>luna</id>
334334
<properties>
335-
<platform-version-name>juno</platform-version-name>
335+
<platform-version-name>luna</platform-version-name>
336336
</properties>
337-
<activation>
337+
<activation>
338338
<activeByDefault>true</activeByDefault>
339339
</activation>
340-
<repositories>
341-
<repository>
342-
<id>platform_juno</id>
343-
<layout>p2</layout>
344-
<url> http://download.eclipse.org/eclipse/updates/4.2</url>
345-
</repository>
346-
347-
<repository>
348-
<id>release-train_juno</id>
349-
<layout>p2</layout>
350-
<url> http://download.eclipse.org/releases/juno</url>
351-
</repository>
352-
</repositories>
353-
</profile>
354-
355-
<profile>
356-
<id>kepler</id>
357-
<properties>
358-
<platform-version-name>kepler</platform-version-name>
359-
</properties>
360-
<repositories>
361-
<repository>
362-
<id>platform_kepler</id>
363-
<layout>p2</layout>
364-
<url> http://download.eclipse.org/eclipse/updates/4.3</url>
365-
</repository>
366-
367-
<repository>
368-
<id>release-train_kepler</id>
369-
<layout>p2</layout>
370-
<url> http://download.eclipse.org/releases/kepler</url>
371-
</repository>
372-
</repositories>
373-
</profile>
374340

375-
<profile>
376-
<id>luna</id>
377-
<properties>
378-
<platform-version-name>luna</platform-version-name>
379-
</properties>
380341
<repositories>
381342
<repository>
382343
<id>platform_luna</id>

it.baeyens.arduino.product/arduino.product

+22-5
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,14 @@ it.baeyens.arduino.application.perspective
2929
--launcher.XXMaxPermSize 256M
3030
--launcher.XXMaxPermSize 256m
3131
--launcher.defaultAction openFile
32-
--launcher.appendVmargs</programArgs>
32+
--launcher.appendVmargs
33+
</programArgs>
3334
<vmArgs>-Dosgi.requiredJavaVersion=1.6
3435
-Xms40m
35-
-Xmx512m</vmArgs>
36-
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
36+
-Xmx512m
37+
</vmArgs>
38+
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
39+
</vmArgsMac>
3740
</launcherArgs>
3841

3942
<windowImages i16="/it.baeyens.arduino.application/icons/logo_16.png" i32="/it.baeyens.arduino.application/icons/logo_32.png" i48="/it.baeyens.arduino.application/icons/logo_48.png" i64="/it.baeyens.arduino.application/icons/logo_64.png" i128="/it.baeyens.arduino.application/icons/logo_128.png"/>
@@ -309,7 +312,6 @@ rights to a jury trial in any resulting litigation.&lt;/p&gt;
309312
<feature id="org.eclipse.equinox.p2.rcp.feature"/>
310313
<feature id="org.eclipse.cdt.msw"/>
311314
<feature id="org.eclipse.equinox.p2.user.ui"/>
312-
<feature id="org.eclipse.cvs"/>
313315
<feature id="org.eclipse.mylyn.ide_feature"/>
314316
<feature id="org.eclipse.mylyn.team_feature"/>
315317
<feature id="org.eclipse.epp.mpc"/>
@@ -331,10 +333,25 @@ rights to a jury trial in any resulting litigation.&lt;/p&gt;
331333
<feature id="org.eclipse.mylyn.context_feature"/>
332334
<feature id="org.eclipse.cdt.gdb"/>
333335
<feature id="org.eclipse.cdt.gnu.debug"/>
336+
<feature id="org.eclipse.jdt"/>
337+
<feature id="org.eclipse.ecf.filetransfer.httpclient4.feature"/>
338+
<feature id="org.eclipse.mylyn.commons.repositories"/>
339+
<feature id="org.eclipse.ecf.core.ssl.feature"/>
340+
<feature id="org.eclipse.mylyn.commons.identity"/>
341+
<feature id="org.eclipse.mylyn.monitor"/>
342+
<feature id="org.eclipse.mylyn.commons"/>
343+
<feature id="org.eclipse.mylyn.commons.notifications"/>
344+
<feature id="org.eclipse.ecf.core.feature"/>
345+
<feature id="org.eclipse.ecf.filetransfer.feature"/>
346+
<feature id="org.eclipse.mylyn.discovery"/>
347+
<feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature"/>
348+
<feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>
349+
<feature id="org.eclipse.equinox.executable"/>
350+
<feature id="org.eclipse.equinox.core.feature"/>
334351
</features>
335352

336353
<configurations>
337-
<plugin id="it.baeyens.arduino.application" autoStart="true" startLevel="61" />
354+
<plugin id="it.baeyens.arduino.application" autoStart="true" startLevel="4" />
338355
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
339356
<plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="1" />
340357
</configurations>

it.baeyens.arduino.product/plugin.xml

+4
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@
4040
name="preferenceCustomization"
4141
value="plugin_customization.ini">
4242
</property>
43+
<property
44+
name="cssTheme"
45+
value="org.eclipse.e4.ui.css.theme.e4_classic">
46+
</property>
4347
</product>
4448
</extension>
4549

it.baeyens.cdt.refactor/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/bin/
Binary file not shown.
Binary file not shown.

readme.md

+4-5
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,8 @@ win32x32.cmd (if you are on 32 bits windows)
4545
=======
4646
##Build Options
4747
You can control the maven build with the following profiles:
48-
* juno (default) (builds against the juno repositories (4.2))
49-
* kepler (builds agains the kepler repositories (4.3))
5048
* luna (builds agains the luna repositories (4.4))
49+
* mars (builds agains the mars repositories (4.5))
5150
* win32 (builds for 32 bit windows)
5251
* win64
5352
* linux32
@@ -58,11 +57,11 @@ You can control the maven build with the following profiles:
5857

5958
#####Examples:
6059

61-
mvn verify -Plinux32,kepler
60+
mvn verify -Plinux32 (builds for luna and linux 32 bits)
6261

63-
mvn verify -Pwin32,juno,linux32
62+
mvn verify -Pwin32,mars,linux32
6463

65-
mvn verify (builds for juno and the platform you are running on)
64+
mvn verify (builds for luna and the platform you are running on)
6665

6766

6867
###Setting up a repository

0 commit comments

Comments
 (0)