Merge branch 'master' of gitlab.com:pH-7/Simple-Java-Text-Editor

Author: pH-7

README.md

@@ -5,41 +5,41 @@
 ![Programming Java Text Editor](Screenshots/text-editor-writing-icon.svg)
 
 
-- Search tool (to search text/keywords easily in the code) + highlighting the code found
+* Search tool (to search text/keywords easily in the code) + highlighting the code found.
 
-- Find/Replace text/code
+* Find/Replace text/code.
 
-- Auto completion for Java and C++ keywords (files need to be saved as *.java*/*.cpp*). It can be easily expanded to support pretty much any number of languages.
+* Auto completion for Java and C++ keywords (files need to be saved as *.java*/*.cpp*). It can be easily expanded to support pretty much any number of languages.
 
-- Nice image buttons for better UX
+* Nice image buttons for better UX.
 
 
 ![Example Java Text Editor](Screenshots/find-replace-word-in-java-text-editor.png)
 
 
 ## AUTHOR
 
-[Pierre-Henry Soria](https://github.com/pH-7)
+**[Pierre-Henry Soria](http://pierrehenry.be)**
 
 
-### Contributors
+### Contributors 🏅
 
-- [Achintha Gunasekara](https://github.com/achinthagunasekara)
+* [Achintha Gunasekara](https://github.com/achinthagunasekara)
 
-- [Patrick Slagle](https://github.com/patrick-slagle)
+* [Patrick Slagle](https://github.com/patrick-slagle)
 
-- [Marcus Redgrave-Close](https://github.com/marcusjrc)
+* [Marcus Redgrave-Close](https://github.com/marcusjrc)
 
-- [Ossi Laukkanen](https://github.com/Fitoh)
+* [Ossi Laukkanen](https://github.com/Fitoh)
 
-- [Akashdeep Singh](https://github.com/akashdeepsingh9988)
+* [Akashdeep Singh](https://github.com/akashdeepsingh9988)
 
 
 ## CONTACT
 
-Pierre-Henry SORIA: pierrehenrysoria [AT] gmail [D0T] com
+* Pierre-Henry Soria: hi [AT] ph7 [D0T] me
 
-Achintha Gunasekara: contact [AT] achinthagunasekara [D0T] com
+* Achintha Gunasekara: contact [AT] achinthagunasekara [D0T] com
 
 
 ## DEMO

icons/bold.png

@@ -14,7 +14,7 @@
  * @modifiedby  Achintha Gunasekara
  * @modweb      http://www.achinthagunasekara.com
  * @modemail    [email protected]
- * 
+ *
  * @Modifiedby SidaDan
  * @modemail [email protected]
  * Bug fixed. If JTextArea txt not empty and the user will
@@ -42,15 +42,15 @@ public About(UI ui) {
         panel = new JPanel(new FlowLayout());
         panel.setBorder(BorderFactory.createEmptyBorder(8, 8, 8, 8));
         frame = new JFrame();
-        
+
         frame.addWindowListener(new WindowAdapter() {
             @Override
             public void windowClosing(WindowEvent e) {
                 frame.dispose();
             }
         });
 
-        
+
         frame.setVisible(true);
         frame.setSize(500,300);
         frame.setLocationRelativeTo(ui);

icons/italic.png

@@ -14,7 +14,7 @@
  * @modifiedby  Achintha Gunasekara
  * @modweb      http://www.achinthagunasekara.com
  * @modemail    [email protected]
- * 
+ *
  * @Modifiedby SidaDan
  * @modemail [email protected]
  * Center this JFrame to the JTextArea
@@ -23,7 +23,7 @@
  * is only hidden (still running). We need DISPOSE_ON_CLOSE for
  * this JFrame.
  * Tested with java 8.
- * 
+ *
  * @Modifiedby SidaDan
  * @modemail [email protected]
  * Removed unsused imports
@@ -45,7 +45,6 @@ public class Find extends JFrame implements ActionListener {
     JButton findBtn, findNext, replace, replaceAll, cancel;
     private JTextArea txt;
 
-
     public Find(JTextArea text) {
         this.txt = text;
 

src/simplejavatexteditor/About.java

@@ -23,7 +23,7 @@
 public class SimpleJavaTextEditor extends JTextPane {
 
     private static final long serialVersionUID = 1L;
-    public final static String AUTHOR_EMAIL = "[email protected]";
+    public final static String AUTHOR_EMAIL = "[email protected]";
     public final static String NAME = "PHNotePad";
         public final static String EDITOR_EMAIL = "[email protected]";
     public final static double VERSION = 3.0;
@@ -35,4 +35,4 @@ public static void main(String[] args) {
         new UI().setVisible(true);
     }
 
-}
+}

src/simplejavatexteditor/Find.java

@@ -31,6 +31,9 @@
  * @modemail [email protected]
  * Removed unuse objects like container,  Border emptyBorder
  * Removed unsused imports
+ *
+ * @Modifiedby Giorgos Pasentsis
+ * @modemail [email protected]
  */
 package simplejavatexteditor;
 
@@ -55,9 +58,13 @@ public class UI extends JFrame implements ActionListener {
     private final JMenuItem newFile, openFile, saveFile, close, cut, copy, paste, clearFile, selectAll, quickFind,
             aboutMe, aboutSoftware, wordWrap;
     private final JToolBar mainToolbar;
-    JButton newButton, openButton, saveButton, clearButton, quickButton, aboutMeButton, aboutButton, closeButton;
+    JButton newButton, openButton, saveButton, clearButton, quickButton, aboutMeButton, aboutButton, closeButton, boldButton, italicButton;
     private final Action selectAllAction;
 
+    //setup icons - Bold and Italic
+     private final ImageIcon boldIcon = new ImageIcon("icons/bold.png");
+     private final ImageIcon italicIcon = new ImageIcon("icons/italic.png");
+
     // setup icons - File Menu
     private final ImageIcon newIcon = new ImageIcon("icons/new.png");
     private final ImageIcon openIcon = new ImageIcon("icons/open.png");
@@ -86,9 +93,8 @@ public class UI extends JFrame implements ActionListener {
     private boolean edit = false;
 
     public UI() {
-
         // Set the initial size of the window
-        setSize(700, 500);
+        setSize(800, 500);
 
         // Set the title of the window
         setTitle("Untitled | " + SimpleJavaTextEditor.NAME);
@@ -101,9 +107,9 @@ public UI() {
 
         // Set a default font for the TextArea
         textArea = new JTextArea("", 0, 0);
-        textArea.setFont(new Font("Century Gothic", Font.BOLD, 12));
+        textArea.setFont(new Font("Century Gothic", Font.PLAIN, 12));
         textArea.setTabSize(2);
-        textArea.setFont(new Font("Century Gothic", Font.BOLD, 12));
+        textArea.setFont(new Font("Century Gothic", Font.PLAIN, 12));
         textArea.setTabSize(2);
 
         /* SETTING BY DEFAULT WORD WRAP ENABLED OR TRUE */
@@ -312,6 +318,17 @@ public void actionPerformed(ActionEvent ev) {
         mainToolbar.add(closeButton);
         mainToolbar.addSeparator();
 
+        boldButton = new JButton(boldIcon);
+        boldButton.setToolTipText("Bold");
+        boldButton.addActionListener(this);
+        mainToolbar.add(boldButton);
+        mainToolbar.addSeparator();
+
+        italicButton = new JButton(italicIcon);
+        italicButton.setToolTipText("Italic");
+        italicButton.addActionListener(this);
+        mainToolbar.add(italicButton);
+        mainToolbar.addSeparator();
         /**
          * **************** FONT SETTINGS SECTION **********************
          */
@@ -361,7 +378,6 @@ public void actionPerformed(ActionEvent ev) {
 
                 Font font1 = new Font(fontFamily, Font.PLAIN, sizeOfFont);
                 textArea.setFont(font1);
-
             }
         });
         //FONT SIZE SETTINGS SECTION END
@@ -485,8 +501,21 @@ else if (e.getSource() == openFile || e.getSource() == openButton) {
         } // If the source of the event was the "save" option
         else if (e.getSource() == saveFile || e.getSource() == saveButton) {
             saveFile();
+        }// If the source of the event was the "Bold" button
+        else if (e.getSource() == boldButton) {
+            if (textArea.getFont().getStyle() == Font.BOLD){
+                textArea.setFont(textArea.getFont().deriveFont(Font.PLAIN));
+            } else {
+                textArea.setFont(textArea.getFont().deriveFont(Font.BOLD));
+            }
+        }// If the source of the event was the "Italic" button
+        else if (e.getSource() == italicButton) {
+            if (textArea.getFont().getStyle() == Font.ITALIC){
+                textArea.setFont(textArea.getFont().deriveFont(Font.PLAIN));
+            } else {
+                textArea.setFont(textArea.getFont().deriveFont(Font.ITALIC));
+            }
         }
-
         // Clear File (Code)
         if (e.getSource() == clearFile || e.getSource() == clearButton) {
 
@@ -507,7 +536,6 @@ else if (e.getSource() == aboutMe || e.getSource() == aboutMeButton) {
         else if (e.getSource() == aboutSoftware || e.getSource() == aboutButton) {
             new About(this).software();
         }
-
     }
 
     class SelectAllAction extends AbstractAction {
@@ -555,4 +583,5 @@ private void saveFile() {
             }
         }
     }
+
 }