File tree Expand file tree Collapse file tree 3 files changed +24
-20
lines changed
phasereditor.canvas.ui/src/phasereditor/canvas/ui/editors/grid/editors
phasereditor.ide/src/phasereditor/ide/intro
phasereditor.ui/src/phasereditor/ui/prefs Expand file tree Collapse file tree 3 files changed +24
-20
lines changed Original file line number Diff line number Diff line change @@ -64,20 +64,23 @@ protected Object openDialogBox(Control cellEditorWindow) {
64
64
rgb = (RGB ) value ;
65
65
}
66
66
67
- if (PhaserEditorUI .get_pref_Dialog_Color_Java ()) {
68
- Color color = null ;
67
+ // TODO: we should find the way this work on Mac!
68
+ if (!PhaserEditorUI .isMacPlatform ()) {
69
+ if (PhaserEditorUI .get_pref_Dialog_Color_Java ()) {
69
70
70
- if (rgb != null ) {
71
- color = new Color (rgb .red , rgb .green , rgb .blue );
72
- }
71
+ Color color = null ;
73
72
74
- color = JColorChooser .showDialog (null , "Color Dialog" , color );
73
+ if (rgb != null ) {
74
+ color = new Color (rgb .red , rgb .green , rgb .blue );
75
+ }
75
76
76
- if (color != null ) {
77
- rgb = new RGB (color .getRed (), color .getGreen (), color .getBlue ());
78
- }
77
+ color = JColorChooser .showDialog (null , "Color Dialog" , color );
78
+ if (color != null ) {
79
+ rgb = new RGB (color .getRed (), color .getGreen (), color .getBlue ());
80
+ }
79
81
80
- return rgb ;
82
+ return rgb ;
83
+ }
81
84
}
82
85
83
86
ColorDialog dlg = new ColorDialog (cellEditorWindow .getShell ());
Original file line number Diff line number Diff line change 21
21
// USE OR OTHER DEALINGS IN THE SOFTWARE.
22
22
package phasereditor .ide .intro ;
23
23
24
- import javax .swing .UIManager ;
25
- import javax .swing .plaf .nimbus .NimbusLookAndFeel ;
24
+ import static java .lang .System .out ;
26
25
27
26
import org .eclipse .equinox .app .IApplicationContext ;
28
27
import org .eclipse .ui .internal .ide .application .IDEApplication ;
@@ -39,17 +38,14 @@ public class PhaserIDE2 extends IDEApplication {
39
38
@ Override
40
39
public Object start (IApplicationContext appContext ) throws Exception {
41
40
42
- javafx . application . Platform . setImplicitExit ( false );
41
+ out . println ( "Starting Phaser IDE application " + LicCore . PRODUCT_VERSION );
43
42
44
- try {
45
- // UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName());
46
- UIManager .setLookAndFeel (NimbusLookAndFeel .class .getName ());
47
- } catch (Exception e ) {
48
- e .printStackTrace ();
49
- }
43
+ javafx .application .Platform .setImplicitExit (false );
50
44
45
+ out .println ("Starting license monitor" );
51
46
LicCore .startMonitor ();
52
47
48
+ out .println ("Starting Eclipse application" );
53
49
Object res = super .start (appContext );
54
50
55
51
try {
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ public DialogsPreferencesPage() {
17
17
@ Override
18
18
public void init (IWorkbench workbench ) {
19
19
setPreferenceStore (PhaserEditorUI .getPreferenceStore ());
20
- // setDescription("Configure default dialogs.");
20
+ // setDescription("Configure default dialogs.");
21
21
}
22
22
23
23
@ Override
@@ -33,6 +33,11 @@ protected void createFieldEditors() {
33
33
34
34
}, parent , true );
35
35
addField (editor );
36
+
37
+ if (PhaserEditorUI .isMacPlatform ()) {
38
+ editor .setEnabled (false , parent );
39
+ }
40
+
36
41
}
37
42
}
38
43
You can’t perform that action at this time.
0 commit comments