From 0489464d3450807c00a21c60c0c485f7cbe1c1a8 Mon Sep 17 00:00:00 2001 From: skylarmt Date: Wed, 21 Jan 2015 20:21:23 -0700 Subject: [PATCH] Fix other things --- src/net/apocalypselabs/symat/CodeEditor.java | 40 +++++------ src/net/apocalypselabs/symat/Debug.java | 2 +- src/net/apocalypselabs/symat/MainGUI.form | 71 +++++++++++++++++++ src/net/apocalypselabs/symat/MainGUI.java | 56 ++++++++++++++- src/net/apocalypselabs/symat/images/wiki.png | Bin 0 -> 2007 bytes 5 files changed, 144 insertions(+), 25 deletions(-) create mode 100644 src/net/apocalypselabs/symat/images/wiki.png diff --git a/src/net/apocalypselabs/symat/CodeEditor.java b/src/net/apocalypselabs/symat/CodeEditor.java index f64a85d..2fe4dfb 100644 --- a/src/net/apocalypselabs/symat/CodeEditor.java +++ b/src/net/apocalypselabs/symat/CodeEditor.java @@ -662,6 +662,8 @@ public class CodeEditor extends javax.swing.JInternalFrame { outputBox.append("Error: Bad version selection syntax: " + ex.getMessage() + "\n"); } + } else { + return true; } return false; } @@ -677,30 +679,22 @@ public class CodeEditor extends javax.swing.JInternalFrame { String[] lines = script.split("\n"); String temp; String result = ""; + String pre = "//"; + if (lang.startsWith("p")) { + pre = "##"; + } for (String line : lines) { - if (lang.startsWith("j")) { - if (line.startsWith("//include ") && !line.trim().endsWith("//include")) { - temp = line.split(" ", 2)[1]; - try { - line = FileUtils.readFile(filedata.getParent() - + "./" + temp); - } catch (IOException ex) { - outputBox.append("Error: Cannot read " - + "referenced script file: " + ex.getMessage() - + "\n"); - } - } - } else { - if (line.startsWith("##include ") && !line.trim().endsWith("##include")) { - temp = line.split(" ", 2)[1]; - try { - line = FileUtils.readFile(filedata.getParent() - + "./" + temp); - } catch (IOException ex) { - outputBox.append("Error: Cannot read " - + "referenced script file: " + ex.getMessage() - + "\n"); - } + if (line.startsWith(pre + "include ") + && !line.trim().endsWith(pre + "include")) { + temp = line.split(" ", 2)[1]; + try { + line = loadExternalScripts(FileUtils.readFile( + filedata.getParent() + + "./" + temp), lang); + } catch (IOException ex) { + outputBox.append("Error: Cannot read " + + "referenced script file: " + ex.getMessage() + + "\n"); } } result += line + "\n"; diff --git a/src/net/apocalypselabs/symat/Debug.java b/src/net/apocalypselabs/symat/Debug.java index 2e7a7c6..fb9c91f 100644 --- a/src/net/apocalypselabs/symat/Debug.java +++ b/src/net/apocalypselabs/symat/Debug.java @@ -53,7 +53,7 @@ package net.apocalypselabs.symat; public class Debug { // If output should be on or off - public static final boolean DEBUG = true; + public static final boolean DEBUG = false; public static void println(Object data) { if (DEBUG) { diff --git a/src/net/apocalypselabs/symat/MainGUI.form b/src/net/apocalypselabs/symat/MainGUI.form index 25ee750..efe5e15 100644 --- a/src/net/apocalypselabs/symat/MainGUI.form +++ b/src/net/apocalypselabs/symat/MainGUI.form @@ -313,6 +313,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/net/apocalypselabs/symat/MainGUI.java b/src/net/apocalypselabs/symat/MainGUI.java index 4759824..5d79d3c 100644 --- a/src/net/apocalypselabs/symat/MainGUI.java +++ b/src/net/apocalypselabs/symat/MainGUI.java @@ -56,7 +56,6 @@ import java.awt.event.WindowEvent; import java.beans.PropertyVetoException; import java.io.File; import java.io.IOException; -import java.net.URISyntaxException; import java.util.Calendar; import java.util.Date; import javax.swing.ImageIcon; @@ -121,6 +120,9 @@ public class MainGUI extends javax.swing.JFrame { setButtonShortcuts(); + // Disable community tab + tabs.remove(2); + // Open initial windows boolean loaded = false; if (!argfile.equals("")) { @@ -318,6 +320,9 @@ public class MainGUI extends javax.swing.JFrame { arrangeWindowsBtn = new javax.swing.JButton(); closeAllBtn = new javax.swing.JButton(); displaySettingsBtn = new javax.swing.JButton(); + jPanel5 = new javax.swing.JPanel(); + wikiBtn = new javax.swing.JButton(); + jLabel4 = new javax.swing.JLabel(); mainPane = mainPane = new javax.swing.JDesktopPane() { @Override protected void paintComponent(Graphics g) { @@ -514,6 +519,48 @@ public class MainGUI extends javax.swing.JFrame { tabs.addTab("Window", jPanel2); + jPanel5.setFocusable(false); + jPanel5.setOpaque(false); + + wikiBtn.setIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/images/wiki.png"))); // NOI18N + wikiBtn.setText("Wiki"); + wikiBtn.setBorder(javax.swing.BorderFactory.createEmptyBorder(5, 5, 5, 5)); + wikiBtn.setFocusable(false); + wikiBtn.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); + wikiBtn.setOpaque(false); + wikiBtn.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM); + wikiBtn.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + wikiBtnActionPerformed(evt); + } + }); + + jLabel4.setFont(MainGUI.ubuntuRegular.deriveFont(11.0F)); + jLabel4.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING); + jLabel4.setText(namemark()); + jLabel4.setFocusable(false); + + javax.swing.GroupLayout jPanel5Layout = new javax.swing.GroupLayout(jPanel5); + jPanel5.setLayout(jPanel5Layout); + jPanel5Layout.setHorizontalGroup( + jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel5Layout.createSequentialGroup() + .addContainerGap() + .addComponent(wikiBtn) + .addGap(18, 18, 18) + .addComponent(jLabel4, javax.swing.GroupLayout.DEFAULT_SIZE, 610, Short.MAX_VALUE)) + ); + jPanel5Layout.setVerticalGroup( + jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel5Layout.createSequentialGroup() + .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(wikiBtn) + .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, 65, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + ); + + tabs.addTab("Community", jPanel5); + mainPane.setBackground(new java.awt.Color(204, 204, 204)); mainPane.setAutoscrolls(true); mainPane.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR)); @@ -720,6 +767,10 @@ public class MainGUI extends javax.swing.JFrame { } }//GEN-LAST:event_recentItemsTitleMouseClicked + private void wikiBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_wikiBtnActionPerformed + //loadFrame(new Wiki()); + }//GEN-LAST:event_wikiBtnActionPerformed + /* End the button handlers. */ @@ -866,8 +917,10 @@ public class MainGUI extends javax.swing.JFrame { public static javax.swing.JLabel jLabel1; public static javax.swing.JLabel jLabel2; public static javax.swing.JLabel jLabel3; + public static javax.swing.JLabel jLabel4; public static javax.swing.JPanel jPanel2; public static javax.swing.JPanel jPanel4; + public static javax.swing.JPanel jPanel5; public static javax.swing.JScrollPane jScrollPane1; public static javax.swing.JDesktopPane mainPane; public static javax.swing.JButton recentFileBtn; @@ -876,5 +929,6 @@ public class MainGUI extends javax.swing.JFrame { public static javax.swing.JLabel recentItemsTitle; public static javax.swing.JButton shellBtn; public static javax.swing.JTabbedPane tabs; + public static javax.swing.JButton wikiBtn; // End of variables declaration//GEN-END:variables } diff --git a/src/net/apocalypselabs/symat/images/wiki.png b/src/net/apocalypselabs/symat/images/wiki.png new file mode 100644 index 0000000000000000000000000000000000000000..2069e4a2d173a92a943e61229461747ee95857bf GIT binary patch literal 2007 zcmV;|2PpW7P)^V#^Ck&o@w;?AFgoM zNE}BPKB7V?BZ+ua508F$erj~|H9=97y$?P0^~b*T%IS%%hTEw8^7wa-DT;D~c>Vs< zzwWzQS5;e=+iIwd%0hfj_{M?GS+1tR)B14&2Y^a<>YuL8}j23UA1#!Ucf>0fW0b$%NU2Z+2#1fJuFXepodoY(^6 zmURIHV6>nzfLLr81>pg3wz{x5u#8*go7gMDF!D^uX0y~*`>QxP`-`6i&YgK}muXh- zZAza0^Skd^IVdg8V*|9-pcUZu)hq6oo_pp1DP&1j)!c91yZp`yq1oIpz*tBo4Iyvj z82|{d1i;yi0ie}?k1k0PZ%(AAQZDNluJA=y+juL~@Iqupb;>da0E7^DyiJ-wz^_+Y zDT+*i8PF+o2M4)yfYnLcjvczHsxT)4z^CJJxzg><7x@UlmrTT!mYx|114+eWilQi{ zKQ#H;G8}`*l>}=o$sCZ?7_=gMjvD>&5m`WwFUxN)#U;hD+Umoo^rX}?&PX9 zyu#^IEJ*-bGO1V-((G%~cn&W2X8Z20uBbzjDF9nZrsrd-E%R+YO#p<_y|K6r zL1PBOl!BV=MR*FZ7)7KO@Q7St=?amXj+)y1>G9x@Y-TDkJF9X)yfnSNZ~b9=aNt&* z2?fKr+j;202w*QGJ)N>;-WS-ebAZ4s2OR;BqsT@Wrg9XvJD6?34F+S5BE$fL0|Wwy z1Q0nu-~pl4AJ7yR>m;ZE0I#n#Yc4YYfPJYqVa%`W6+}%p~A*oQ`Wqg=@i*XiV-IVxr#?^y~oQb zs%qVwVopm-lB`ewn3-MVUe_`L0E`a@YwtgFc+MP{ibYj3$W$tYc|9AQ zG!RT0NUjIHA$U_V6k3L25^zlQ{r$3El^j(qEiGtnZpQrVth%kaH3I;_ft&RvP-S(E zcJH3f*?;uB(+mK_FdWk(!&S|JK+2%V4h($2U%GS&LqkIt92~@n*WVo44EToOEy6OK z80tNDt_oNziy6kxJ^AhLPQ^o0%CAnpx>J@UD2jsaC%-yU)pk$l@|Azqh9)PR>2w;s zm){qk|LyPla}2qcPrcMUJ@O#{fa7_(@5n>5n`FUCua`At=bp|;F%rgb{mT1F+(7ij zWXx7-dLV@VmPXOk4Gwt_uJlIi1`Hx4pM3EaF9^#v z<)`-SUD4M@q%8P*_jS!zR@bDhZAwL@_Uuny9$0OR@00E6gI`*zeN#FgJTg@d15hSB z0DR)JpR;A`k*A-%QCjPz^378}y(!7g;suKr1bU$R(X#3t*!)YXD9@dG_20t-H-n~r z@X=%ILNqkB=&zi+_@~*aNf`i~u8Mp`m3z&A*Ajsl<^4t5-`*_m`iOkMqBE{tKz3%>kC{Aawu$002ovPDHLkV1ntQ%@6