From 9324818e7781856e372aa0be049e5857531bff02 Mon Sep 17 00:00:00 2001 From: skylarmt Date: Thu, 19 Feb 2015 17:24:51 -0700 Subject: [PATCH] Pad URLs now include theme parameter for theming --- src/net/apocalypselabs/symat/CodeEditor.java | 4 +--- src/net/apocalypselabs/symat/Pads.java | 14 +++++++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/net/apocalypselabs/symat/CodeEditor.java b/src/net/apocalypselabs/symat/CodeEditor.java index 5247a5f..1d42b1e 100644 --- a/src/net/apocalypselabs/symat/CodeEditor.java +++ b/src/net/apocalypselabs/symat/CodeEditor.java @@ -813,9 +813,7 @@ public class CodeEditor extends javax.swing.JInternalFrame { try { String padid = Pads.genPad(id, codeBox.getText()); Pads.addPad(padid); - MainGUI.loadFrame(new WebBrowser("Pad " + padid, - Pads.PADS_URL + "/p/" + padid, - WebBrowser.PAD_LOGO)); + Pads.loadPad(padid); JOptionPane.showInternalMessageDialog(this, new SharePad(padid), "Share Pad", diff --git a/src/net/apocalypselabs/symat/Pads.java b/src/net/apocalypselabs/symat/Pads.java index 50bbe93..503535c 100644 --- a/src/net/apocalypselabs/symat/Pads.java +++ b/src/net/apocalypselabs/symat/Pads.java @@ -243,6 +243,16 @@ public class Pads extends javax.swing.JInternalFrame { } } + public static void loadPad(String pad) { + String theme = ""; + if (PrefStorage.getSetting("theme").equals("dark")) { + theme = "?theme=terminal"; + } + MainGUI.loadFrame(new WebBrowser("Pad " + pad, + PADS_URL + "/p/" + pad + theme, + WebBrowser.PAD_LOGO)); + } + /** * This method is called from within the constructor to initialize the form. * WARNING: Do NOT modify this code. The content of this method is always @@ -429,9 +439,7 @@ public class Pads extends javax.swing.JInternalFrame { }//GEN-LAST:event_previewBtnActionPerformed private void openBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_openBtnActionPerformed - MainGUI.loadFrame(new WebBrowser("Pad " + getSelectedPad(), - PADS_URL + "/p/" + getSelectedPad(), - WebBrowser.PAD_LOGO)); + loadPad(getSelectedPad()); }//GEN-LAST:event_openBtnActionPerformed private void purgeBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_purgeBtnActionPerformed