Merge remote-tracking branch 'origin/master'

abdalmoniem · Jan 28, 2018 · c2610da · c2610da
2 parents 86d8e67 + 9e41f00
commit c2610da
Show file tree

Hide file tree

Showing 7 changed files with 267 additions and 173 deletions.
diff --git a/Binaries/Linux/AVR4L.jar b/Binaries/Linux/AVR4L.jar
diff --git a/Binaries/Windows/portable/AVR4L.jar b/Binaries/Windows/portable/AVR4L.jar
diff --git a/Binaries/avr4l_linux.tar.bz2 b/Binaries/avr4l_linux.tar.bz2
diff --git a/README.md b/README.md
@@ -37,14 +37,10 @@ AVR4L aims to deliver an easy to use and user friendly Integrated Development En
 
 	The project's full focus is on the linux version as it aims to be an alternative to Atmel's Studio for linux users.
 
-
-### Mac OSX:
-further development and testing is needed.
-
 ## Features:
-1. Cross platform (Linux, Mac OSX, Windows)
+1. Cross platform (Linux, Windows)
 2. Creative coding environment with auto-complete, suggestions and many more features.
-3. Two options for compiling your code:
+3. Two options for compiling and uploading your code:
 	1. standard mode.
 	2. makefile mode.
 4. Compiling .c files of various atmega parts or microcontrollers.

diff --git a/Source Code/AVR4L/build/built-jar.properties b/Source Code/AVR4L/build/built-jar.properties
@@ -1,4 +1,4 @@
-#Tue, 07 Nov 2017 18:26:49 +0200
+#Fri, 01 Dec 2017 17:57:54 +0200
 
 
 /home/mn3m/GitHub/AVR4L/Source\ Code/AVR4L=
diff --git a/Source Code/AVR4L/src/mainPckg/Main_Frame.form b/Source Code/AVR4L/src/mainPckg/Main_Frame.form
@@ -286,7 +286,8 @@
             </Property>
           </Properties>
           <Events>
-            <EventHandler event="itemStateChanged" listener="java.awt.event.ItemListener" parameters="java.awt.event.ItemEvent" handler="pref_style_combo_bxItemStateChanged"/>
+            <EventHandler event="popupMenuWillBecomeVisible" listener="javax.swing.event.PopupMenuListener" parameters="javax.swing.event.PopupMenuEvent" handler="pref_style_combo_bxPopupMenuWillBecomeVisible"/>
+            <EventHandler event="popupMenuWillBecomeInvisible" listener="javax.swing.event.PopupMenuListener" parameters="javax.swing.event.PopupMenuEvent" handler="pref_style_combo_bxPopupMenuWillBecomeInvisible"/>
           </Events>
           <AuxValues>
             <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/>
@@ -641,59 +642,39 @@
             <Property name="text" type="java.lang.String" value="View"/>
           </Properties>
           <SubComponents>
-            <Menu class="javax.swing.JMenu" name="font_menu">
+            <MenuItem class="javax.swing.JMenuItem" name="def_font_item">
               <Properties>
-                <Property name="text" type="java.lang.String" value="Font"/>
+                <Property name="accelerator" type="javax.swing.KeyStroke" editor="org.netbeans.modules.form.editors.KeyStrokeEditor">
+                  <KeyStroke key="Ctrl+0"/>
+                </Property>
+                <Property name="text" type="java.lang.String" value="Default font size"/>
               </Properties>
-              <SubComponents>
-                <MenuItem class="javax.swing.JMenuItem" name="choose_font_item">
-                  <Properties>
-                    <Property name="accelerator" type="javax.swing.KeyStroke" editor="org.netbeans.modules.form.editors.KeyStrokeEditor">
-                      <KeyStroke key="Ctrl+SEMICOLON"/>
-                    </Property>
-                    <Property name="text" type="java.lang.String" value="Choose font"/>
-                  </Properties>
-                  <Events>
-                    <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="choose_font_itemActionPerformed"/>
-                  </Events>
-                </MenuItem>
-                <MenuItem class="javax.swing.JPopupMenu$Separator" name="font_menu_sep">
-                </MenuItem>
-                <MenuItem class="javax.swing.JMenuItem" name="def_font_item">
-                  <Properties>
-                    <Property name="accelerator" type="javax.swing.KeyStroke" editor="org.netbeans.modules.form.editors.KeyStrokeEditor">
-                      <KeyStroke key="Ctrl+0"/>
-                    </Property>
-                    <Property name="text" type="java.lang.String" value="Default size"/>
-                  </Properties>
-                  <Events>
-                    <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="def_font_itemActionPerformed"/>
-                  </Events>
-                </MenuItem>
-                <MenuItem class="javax.swing.JMenuItem" name="inc_font_item">
-                  <Properties>
-                    <Property name="accelerator" type="javax.swing.KeyStroke" editor="org.netbeans.modules.form.editors.KeyStrokeEditor">
-                      <KeyStroke key="Ctrl+EQUALS"/>
-                    </Property>
-                    <Property name="text" type="java.lang.String" value="Increase font size"/>
-                  </Properties>
-                  <Events>
-                    <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="inc_font_itemActionPerformed"/>
-                  </Events>
-                </MenuItem>
-                <MenuItem class="javax.swing.JMenuItem" name="dec_font_item">
-                  <Properties>
-                    <Property name="accelerator" type="javax.swing.KeyStroke" editor="org.netbeans.modules.form.editors.KeyStrokeEditor">
-                      <KeyStroke key="Ctrl+MINUS"/>
-                    </Property>
-                    <Property name="text" type="java.lang.String" value="Decrease font size"/>
-                  </Properties>
-                  <Events>
-                    <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="dec_font_itemActionPerformed"/>
-                  </Events>
-                </MenuItem>
-              </SubComponents>
-            </Menu>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="def_font_itemActionPerformed"/>
+              </Events>
+            </MenuItem>
+            <MenuItem class="javax.swing.JMenuItem" name="inc_font_item">
+              <Properties>
+                <Property name="accelerator" type="javax.swing.KeyStroke" editor="org.netbeans.modules.form.editors.KeyStrokeEditor">
+                  <KeyStroke key="Ctrl+EQUALS"/>
+                </Property>
+                <Property name="text" type="java.lang.String" value="Increase font size"/>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="inc_font_itemActionPerformed"/>
+              </Events>
+            </MenuItem>
+            <MenuItem class="javax.swing.JMenuItem" name="dec_font_item">
+              <Properties>
+                <Property name="accelerator" type="javax.swing.KeyStroke" editor="org.netbeans.modules.form.editors.KeyStrokeEditor">
+                  <KeyStroke key="Ctrl+MINUS"/>
+                </Property>
+                <Property name="text" type="java.lang.String" value="Decrease font size"/>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="dec_font_itemActionPerformed"/>
+              </Events>
+            </MenuItem>
           </SubComponents>
         </Menu>
         <Menu class="javax.swing.JMenu" name="build_opts_menu">
@@ -1084,7 +1065,7 @@
     <Component class="javax.swing.JLabel" name="iteration_label">
       <Properties>
         <Property name="horizontalAlignment" type="int" value="4"/>
-        <Property name="text" type="java.lang.String" value="Iteration: 41,395"/>
+        <Property name="text" type="java.lang.String" value="Iteration: 53,007"/>
       </Properties>
     </Component>
     <Container class="javax.swing.JTabbedPane" name="tab_pane">