From f853f014813317c563f0d434c6d8480723f97a0e Mon Sep 17 00:00:00 2001 From: "Timothy J. Warren" Date: Wed, 8 Apr 2015 10:04:46 -0400 Subject: [PATCH] Update Netbeans project and Readme --- README.md | 7 +- nbproject/configurations.xml | 115 +++-- nbproject/private/Default.properties | 6 + nbproject/private/configurations.xml | 678 +-------------------------- nbproject/private/private.xml | 8 + nbproject/project.xml | 2 +- 6 files changed, 75 insertions(+), 741 deletions(-) diff --git a/README.md b/README.md index 157d232..f8af274 100644 --- a/README.md +++ b/README.md @@ -12,9 +12,8 @@ A Cross-platform Code Editor ### Building * Make sure wxWidgets is installed, version 2.8 or 3 -#### Mac -* run `make clean Tyro.app` +#### Mac and Linux +Use either the Netbeans project, or the makefile. -#### Linux -* use the Code::Blocks project to compile +On OS X, `make Tyro.app` will create the app bundle. diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index 83156aa..0c781ed 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -2,7 +2,13 @@ + + jsoncpp.cpp + + + SFTP.cpp + EditPane.cpp MainFrame.cpp @@ -30,6 +36,9 @@ false false + + + @@ -40,77 +49,65 @@ - - - - src/widgets - /usr/include/c++/4.2.1/bits - /usr/include/c++/4.2.1 - /usr/include/c++/4.2.1/ext - /usr/local/include/wx-3.0/wx - /usr/local/include/wx-3.0/wx/osx - /usr/include/c++/4.2.1/tr1 - /usr/local/include/wx-3.0/wx/osx/core - /usr/local/include/wx-3.0/wx/osx/carbon - /usr/local/include/wx-3.0/wx/generic - - - - + src - /usr/include/c++/4.2.1/bits - /usr/include/c++/4.2.1 - /usr/include/c++/4.2.1/ext - /usr/local/include/wx-3.0/wx - /usr/local/include/wx-3.0/wx/unix - /usr/include/c++/4.2.1/tr1 - /usr/local/include/wx-3.0/wx/osx - /usr/local/include/wx-3.0/wx/osx/core - /usr/local/include/wx-3.0/wx/osx/carbon - /usr/local/include/wx-3.0/wx/generic - /usr/local/include/wx-3.0/wx/meta - /usr/local/include/wx-3.0/wx/aui - src/widgets - /usr/local/include/wx-3.0/wx/stc - /usr/include/c++/4.2.1/debug + include . + + + + + src + include + . + + + + + + + /usr/lib/x86_64-linux-gnu/wx/include/gtk2-unicode-3.0 + /usr/include/wx-3.0 + . + + + WXUSINGDLL + _FILE_OFFSET_BITS=64 + __WXGTK__ + + + + + + + + + + + /usr/lib/x86_64-linux-gnu/wx/include/gtk2-unicode-3.0 + /usr/include/wx-3.0 + . + + + WXUSINGDLL + _FILE_OFFSET_BITS=64 + __WXGTK__ + + + + + + - - - /usr/local/include/wx-3.0/wx/stc - /usr/local/include/wx-3.0/wx/meta - /usr/include/c++/4.2.1/debug - . - - - - - /usr/local/include/wx-3.0/wx/aui - /usr/local/include/wx-3.0/wx/stc - resources/xpm/48 - /usr/local/include/wx-3.0/wx/meta - /usr/include/c++/4.2.1/debug - . - - - - - /usr/local/include/wx-3.0/wx/aui - /usr/local/include/wx-3.0/wx/stc - /usr/local/include/wx-3.0/wx/meta - /usr/include/c++/4.2.1/debug - . - - diff --git a/nbproject/private/Default.properties b/nbproject/private/Default.properties index e69de29..3974a03 100644 --- a/nbproject/private/Default.properties +++ b/nbproject/private/Default.properties @@ -0,0 +1,6 @@ +/home/twarren/Tyro/include/jsoncpp.cpp=/home/twarren/Tyro#-Os -I./src -I./include -fPIC -c -o include/jsoncpp.o include/jsoncpp.cpp +/home/twarren/Tyro/src/widgets/TabContainer.cpp=/home/twarren/Tyro#-I/usr/lib/x86_64-linux-gnu/wx/include/gtk2-unicode-3.0 -I/usr/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -pthread src/TyroApp.cpp src/widgets/MainFrame.cpp src/widgets/EditPane.cpp src/widgets/TabContainer.cpp -ldl build/Tyro.a -L/usr/lib/x86_64-linux-gnu -pthread -lwx_gtk2u_xrc-3.0 -lwx_gtk2u_webview-3.0 -lwx_gtk2u_stc-3.0 -lwx_gtk2u_richtext-3.0 -lwx_gtk2u_ribbon-3.0 -lwx_gtk2u_propgrid-3.0 -lwx_gtk2u_aui-3.0 -lwx_gtk2u_gl-3.0 -lwx_gtk2u_media-3.0 -lwx_gtk2u_html-3.0 -lwx_gtk2u_qa-3.0 -lwx_gtk2u_adv-3.0 -lwx_gtk2u_core-3.0 -lwx_baseu_xml-3.0 -lwx_baseu_net-3.0 -lwx_baseu-3.0 -lssh2 -o build/Tyro +/home/twarren/Tyro/src/widgets/EditPane.cpp=/home/twarren/Tyro#-I/usr/lib/x86_64-linux-gnu/wx/include/gtk2-unicode-3.0 -I/usr/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -pthread src/TyroApp.cpp src/widgets/MainFrame.cpp src/widgets/EditPane.cpp src/widgets/TabContainer.cpp -ldl build/Tyro.a -L/usr/lib/x86_64-linux-gnu -pthread -lwx_gtk2u_xrc-3.0 -lwx_gtk2u_webview-3.0 -lwx_gtk2u_stc-3.0 -lwx_gtk2u_richtext-3.0 -lwx_gtk2u_ribbon-3.0 -lwx_gtk2u_propgrid-3.0 -lwx_gtk2u_aui-3.0 -lwx_gtk2u_gl-3.0 -lwx_gtk2u_media-3.0 -lwx_gtk2u_html-3.0 -lwx_gtk2u_qa-3.0 -lwx_gtk2u_adv-3.0 -lwx_gtk2u_core-3.0 -lwx_baseu_xml-3.0 -lwx_baseu_net-3.0 -lwx_baseu-3.0 -lssh2 -o build/Tyro +/home/twarren/Tyro/src/widgets/MainFrame.cpp=/home/twarren/Tyro#-I/usr/lib/x86_64-linux-gnu/wx/include/gtk2-unicode-3.0 -I/usr/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -pthread src/TyroApp.cpp src/widgets/MainFrame.cpp src/widgets/EditPane.cpp src/widgets/TabContainer.cpp -ldl build/Tyro.a -L/usr/lib/x86_64-linux-gnu -pthread -lwx_gtk2u_xrc-3.0 -lwx_gtk2u_webview-3.0 -lwx_gtk2u_stc-3.0 -lwx_gtk2u_richtext-3.0 -lwx_gtk2u_ribbon-3.0 -lwx_gtk2u_propgrid-3.0 -lwx_gtk2u_aui-3.0 -lwx_gtk2u_gl-3.0 -lwx_gtk2u_media-3.0 -lwx_gtk2u_html-3.0 -lwx_gtk2u_qa-3.0 -lwx_gtk2u_adv-3.0 -lwx_gtk2u_core-3.0 -lwx_baseu_xml-3.0 -lwx_baseu_net-3.0 -lwx_baseu-3.0 -lssh2 -o build/Tyro +/home/twarren/Tyro/src/network/SFTP.cpp=/home/twarren/Tyro#-Os -I./src -I./include -fPIC -c -o src/network/SFTP.o src/network/SFTP.cpp +/home/twarren/Tyro/src/TyroApp.cpp=/home/twarren/Tyro#-I/usr/lib/x86_64-linux-gnu/wx/include/gtk2-unicode-3.0 -I/usr/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -pthread src/TyroApp.cpp src/widgets/MainFrame.cpp src/widgets/EditPane.cpp src/widgets/TabContainer.cpp -ldl build/Tyro.a -L/usr/lib/x86_64-linux-gnu -pthread -lwx_gtk2u_xrc-3.0 -lwx_gtk2u_webview-3.0 -lwx_gtk2u_stc-3.0 -lwx_gtk2u_richtext-3.0 -lwx_gtk2u_ribbon-3.0 -lwx_gtk2u_propgrid-3.0 -lwx_gtk2u_aui-3.0 -lwx_gtk2u_gl-3.0 -lwx_gtk2u_media-3.0 -lwx_gtk2u_html-3.0 -lwx_gtk2u_qa-3.0 -lwx_gtk2u_adv-3.0 -lwx_gtk2u_core-3.0 -lwx_baseu_xml-3.0 -lwx_baseu_net-3.0 -lwx_baseu-3.0 -lssh2 -o build/Tyro diff --git a/nbproject/private/configurations.xml b/nbproject/private/configurations.xml index 91aef29..57395ff 100644 --- a/nbproject/private/configurations.xml +++ b/nbproject/private/configurations.xml @@ -20,688 +20,12 @@ - address-book-alt.xpm - address-book.xpm - bag.xpm - basket.xpm - beer.xpm - bell.xpm - bitcoin.xpm - book-bookmark.xpm - book.xpm - box-full.xpm - box-in.xpm - box-out.xpm - box.xpm - brick-alt.xpm - brick.xpm - bubble.xpm - bubbles-alt.xpm - bubbles.xpm - building.xpm - bullhorn.xpm - calculator.xpm - calendar-clock.xpm - calendar.xpm - carton.xpm - cat.xpm - clock.xpm - cloud-down.xpm - cloud-sync.xpm - cloud-up.xpm - cloud.xpm - cog.xpm - cogs.xpm - compass.xpm - cone.xpm - dashboard-alt.xpm - dashboard.xpm - database.xpm - device-camera.xpm - device-computer.xpm - device-drive.xpm - device-laptop.xpm - device-mobile-phone.xpm - device-tablet.xpm - device-tv.xpm - disc-vinyl.xpm - disc.xpm - drop.xpm - envelope-letter.xpm - envelope.xpm - file-bookmark.xpm - file-code.xpm - file-empty.xpm - file-excel.xpm - file-exe.xpm - file-font.xpm - file-illustrator.xpm - file-indesign.xpm - file-link.xpm - file-note.xpm - file-pdf.xpm - file-photoshop.xpm - file-picture.xpm - file-powerpoint.xpm - file-premiere.xpm - file-sound.xpm - file-text.xpm - file-video.xpm - file-word.xpm - file-zip.xpm - flag-alt.xpm - flag.xpm - flask.xpm - floppy.xpm - flower.xpm - folder-document.xpm - folder-house.xpm - folder-music.xpm - folder-picture.xpm - folder-video.xpm - folder.xpm - funnel.xpm - gamepad.xpm - gift.xpm - globe.xpm - handshake.xpm - headphone.xpm - heart.xpm - house.xpm - institution.xpm - key.xpm - keyring.xpm - layers.xpm - life-buoy.xpm - light-bulb.xpm - lightning.xpm - lock-open.xpm - lock.xpm - magnify-less.xpm - magnify.xpm - map-map-marker.xpm - map-marker.xpm - map.xpm - microphone.xpm - mixer.xpm - money.xpm - monitor.xpm - news.xpm - notepad.xpm - paper-plane.xpm - paperclip.xpm - pencil.xpm - phone.xpm - pin.xpm - post-it.xpm - profile-group.xpm - profile.xpm - puzzle.xpm - radio.xpm - rss.xpm - safe.xpm - search.xpm - shield-error.xpm - shield-ok.xpm - shield-warning.xpm - shield.xpm - shop.xpm - sign-add.xpm - sign-ban.xpm - sign-check.xpm - sign-delete.xpm - sign-down.xpm - sign-error.xpm - sign-info.xpm - sign-left.xpm - sign-question.xpm - sign-right.xpm - sign-sync.xpm - sign-up.xpm - sign-warning.xpm - skull.xpm - snow-flake.xpm - social-facebook.xpm - social-google-plus.xpm - social-twitter.xpm - social-youtube.xpm - stamp.xpm - star-alt.xpm - star.xpm - sun.xpm - switch-off.xpm - switch-on.xpm - tag-alt.xpm - tag.xpm - terminal.xpm - thumb-up.xpm - trashcan-full.xpm - trashcan.xpm - user-female-alt.xpm - user-female.xpm - user-id.xpm - user-male-alt.xpm - user-male.xpm - webcam.xpm - window-layout.xpm - window-system.xpm - window.xpm - wine.xpm - wrench-screwdriver.xpm - wrench.xpm - address-book-alt.xpm - address-book.xpm - bag.xpm - basket.xpm - beer.xpm - bell.xpm - bitcoin.xpm - book-bookmark.xpm - book.xpm - box-full.xpm - box-in.xpm - box-out.xpm - box.xpm - brick-alt.xpm - brick.xpm - bubble.xpm - bubbles-alt.xpm - bubbles.xpm - building.xpm - bullhorn.xpm - calculator.xpm - calendar-clock.xpm - calendar.xpm - carton.xpm - cat.xpm - clock.xpm - cloud-down.xpm - cloud-sync.xpm - cloud-up.xpm - cloud.xpm - cog.xpm - cogs.xpm - compass.xpm - cone.xpm - dashboard-alt.xpm - dashboard.xpm - database.xpm - device-camera.xpm - device-computer.xpm - device-drive.xpm - device-laptop.xpm - device-mobile-phone.xpm - device-tablet.xpm - device-tv.xpm - disc-vinyl.xpm - disc.xpm - drop.xpm - envelope-letter.xpm - envelope.xpm - file-bookmark.xpm - file-code.xpm - file-empty.xpm - file-excel.xpm - file-exe.xpm - file-font.xpm - file-illustrator.xpm - file-indesign.xpm - file-link.xpm - file-note.xpm - file-pdf.xpm - file-photoshop.xpm - file-picture.xpm - file-powerpoint.xpm - file-premiere.xpm - file-sound.xpm - file-text.xpm - file-video.xpm - file-word.xpm - file-zip.xpm - flag-alt.xpm - flag.xpm - flask.xpm - floppy.xpm - flower.xpm - folder-document.xpm - folder-house.xpm - folder-music.xpm - folder-picture.xpm - folder-video.xpm - folder.xpm - funnel.xpm - gamepad.xpm - gift.xpm - globe.xpm - handshake.xpm - headphone.xpm - heart.xpm - house.xpm - institution.xpm - key.xpm - keyring.xpm - layers.xpm - life-buoy.xpm - light-bulb.xpm - lightning.xpm - lock-open.xpm - lock.xpm - magnify-less.xpm - magnify.xpm - map-map-marker.xpm - map-marker.xpm - map.xpm - microphone.xpm - mixer.xpm - money.xpm - monitor.xpm - news.xpm - notepad.xpm - paper-plane.xpm - paperclip.xpm - pencil.xpm - phone.xpm - pin.xpm - post-it.xpm - profile-group.xpm - profile.xpm - puzzle.xpm - radio.xpm - rss.xpm - safe.xpm - search.xpm - shield-error.xpm - shield-ok.xpm - shield-warning.xpm - shield.xpm - shop.xpm - sign-add.xpm - sign-ban.xpm - sign-check.xpm - sign-delete.xpm - sign-down.xpm - sign-error.xpm - sign-info.xpm - sign-left.xpm - sign-question.xpm - sign-right.xpm - sign-sync.xpm - sign-up.xpm - sign-warning.xpm - skull.xpm - snow-flake.xpm - social-facebook.xpm - social-google-plus.xpm - social-twitter.xpm - social-youtube.xpm - stamp.xpm - star-alt.xpm - star.xpm - sun.xpm - switch-off.xpm - switch-on.xpm - tag-alt.xpm - tag.xpm - terminal.xpm - thumb-up.xpm - trashcan-full.xpm - trashcan.xpm - user-female-alt.xpm - user-female.xpm - user-id.xpm - user-male-alt.xpm - user-male.xpm - webcam.xpm - window-layout.xpm - window-system.xpm - window.xpm - wine.xpm - wrench-screwdriver.xpm - wrench.xpm - address-book-alt.xpm - address-book.xpm - bag.xpm - basket.xpm - beer.xpm - bell.xpm - bitcoin.xpm - book-bookmark.xpm - book.xpm - box-full.xpm - box-in.xpm - box-out.xpm - box.xpm - brick-alt.xpm - brick.xpm - bubble.xpm - bubbles-alt.xpm - bubbles.xpm - building.xpm - bullhorn.xpm - calculator.xpm - calendar-clock.xpm - calendar.xpm - carton.xpm - cat.xpm - clock.xpm - cloud-down.xpm - cloud-sync.xpm - cloud-up.xpm - cloud.xpm - cog.xpm - cogs.xpm - compass.xpm - cone.xpm - dashboard-alt.xpm - dashboard.xpm - database.xpm - device-camera.xpm - device-computer.xpm - device-drive.xpm - device-laptop.xpm - device-mobile-phone.xpm - device-tablet.xpm - device-tv.xpm - disc-vinyl.xpm - disc.xpm - drop.xpm - envelope-letter.xpm - envelope.xpm - file-bookmark.xpm - file-code.xpm - file-empty.xpm - file-excel.xpm - file-exe.xpm - file-font.xpm - file-illustrator.xpm - file-indesign.xpm - file-link.xpm - file-note.xpm - file-pdf.xpm - file-photoshop.xpm - file-picture.xpm - file-powerpoint.xpm - file-premiere.xpm - file-sound.xpm - file-text.xpm - file-video.xpm - file-word.xpm - file-zip.xpm - flag-alt.xpm - flag.xpm - flask.xpm - floppy.xpm - flower.xpm - folder-document.xpm - folder-house.xpm - folder-music.xpm - folder-picture.xpm - folder-video.xpm - folder.xpm - funnel.xpm - gamepad.xpm - gift.xpm - globe.xpm - handshake.xpm - headphone.xpm - heart.xpm - house.xpm - institution.xpm - key.xpm - keyring.xpm - layers.xpm - life-buoy.xpm - light-bulb.xpm - lightning.xpm - lock-open.xpm - lock.xpm - magnify-less.xpm - magnify.xpm - map-map-marker.xpm - map-marker.xpm - map.xpm - microphone.xpm - mixer.xpm - money.xpm - monitor.xpm - news.xpm - notepad.xpm - paper-plane.xpm - paperclip.xpm - pencil.xpm - phone.xpm - pin.xpm - post-it.xpm - profile-group.xpm - profile.xpm - puzzle.xpm - radio.xpm - rss.xpm - safe.xpm - search.xpm - shield-error.xpm - shield-ok.xpm - shield-warning.xpm - shield.xpm - shop.xpm - sign-add.xpm - sign-ban.xpm - sign-check.xpm - sign-delete.xpm - sign-down.xpm - sign-error.xpm - sign-info.xpm - sign-left.xpm - sign-question.xpm - sign-right.xpm - sign-sync.xpm - sign-up.xpm - sign-warning.xpm - skull.xpm - snow-flake.xpm - social-facebook.xpm - social-google-plus.xpm - social-twitter.xpm - social-youtube.xpm - stamp.xpm - star-alt.xpm - star.xpm - sun.xpm - switch-off.xpm - switch-on.xpm - tag-alt.xpm - tag.xpm - terminal.xpm - thumb-up.xpm - trashcan-full.xpm - trashcan.xpm - user-female-alt.xpm - user-female.xpm - user-id.xpm - user-male-alt.xpm - user-male.xpm - webcam.xpm - window-layout.xpm - window-system.xpm - window.xpm - wine.xpm - wrench-screwdriver.xpm - wrench.xpm - address-book-alt.xpm - address-book.xpm - bag.xpm - basket.xpm - beer.xpm - bell.xpm - bitcoin.xpm - book-bookmark.xpm - book.xpm - box-full.xpm - box-in.xpm - box-out.xpm - box.xpm - brick-alt.xpm - brick.xpm - bubble.xpm - bubbles-alt.xpm - bubbles.xpm - building.xpm - bullhorn.xpm - calculator.xpm - calendar-clock.xpm - calendar.xpm - carton.xpm - cat.xpm - clock.xpm - cloud-down.xpm - cloud-sync.xpm - cloud-up.xpm - cloud.xpm - cog.xpm - cogs.xpm - compass.xpm - cone.xpm - dashboard-alt.xpm - dashboard.xpm - database.xpm - device-camera.xpm - device-computer.xpm - device-drive.xpm - device-laptop.xpm - device-mobile-phone.xpm - device-tablet.xpm - device-tv.xpm - disc-vinyl.xpm - disc.xpm - drop.xpm - envelope-letter.xpm - envelope.xpm - file-bookmark.xpm - file-code.xpm - file-empty.xpm - file-excel.xpm - file-exe.xpm - file-font.xpm - file-illustrator.xpm - file-indesign.xpm - file-link.xpm - file-note.xpm - file-pdf.xpm - file-photoshop.xpm - file-picture.xpm - file-powerpoint.xpm - file-premiere.xpm - file-sound.xpm - file-text.xpm - file-video.xpm - file-word.xpm - file-zip.xpm - flag-alt.xpm - flag.xpm - flask.xpm - floppy.xpm - flower.xpm - folder-document.xpm - folder-house.xpm - folder-music.xpm - folder-picture.xpm - folder-video.xpm - folder.xpm - funnel.xpm - gamepad.xpm - gift.xpm - globe.xpm - handshake.xpm - headphone.xpm - heart.xpm - house.xpm - institution.xpm - key.xpm - keyring.xpm - layers.xpm - life-buoy.xpm - light-bulb.xpm - lightning.xpm - lock-open.xpm - lock.xpm - magnify-less.xpm - magnify.xpm - map-map-marker.xpm - map-marker.xpm - map.xpm - microphone.xpm - mixer.xpm - money.xpm - monitor.xpm - news.xpm - notepad.xpm - paper-plane.xpm - paperclip.xpm - pencil.xpm - phone.xpm - pin.xpm - post-it.xpm - profile-group.xpm - profile.xpm - puzzle.xpm - radio.xpm - rss.xpm - safe.xpm - search.xpm - shield-error.xpm - shield-ok.xpm - shield-warning.xpm - shield.xpm - shop.xpm - sign-add.xpm - sign-ban.xpm - sign-check.xpm - sign-delete.xpm - sign-down.xpm - sign-error.xpm - sign-info.xpm - sign-left.xpm - sign-question.xpm - sign-right.xpm - sign-sync.xpm - sign-up.xpm - sign-warning.xpm - skull.xpm - snow-flake.xpm - social-facebook.xpm - social-google-plus.xpm - social-twitter.xpm - social-youtube.xpm - stamp.xpm - star-alt.xpm - star.xpm - sun.xpm - switch-off.xpm - switch-on.xpm - tag-alt.xpm - tag.xpm - terminal.xpm - thumb-up.xpm - trashcan-full.xpm - trashcan.xpm - user-female-alt.xpm - user-female.xpm - user-id.xpm - user-male-alt.xpm - user-male.xpm - webcam.xpm - window-layout.xpm - window-system.xpm - window.xpm - wine.xpm - wrench-screwdriver.xpm - wrench.xpm @@ -734,7 +58,7 @@ localhost - 4 + 2 diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index 4f3fdc6..2f82c81 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -7,4 +7,12 @@ 0 0 + + + + file:/home/twarren/Tyro/README.md + file:/home/twarren/Tyro/Makefile + file:/home/twarren/Tyro/src/network/SFTP.cpp + + diff --git a/nbproject/project.xml b/nbproject/project.xml index d0214a9..0e6722a 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -6,7 +6,7 @@ Tyro cpp - h,hpp,xpm + h,hpp UTF-8