diff --git a/app/Editor.java b/app/Editor.java index 0dffc7fbb..c5a23302e 100644 --- a/app/Editor.java +++ b/app/Editor.java @@ -868,11 +868,27 @@ public class Editor extends JFrame JMenu menu = new JMenu("Help"); JMenuItem item; - item = new JMenuItem("Howto"); + if (!Base.isLinux()) { + item = new JMenuItem("Getting Started"); + item.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + if (Base.isWindows()) + Base.openURL(System.getProperty("user.dir") + File.separator + + "reference" + File.separator + "Guide_Windows.html"); + else + Base.openURL(System.getProperty("user.dir") + File.separator + + "reference" + File.separator + "Guide_MacOSX.html"); + } + }); + menu.add(item); + } + + item = new JMenuItem("Troubleshooting"); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { Base.openURL(System.getProperty("user.dir") + File.separator + - "reference" + File.separator + "howto.html"); + "reference" + File.separator + + "Guide_Troubleshooting.html"); } }); menu.add(item); @@ -881,7 +897,7 @@ public class Editor extends JFrame item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { Base.openURL(System.getProperty("user.dir") + File.separator + - "reference" + File.separator + "environment.html"); + "reference" + File.separator + "Guide_Environment.html"); } }); menu.add(item); @@ -890,7 +906,7 @@ public class Editor extends JFrame item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { Base.openURL(System.getProperty("user.dir") + File.separator + - "reference" + File.separator + "index.html"); + "reference" + File.separator + "index.html"); } }); menu.add(item); @@ -899,7 +915,7 @@ public class Editor extends JFrame item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { Base.openURL(System.getProperty("user.dir") + File.separator + - "reference" + File.separator + "FAQ.html"); + "reference" + File.separator + "FAQ.html"); } }); menu.add(item); diff --git a/build/fetch.sh b/build/fetch.sh index 5d635fa04..49870fc0a 100755 --- a/build/fetch.sh +++ b/build/fetch.sh @@ -7,14 +7,16 @@ mkdir reference cd reference -curl http://www.arduino.cc/en/Main/Howto -o howto.html +curl http://www.arduino.cc/en/Guide/HomePage -o Guide_index.html curl http://www.arduino.cc/en/Main/FAQ -o FAQ.html curl http://arduino.cc/en/Main/Environment -o environment.html curl http://www.arduino.cc/en/Reference/HomePage -o index.html curl http://www.arduino.cc/en/pub/skins/arduino/arduino.css -o arduino.css +for i in `grep -o "http://www.arduino.cc/en/Guide/[^']*" Guide_index.html | sort -u | grep -v '?' | cut -d '/' -f 6`; do curl http://www.arduino.cc/en/Guide/$i -o Guide_$i.html; done for i in `grep -o "http://www.arduino.cc/en/Reference/[^']*" index.html | sort -u | grep -v '?' | cut -d '/' -f 6`; do curl http://www.arduino.cc/en/Reference/$i -o $i.html; done for i in `grep -o "http://www.arduino.cc/en/Serial/[^']*" index.html | sort -u | grep -v '?' | cut -d '/' -f 6`; do curl http://www.arduino.cc/en/Serial/$i -o Serial_$i.html; done perl -i -pe "s|http://www.arduino.cc/en/Reference/[^?\"']*\?[^'\"]*|#|g" *.html # replace links to unknown pages with links to '#' +perl -i -pe "s|http://www.arduino.cc/en/Guide/([^']*)|Guide_\1.html|g" *.html # replace links to remote guide with links to local guide perl -i -pe "s|http://www.arduino.cc/en/Reference/([^']*)|\1.html|g" *.html # replace links to remote reference with links to local reference perl -i -pe "s|http://www.arduino.cc/en/Serial/([^']*)|Serial_\1.html|g" *.html # replace links to remove serial reference with links to local serial reference perl -i -pe "s|http://www.arduino.cc/en/pub/skins/arduino/arduino.css|arduino.css|g" *.html @@ -22,4 +24,4 @@ perl -i -pe "s|HomePage.html|index.html|g" *.html perl -i -pe "s|href=\"/\"|href=\"http://www.arduino.cc/\"|g" *.html cd .. zip -r shared/reference.zip reference -rm -rf reference +#rm -rf reference diff --git a/build/macosx/Arduino.xcodeproj/project.pbxproj b/build/macosx/Arduino.xcodeproj/project.pbxproj index f820740ba..596240bee 100644 --- a/build/macosx/Arduino.xcodeproj/project.pbxproj +++ b/build/macosx/Arduino.xcodeproj/project.pbxproj @@ -458,7 +458,6 @@ 33FF02960965BD160016AC38 /* makefile.w2k */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = makefile.w2k; sourceTree = ""; }; 33FF02970965BD160016AC38 /* makefile.win */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = makefile.win; sourceTree = ""; }; 33FF02990965BD160016AC38 /* FTDI USB Drivers.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = "FTDI USB Drivers.zip"; sourceTree = ""; }; - 33FF029A0965BD160016AC38 /* KeyspanUSA19wWinV31.exe */ = {isa = PBXFileReference; lastKnownFileType = file; path = KeyspanUSA19wWinV31.exe; sourceTree = ""; }; 33FF029B0965BD160016AC38 /* ICE_JNIRegistry.dll */ = {isa = PBXFileReference; lastKnownFileType = file; path = ICE_JNIRegistry.dll; sourceTree = ""; }; 33FF029C0965BD160016AC38 /* jikes.exe */ = {isa = PBXFileReference; lastKnownFileType = file; path = jikes.exe; sourceTree = ""; }; 33FF029E0965BD170016AC38 /* makefile.w2k */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = makefile.w2k; sourceTree = ""; }; @@ -576,7 +575,6 @@ 33FFFE930965BD110016AC38 /* .cvsignore */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = .cvsignore; sourceTree = ""; }; 33FFFE940965BD110016AC38 /* Arduino.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = Arduino.xcodeproj; sourceTree = ""; }; 33FFFEAF0965BD110016AC38 /* burn.command */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = burn.command; sourceTree = ""; }; - 33FFFEB40965BD110016AC38 /* KeyspanUSAdrvr20.dmg */ = {isa = PBXFileReference; lastKnownFileType = file; path = KeyspanUSAdrvr20.dmg; sourceTree = ""; }; 33FFFEB50965BD110016AC38 /* DS_Store */ = {isa = PBXFileReference; lastKnownFileType = file; path = DS_Store; sourceTree = ""; }; 33FFFEB60965BD110016AC38 /* jikes */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = jikes; sourceTree = ""; }; 33FFFEB90965BD110016AC38 /* macosx_setup.command */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = macosx_setup.command; sourceTree = ""; }; @@ -720,7 +718,6 @@ isa = PBXGroup; children = ( 33FF02990965BD160016AC38 /* FTDI USB Drivers.zip */, - 33FF029A0965BD160016AC38 /* KeyspanUSA19wWinV31.exe */, ); path = drivers; sourceTree = ""; @@ -1014,7 +1011,6 @@ children = ( 338C47870AA204B0008F2C0D /* FTDIUSBSerialDriver_v2_1_6.dmg */, 338C47880AA204B0008F2C0D /* FTDIUSBSerialDriver_v2_2_6_Intel.dmg */, - 33FFFEB40965BD110016AC38 /* KeyspanUSAdrvr20.dmg */, ); path = drivers; sourceTree = ""; diff --git a/build/shared/reference.zip b/build/shared/reference.zip index 8add787a8..94caa1b41 100644 Binary files a/build/shared/reference.zip and b/build/shared/reference.zip differ