Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 15 additions & 18 deletions app/src/processing/app/Base.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,28 +23,29 @@

package processing.app;

import java.awt.*;
import java.awt.event.ActionListener;
import java.io.*;
import java.lang.reflect.InvocationTargetException;
import java.util.*;
import java.util.List;
import java.util.Map.Entry;

import javax.swing.*;
import javax.swing.tree.DefaultMutableTreeNode;

import com.formdev.flatlaf.FlatDarkLaf;
import com.formdev.flatlaf.FlatLaf;
import com.formdev.flatlaf.FlatLightLaf;
import processing.app.contrib.*;
import processing.app.tools.Tool;
import processing.app.ui.*;
import processing.app.ui.PreferencesKt;
import processing.app.ui.Toolkit;
import processing.core.*;
import processing.core.PApplet;
import processing.data.StringList;

import javax.swing.*;
import javax.swing.tree.DefaultMutableTreeNode;
import java.awt.*;
import java.awt.event.ActionListener;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.InvocationTargetException;
import java.util.*;
import java.util.List;
import java.util.Map.Entry;

/**
* The base class for the main processing application.
* Primary role of this class is for platform identification and
Expand Down Expand Up @@ -2185,11 +2186,7 @@ static private Mode findSketchMode(File folder, List<Mode> modeList) {
* Show the Preferences window.
*/
public void handlePrefs() {
// if (preferencesFrame == null) {
// preferencesFrame = new PreferencesFrame(this);
// }
// preferencesFrame.showFrame();
PreferencesKt.show();
PDEPreferencesKt.show();
}


Expand Down
12 changes: 10 additions & 2 deletions app/src/processing/app/Preferences.kt
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@ import kotlinx.coroutines.flow.dropWhile
import kotlinx.coroutines.launch
import java.io.File
import java.io.InputStream
import java.nio.file.*
import java.util.Properties
import java.nio.file.FileSystems
import java.nio.file.Path
import java.nio.file.StandardWatchEventKinds
import java.nio.file.WatchEvent
import java.util.*

/*
The ReactiveProperties class extends the standard Java Properties class
Expand All @@ -28,6 +31,11 @@ class ReactiveProperties: Properties() {
return snapshotStateMap[key] ?: super.getProperty(key)
}

override fun remove(key: Any?): Any? {
snapshotStateMap.remove(key as String)
return super.remove(key)
}

operator fun get(key: String): String? = getProperty(key)

operator fun set(key: String, value: String) {
Expand Down
51 changes: 24 additions & 27 deletions app/src/processing/app/ui/EditorFooter.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,14 @@

package processing.app.ui;

import java.awt.CardLayout;
import java.awt.Color;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.Image;
import java.awt.datatransfer.Clipboard;
import processing.app.Base;
import processing.app.Mode;
import processing.app.Sketch;
import processing.app.contrib.ContributionManager;
import processing.data.StringDict;

import javax.swing.*;
import java.awt.*;
import java.awt.datatransfer.StringSelection;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
Expand All @@ -39,14 +38,6 @@
import java.util.ArrayList;
import java.util.List;

import javax.swing.*;

import processing.app.Base;
import processing.app.Mode;
import processing.app.Sketch;
import processing.app.contrib.ContributionManager;
import processing.data.StringDict;


/**
* Console/error/whatever tabs at the bottom of the editor window.
Expand Down Expand Up @@ -118,6 +109,18 @@ public void mousePressed(MouseEvent e) {
Base.DEBUG = !Base.DEBUG;
editor.updateDevelopMenu();
}
copyDebugInformationToClipboard();
}
});

tabBar.add(version);

add(tabBar);

updateTheme();
}

public static void copyDebugInformationToClipboard() {
var debugInformation = String.join("\n",
"Version: " + Base.getVersionName(),
"Revision: " + Base.getRevision(),
Expand All @@ -127,18 +130,12 @@ public void mousePressed(MouseEvent e) {
var stringSelection = new StringSelection(debugInformation);
var clipboard = java.awt.Toolkit.getDefaultToolkit().getSystemClipboard();
clipboard.setContents(stringSelection, null);
}
});

tabBar.add(version);

add(tabBar);

updateTheme();
}
}


/** Add a panel with no icon. */
/**
* Add a panel with no icon.
*/
public void addPanel(Component comp, String name) {
addPanel(comp, name, null);
}
Expand Down
Loading