Skip to content

Commit 3a1aa8e

Browse files
committed
Restore welcome & Cleanup
1 parent 7d94b30 commit 3a1aa8e

File tree

7 files changed

+3
-19
lines changed

7 files changed

+3
-19
lines changed

app/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -420,8 +420,7 @@ tasks.register("includeProcessingResources"){
420420
"includeSharedAssets",
421421
"includeProcessingExamples",
422422
"includeProcessingWebsiteExamples",
423-
"includeJavaModeResources",
424-
"renameWindres"
423+
"includeJavaModeResources"
425424
)
426425
finalizedBy("signResources")
427426
}

app/src/processing/app/Language.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -183,13 +183,6 @@ static public Language init() {
183183
return instance;
184184
}
185185

186-
static public void reload(){
187-
if(instance == null) return;
188-
synchronized (Language.class) {
189-
instance = new Language();
190-
}
191-
}
192-
193186
static private String get(String key) {
194187
LanguageBundle bundle = init().bundle;
195188

app/src/processing/app/ui/Editor.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -502,9 +502,6 @@ public void rebuildHeader() {
502502

503503
public void rebuildModePopup() {
504504
modePopup = new JMenu();
505-
506-
507-
508505
ButtonGroup modeGroup = new ButtonGroup();
509506
for (final Mode m : base.getModeList()) {
510507
JRadioButtonMenuItem item = new JRadioButtonMenuItem(m.getTitle());
File renamed without changes.

app/src/processing/app/ui/Welcome.kt renamed to app/src/processing/app/ui/WelcomeToProcessing.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package processing.app.ui
22

33
import androidx.compose.foundation.Image
44
import androidx.compose.foundation.background
5-
import androidx.compose.foundation.border
65
import androidx.compose.foundation.layout.*
76
import androidx.compose.foundation.shape.RoundedCornerShape
87
import androidx.compose.material.*
@@ -23,7 +22,6 @@ import androidx.compose.ui.platform.LocalLayoutDirection
2322
import androidx.compose.ui.res.painterResource
2423
import androidx.compose.ui.unit.LayoutDirection
2524
import androidx.compose.ui.unit.dp
26-
import androidx.compose.ui.unit.min
2725
import com.formdev.flatlaf.util.SystemInfo
2826
import processing.app.*
2927
import processing.app.ui.components.LanguageChip
@@ -32,12 +30,10 @@ import processing.app.ui.theme.*
3230
import java.awt.Desktop
3331
import java.io.IOException
3432
import java.net.URI
35-
import java.nio.file.*
36-
import java.util.*
3733
import javax.swing.SwingUtilities
3834

3935

40-
class Welcome @Throws(IOException::class) constructor(base: Base) {
36+
class WelcomeToProcessing @Throws(IOException::class) constructor(base: Base) {
4137
init {
4238
SwingUtilities.invokeLater {
4339
PDEWindow("menu.help.welcome", fullWindowContent = true) {

app/src/processing/app/ui/components/examples/Examples.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import org.jetbrains.compose.resources.decodeToImageBitmap
3030
import processing.app.LocalPreferences
3131
import processing.app.Messages
3232
import processing.app.Platform
33-
import processing.app.ui.Welcome.Companion.LocalBase
33+
import processing.app.ui.WelcomeToProcessing.Companion.LocalBase
3434
import java.awt.Cursor
3535
import java.io.File
3636
import java.nio.file.*

app/src/processing/app/ui/theme/Locale.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ fun LocaleProvider(content: @Composable () -> Unit) {
5151
java.util.Locale.setDefault(locale)
5252
languageFile.writeText(locale.language)
5353
code = locale.language
54-
Language.reload()
5554
}
5655

5756

0 commit comments

Comments
 (0)