From 01f21207bd59f31b3021976286e4a425340b9ea5 Mon Sep 17 00:00:00 2001 From: jonathan Date: Tue, 21 Mar 2023 15:38:01 -0500 Subject: [PATCH 1/5] JtextArea fix and Superscripts --- .idea/ant.xml | 6 +++ .idea/vcs.xml | 6 +++ .idea/workspace.xml | 64 ++++++++++++++++++++++++++++++++ src/simplejavacalculator/UI.java | 14 +++---- 4 files changed, 83 insertions(+), 7 deletions(-) create mode 100644 .idea/ant.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml diff --git a/.idea/ant.xml b/.idea/ant.xml new file mode 100644 index 0000000..a2a4769 --- /dev/null +++ b/.idea/ant.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..61ba49e --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + { + "keyToString": { + "Downloaded.Files.Path.Enabled": "false", + "Repository.Attach.Annotations": "false", + "Repository.Attach.JavaDocs": "false", + "Repository.Attach.Sources": "false", + "RunOnceActivity.OpenProjectViewOnStart": "true", + "RunOnceActivity.ShowReadmeOnStart": "true", + "WebServerToolWindowFactoryState": "false", + "last_opened_file_path": "/Users/jonathan/mySimpleCalc/Simple-Java-Calculator", + "node.js.detected.package.eslint": "true", + "node.js.detected.package.tslint": "true", + "node.js.selected.package.eslint": "(autodetect)", + "node.js.selected.package.tslint": "(autodetect)", + "nodejs_package_manager_path": "npm", + "project.structure.last.edited": "Libraries", + "project.structure.proportion": "0.0", + "project.structure.side.proportion": "0.2", + "vue.rearranger.settings.migration": "true" + } +} + + + + + 1679406811650 + + + + + + \ No newline at end of file diff --git a/src/simplejavacalculator/UI.java b/src/simplejavacalculator/UI.java index 087bfb1..a703609 100644 --- a/src/simplejavacalculator/UI.java +++ b/src/simplejavacalculator/UI.java @@ -83,7 +83,7 @@ public UI() throws IOException { font = new Font("Consolas",Font.PLAIN, 18); - text = new JTextArea(1, 30); + text = new JTextArea(1, 15); textFont = new Font("Consolas",Font.BOLD, 24); @@ -95,15 +95,15 @@ public UI() throws IOException { butMinus = new JButton("-"); butMultiply = new JButton("*"); butDivide = new JButton("/"); - butEqual = new JButton("="); - butSquareRoot = new JButton("sqrt"); - butSquare = new JButton("x*x"); - butOneDividedBy = new JButton("1/x"); + butEqual = new JButton("="); + butSquareRoot = new JButton("√x"); + butSquare = new JButton("x2"); + butOneDividedBy = new JButton("1 ⁄ x"); butCos = new JButton("Cos"); butSin = new JButton("Sin"); butTan = new JButton("Tan"); - butln = new JButton("ln"); - butxpowerofy = new JButton("x^y"); + butln = new JButton("ln"); + butxpowerofy = new JButton("xy"); butlog = new JButton("log10(x)"); butrate = new JButton("x%"); butabs = new JButton("abs(x)"); From ace692b6be13b70a88b7ab8b87e00fd7cabcc211 Mon Sep 17 00:00:00 2001 From: jonathan drysdale-anderson <78763876+jdrysdaleandesrson@users.noreply.github.com> Date: Tue, 21 Mar 2023 15:40:18 -0500 Subject: [PATCH 2/5] Delete vcs.xml --- .idea/vcs.xml | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 .idea/vcs.xml diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file From 109d65207ab23b9b5dd415b6c69d1e5f5cfc55e9 Mon Sep 17 00:00:00 2001 From: jonathan drysdale-anderson <78763876+jdrysdaleandesrson@users.noreply.github.com> Date: Tue, 21 Mar 2023 15:40:40 -0500 Subject: [PATCH 3/5] Delete ant.xml --- .idea/ant.xml | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 .idea/ant.xml diff --git a/.idea/ant.xml b/.idea/ant.xml deleted file mode 100644 index a2a4769..0000000 --- a/.idea/ant.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file From 51e61e44cb5e49eeac1ef0ae3d0283ccf988054d Mon Sep 17 00:00:00 2001 From: jonathan drysdale-anderson <78763876+jdrysdaleandesrson@users.noreply.github.com> Date: Tue, 21 Mar 2023 15:41:06 -0500 Subject: [PATCH 4/5] Delete workspace.xml --- .idea/workspace.xml | 64 --------------------------------------------- 1 file changed, 64 deletions(-) delete mode 100644 .idea/workspace.xml diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 61ba49e..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - { - "keyToString": { - "Downloaded.Files.Path.Enabled": "false", - "Repository.Attach.Annotations": "false", - "Repository.Attach.JavaDocs": "false", - "Repository.Attach.Sources": "false", - "RunOnceActivity.OpenProjectViewOnStart": "true", - "RunOnceActivity.ShowReadmeOnStart": "true", - "WebServerToolWindowFactoryState": "false", - "last_opened_file_path": "/Users/jonathan/mySimpleCalc/Simple-Java-Calculator", - "node.js.detected.package.eslint": "true", - "node.js.detected.package.tslint": "true", - "node.js.selected.package.eslint": "(autodetect)", - "node.js.selected.package.tslint": "(autodetect)", - "nodejs_package_manager_path": "npm", - "project.structure.last.edited": "Libraries", - "project.structure.proportion": "0.0", - "project.structure.side.proportion": "0.2", - "vue.rearranger.settings.migration": "true" - } -} - - - - - 1679406811650 - - - - - - \ No newline at end of file From 5144837482a82c3a9b49fd798918886018672201 Mon Sep 17 00:00:00 2001 From: jonathan drysdale-anderson <78763876+jdrysdaleandesrson@users.noreply.github.com> Date: Sat, 2 Sep 2023 09:50:24 +0100 Subject: [PATCH 5/5] Update UI.java changed the html tags to unicode --- src/simplejavacalculator/UI.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/simplejavacalculator/UI.java b/src/simplejavacalculator/UI.java index a703609..545f95a 100644 --- a/src/simplejavacalculator/UI.java +++ b/src/simplejavacalculator/UI.java @@ -96,14 +96,14 @@ public UI() throws IOException { butMultiply = new JButton("*"); butDivide = new JButton("/"); butEqual = new JButton("="); - butSquareRoot = new JButton("√x"); - butSquare = new JButton("x2"); - butOneDividedBy = new JButton("1 ⁄ x"); + butSquareRoot = new JButton("\u221Ax"); + butSquare = new JButton("x\u00B2"); + butOneDividedBy = new JButton("1/x"); butCos = new JButton("Cos"); butSin = new JButton("Sin"); butTan = new JButton("Tan"); butln = new JButton("ln"); - butxpowerofy = new JButton("xy"); + butxpowerofy = new JButton("x^y"); butlog = new JButton("log10(x)"); butrate = new JButton("x%"); butabs = new JButton("abs(x)");