Skip to content

Commit

Permalink
Bonanza of fixes
Browse files Browse the repository at this point in the history
* Restore old binaries under archive/ - #175
* Gradle -> 5.4
* Kotlin coroutines -> 1.2.0
* Switch Ion to use Torch for the timelines
* Parallel compilation - #177
* Better visibility of heap memory widget text -#173
* Keyboard-based traversal of popup content - #171 + #159
* Dismiss non-ribbon hosted popups with outside mouse click or ESC - #170
  • Loading branch information
kirill-grouchnikov committed Apr 18, 2019
1 parent 277d649 commit 049bdc9
Show file tree
Hide file tree
Showing 54 changed files with 2,416 additions and 1,000 deletions.
Binary file added archive/flamingo/flamingo-5.1.01.jar
Binary file not shown.
Binary file added archive/flamingo/flamingo-5.2.00.jar
Binary file not shown.
Binary file added archive/flamingo/flamingo-5.3.00.jar
Binary file not shown.
Binary file added archive/ibis/ibis-1.0.00.jar
Binary file not shown.
Binary file added archive/lightbeam/lightbeam-1.1.jar
Binary file not shown.
108 changes: 108 additions & 0 deletions archive/older-releases.md
@@ -0,0 +1,108 @@
## Older releases

In pre-Radiance world, libraries in the `org.pushingpixels` namespace were released under different versioning schemes.

The [`archive`](https://github.com/kirill-grouchnikov/radiance/tree/master/archive) folder contains pre-Radiance binaries for those libraries. These are historical artifacts that can be used to pin your dependencies to a particular older release.

### 2017.H1 releases

* Trident - use version 1.4
* Flamingo - use version 5.1
* Substance - use version 7.0 (for core and all plugins)

### 2017.H2 releases

* Trident - use version 1.4
* Flamingo - use version 5.2
* Substance - use version 7.1 (for core and all plugins)

### 2018.H1 releases

* Trident - use version 1.5
* Flamingo - use version 5.3
* Substance - use version 8.0 (for core and all plugins)

## Naming history

### Laf-plugin
* 1.0 - Vile Weed
* 1.1 - Landshark
* 1.2 - Moonriver

### Laf-widget
* 2.1 - Camellia
* 3.0 - Daffodil
* 3.1 - Edelweiss
* 3.2 - Foxglove
* 3.3 - Goldenrod
* 3.4 - Horbeam
* 4.0 - Iris
* 4.1 - Juniper
* 4.2 - Knotweed
* 4.3 - Larkspur
* 5.0 - Magnolia
* 5.1 - Nightshade
* 5.2 - Orchid
* 5.3 - Periwinkle

### Trident
* 1.0 - Acumen
* 1.1 - Bogeyman
* 1.2 - Cookie Jar
* 1.3 - Diamond in the Sky
* 1.4 - Enchanted
* 1.5 - Faraday

### Substance
* 2.1 - Dakota
* 2.2 - El Paso
* 2.3 - Firenze
* 3.0 - Grenada
* 3.1 - Honolulu
* 3.2 - Iowa
* 3.3 - Japan
* 4.0 - Key Largo
* 4.1 - Lima
* 4.2 - Memphis
* 4.3 - Nairobi
* 5.1 - Panama
* 5.2 - Quebec
* 5.3 - Reykjavik
* 6.0 - Sonoma
* 6.1 - Trinidad
* 7.0 - Uruguay
* 7.1 - Vermont
* 8.0 - Wyoming
* 8.1 - Xanadu

### Flamingo
* 1.1 - Brianna
* 2.0 - Caireann
* 3.0 - Deirdre
* 3.1 - Eilinora
* 4.0 - Fainnear
* 4.1 - Guinevere
* 5.0 - Imogene
* 5.1 - Jileen
* 5.2 - Kennocha
* 5.3 - Liadan
* 6.0 - Muireann

### Ibis
* 1.0 - Acorn
* 1.1 - Birch

### Spoonbill
* 1.0 - Apricot

### Rainbow
* 1.0 - Moonstone
* 1.1 - Nightstone
* 1.2 - Blackstone
* 1.3 - Darkstone
* 1.4 - Inkstone

### Lightbeam
* 1.0 - Antares
* 1.1 - Betelgeuse
* 1.2 - Castor
Binary file added archive/spoonbill/spoonbill-1.0.00.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added archive/substance-swingx/substance-swingx-7.0.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added archive/substance/substance-7.0.01.jar
Binary file not shown.
Binary file added archive/substance/substance-7.1.01.jar
Binary file not shown.
Binary file added archive/substance/substance-8.0.02.jar
Binary file not shown.
Binary file added archive/trident/trident-1.4.jar
Binary file not shown.
Binary file added archive/trident/trident-1.5.00.jar
Binary file not shown.
10 changes: 5 additions & 5 deletions build.gradle
Expand Up @@ -35,7 +35,7 @@ ext.isRelease = false
buildscript {
ext {
kotlin_version = '1.3.30'
kotlinx_coroutines_version = '1.1.1'
kotlinx_coroutines_version = '1.2.0'
gradle_nexus_plugin_version = '2.3.1'
dokka_plugin_version = '0.9.18'
batik_version = '1.11'
Expand All @@ -52,6 +52,10 @@ buildscript {
}
}

wrapper {
gradleVersion = "5.4"
}

allprojects {
version = rootProject.version

Expand Down Expand Up @@ -173,10 +177,6 @@ task getToolsDependencies(type: Copy) {

task getAllDependencies(type: Copy, dependsOn: [getCoreDependencies, getDemoDependencies, getToolsDependencies])

wrapper {
gradleVersion = "5.3.1"
}

task printRuntimeDependencies {
doLast {
println "Project runtime dependencies:"
Expand Down
Expand Up @@ -127,23 +127,28 @@ private CommandMenuContentModel getPopupMenuContentModel() {
simpleEntries1.add(Command.builder()
.setText(mf.format(new Object[] { "1" }))
.setIconFactory(Address_book_new.factory())
.setAction((CommandActionEvent e) -> System.out.println("Popup action 1"))
.build());
simpleEntries1.add(Command.builder()
.setText(mf.format(new Object[] { "2" }))
.setIconFactory(EmptyResizableIcon.factory())
.setAction((CommandActionEvent e) -> System.out.println("Popup action 2"))
.build());
simpleEntries1.add(Command.builder()
.setText(mf.format(new Object[] { "3" }))
.setIconFactory(EmptyResizableIcon.factory())
.setAction((CommandActionEvent e) -> System.out.println("Popup action 3"))
.build());

simpleEntries2.add(Command.builder()
.setText(mf.format(new Object[] { "4" }))
.setIconFactory(EmptyResizableIcon.factory())
.setAction((CommandActionEvent e) -> System.out.println("Popup action 4"))
.build());
simpleEntries2.add(Command.builder()
.setText(mf.format(new Object[] { "5" }))
.setIconFactory(Text_x_generic.factory())
.setAction((CommandActionEvent e) -> System.out.println("Popup action 5"))
.build());

return new CommandMenuContentModel(
Expand Down
1 change: 1 addition & 0 deletions demos/ion/build.gradle
Expand Up @@ -35,6 +35,7 @@ dependencies {
compile "org.jetbrains.kotlinx:kotlinx-coroutines-swing:$kotlinx_coroutines_version"
compile "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$kotlinx_coroutines_version"
compile project(':trident')
compile project(':kotlin-ext:torch')
}

ext.designation = "demo"
Expand Down
Expand Up @@ -31,8 +31,9 @@ package org.pushingpixels.demo.ion

import kotlinx.coroutines.*
import kotlinx.coroutines.swing.Swing
import org.pushingpixels.torch.TorchComponent
import org.pushingpixels.torch.componentTimeline
import org.pushingpixels.trident.Timeline
import org.pushingpixels.trident.swing.SwingComponentTimeline
import java.awt.Color
import java.awt.Dimension
import java.awt.FlowLayout
Expand Down Expand Up @@ -81,10 +82,10 @@ fun main() {
}

button.foreground = Color.blue
SwingComponentTimeline.builder(button)
.addPropertyToInterpolate("foreground", Color.blue, Color.red)
.setDuration(1000)
.playLoop(Timeline.RepeatBehavior.REVERSE)
button.componentTimeline {
property(TorchComponent.foreground from Color.blue to Color.red)
duration = 1000
}.playLoop(Timeline.RepeatBehavior.REVERSE)

frame.size = Dimension(600, 400)
frame.setLocationRelativeTo(null)
Expand Down
Expand Up @@ -36,6 +36,8 @@ import kotlinx.coroutines.channels.ReceiveChannel
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import kotlinx.coroutines.swing.Swing
import org.pushingpixels.torch.TorchComponent
import org.pushingpixels.torch.componentTimeline
import org.pushingpixels.trident.Timeline
import org.pushingpixels.trident.swing.SwingComponentTimeline
import java.awt.Color
Expand Down Expand Up @@ -85,10 +87,10 @@ fun main() {
}

button.foreground = Color.blue
SwingComponentTimeline.builder(button)
.addPropertyToInterpolate("foreground", Color.blue, Color.red)
.setDuration(1000)
.playLoop(Timeline.RepeatBehavior.REVERSE)
button.componentTimeline {
property(TorchComponent.foreground from Color.blue to Color.red)
duration = 1000
}.playLoop(Timeline.RepeatBehavior.REVERSE)

frame.size = Dimension(600, 400)
frame.setLocationRelativeTo(null)
Expand Down
Expand Up @@ -33,8 +33,9 @@ import kotlinx.coroutines.*
import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.channels.ReceiveChannel
import kotlinx.coroutines.swing.Swing
import org.pushingpixels.torch.TorchComponent
import org.pushingpixels.torch.componentTimeline
import org.pushingpixels.trident.Timeline
import org.pushingpixels.trident.swing.SwingComponentTimeline
import java.awt.Color
import java.awt.Dimension
import java.awt.FlowLayout
Expand Down Expand Up @@ -94,10 +95,10 @@ fun main() {
}

button.foreground = Color.blue
SwingComponentTimeline.builder(button)
.addPropertyToInterpolate("foreground", Color.blue, Color.red)
.setDuration(1000)
.playLoop(Timeline.RepeatBehavior.REVERSE)
button.componentTimeline {
property(TorchComponent.foreground from Color.blue to Color.red)
duration = 1000
}.playLoop(Timeline.RepeatBehavior.REVERSE)

frame.size = Dimension(600, 400)
frame.setLocationRelativeTo(null)
Expand Down
2 changes: 1 addition & 1 deletion docs/substance/add-to-your-project.md
Expand Up @@ -13,7 +13,7 @@ You can also build Substance locally:
* [Build Radiance locally](../building.md) with Gradle.
* Copy the binaries from `drop/X.Y.ZZ/core`. Specifically, add *radiance-substance-X.Y.ZZ.jar*, *radiance-trident-X.Y.ZZ.jar* and *radiance-neon-X.Y.ZZ.jar* to the place that has your local dependencies.

For earlier versions of Substance, see [this page](../../drop/archive/older-releases.md) for the list of binaries to take for the specific pre-Radiance versions.
For earlier versions of Substance, see [this page](../../archive/older-releases.md) for the list of binaries to take for the specific pre-Radiance versions.

### Using Substance

Expand Down
2 changes: 1 addition & 1 deletion docs/substance/getting-started.md
Expand Up @@ -100,7 +100,7 @@ Alternatively, for a more manual process:
* Build Radiance locally with *gradlew* command.
* Copy the binaries with *gradlew copyJars* command. For version *X.Y.ZZ* of Radiance, add *radiance-substance-X.Y.ZZ.jar*, *radiance-trident-X.Y.ZZ.jar* and *radiance-neon-X.Y.ZZ.jar* to the place that has your local dependencies.

For earlier versions of Substance, see [this page](../drop/archive/older-releases.md) for the list of binaries to take for the specific pre-Radiance versions.
For earlier versions of Substance, see [this page](../archive/older-releases.md) for the list of binaries to take for the specific pre-Radiance versions.

Assuming that you have saved *radiance-substance.jar*, *radiance-trident.jar* and *radiance-neon.jar* to the *C:/temp* folder, use the following script in order to run the frame under Substance:

Expand Down
Binary file modified drop/2.5-SNAPSHOT/core/radiance-flamingo-2.5-SNAPSHOT.jar
Binary file not shown.
Binary file modified drop/2.5-SNAPSHOT/core/radiance-substance-2.5-SNAPSHOT.jar
Binary file not shown.
Binary file modified drop/2.5-SNAPSHOT/demo/radiance-flamingo-demo-2.5-SNAPSHOT.jar
Binary file not shown.
Binary file modified drop/2.5-SNAPSHOT/demo/radiance-ion-2.5-SNAPSHOT.jar
Binary file not shown.
Expand Up @@ -44,6 +44,7 @@
import java.awt.*;
import java.awt.event.*;
import java.util.*;
import java.util.List;

/**
* Command button.
Expand Down Expand Up @@ -844,4 +845,15 @@ public void doPopupClick() {
popupModel.setPopupShowing(true);
paintImmediately(new Rectangle(0, 0, size.width, size.height));
}

public boolean isPopupVisible() {
List<PopupPanelManager.PopupInfo> popupInfos =
PopupPanelManager.defaultManager().getShownPath();
for (PopupPanelManager.PopupInfo popupInfo : popupInfos) {
if (popupInfo.getPopupOriginator() == this) {
return true;
}
}
return false;
}
}
Expand Up @@ -70,7 +70,9 @@ void addMenuButton(JCommandToggleMenuButton menuButton) {
}

void addMenuSeparator() {
this.menuComponents.add(new Separator());
Separator separator = new Separator();
separator.setFocusable(false);
this.menuComponents.add(separator);
this.fireStateChanged();
}

Expand Down

0 comments on commit 049bdc9

Please sign in to comment.