WebView and wxWidgets update

mac.xcodeproj
+ static links to WebKit

interface_derived
+ configures and adds wxWebView to new learn tab

interface
+ new learn tab, with mini browser controls

wxWidgets/*
+ upgraded wxWidgets version from 3.12 to 3.13

Author: Ravbug

mac.xcodeproj/project.pbxproj

@@ -12,6 +12,7 @@
 		AA012114224C24D4000F4F82 /* wxmac.icns in Resources */ = {isa = PBXBuildFile; fileRef = AA012113224C24D4000F4F82 /* wxmac.icns */; };
 		AA012115224C24D4000F4F82 /* wxmac.icns in Resources */ = {isa = PBXBuildFile; fileRef = AA012113224C24D4000F4F82 /* wxmac.icns */; };
 		AA14A0F3222A1219002C4553 /* libwx_osx_cocoa.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = AA1D0F81222A0A1D00678304 /* libwx_osx_cocoa.dylib */; };
+		AA256DE12367942600F9EA58 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA256DC72367942600F9EA58 /* WebKit.framework */; };
 		AA56E9702321F67C002BB5E1 /* globals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA56E96F2321F67C002BB5E1 /* globals.cpp */; };
 		AA56E98A2321F67E002BB5E1 /* globals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA56E96F2321F67C002BB5E1 /* globals.cpp */; };
 		AA9F4B912321BEE900FF2E24 /* interface_derived.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA9F4B8F2321BEE900FF2E24 /* interface_derived.cpp */; };
@@ -227,6 +228,7 @@
 		AA1D0FC9222A0A4A00678304 /* wxrelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = wxrelease.xcconfig; path = wxWidgets/build/osx/wxrelease.xcconfig; sourceTree = SOURCE_ROOT; };
 		AA1D0FCA222A0A4B00678304 /* wxcocoa.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = wxcocoa.xcconfig; path = wxWidgets/build/osx/wxcocoa.xcconfig; sourceTree = SOURCE_ROOT; };
 		AA1D0FCB222A0A4B00678304 /* wxdebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = wxdebug.xcconfig; path = wxWidgets/build/osx/wxdebug.xcconfig; sourceTree = SOURCE_ROOT; };
+		AA256DC72367942600F9EA58 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 		AA56E96F2321F67C002BB5E1 /* globals.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = globals.cpp; sourceTree = "<group>"; };
 		AA9F4B8F2321BEE900FF2E24 /* interface_derived.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = interface_derived.cpp; sourceTree = "<group>"; };
 		AA9F4B902321BEE900FF2E24 /* interface_derived.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = interface_derived.hpp; sourceTree = "<group>"; };
@@ -258,6 +260,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				AA256DE12367942600F9EA58 /* WebKit.framework in Frameworks */,
 				AADF6A33222B360C00991DD2 /* Foundation.framework in Frameworks */,
 				AADF6A31222B360700991DD2 /* AppKit.framework in Frameworks */,
 				AADF6A2F222B360200991DD2 /* IOKit.framework in Frameworks */,
@@ -276,6 +279,7 @@
 		AA14A0F2222A1219002C4553 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				AA256DC72367942600F9EA58 /* WebKit.framework */,
 				AADF6A32222B360C00991DD2 /* Foundation.framework */,
 				AADF6A30222B360700991DD2 /* AppKit.framework */,
 				AADF6A2E222B360200991DD2 /* IOKit.framework */,

mac.xcodeproj/project.xcworkspace/xcuserdata/main.xcuserdatad/UserInterfaceState.xcuserstate

@@ -60,33 +60,33 @@ MainFrame::MainFrame( wxWindow* parent, wxWindowID id, const wxString& title, co
 	projects_pane->SetSizer( projectManSizer );
 	projects_pane->Layout();
 	projectManSizer->Fit( projects_pane );
-	notebook->AddPage( projects_pane, wxT("Projects"), false );
+	notebook->AddPage( projects_pane, wxT("Projects"), true );
 	wxPanel* installs_pane;
 	installs_pane = new wxPanel( notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxGridBagSizer* iManSizer;
-	iManSizer = new wxGridBagSizer( 0, 0 );
-	iManSizer->SetFlexibleDirection( wxBOTH );
-	iManSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	wxGridBagSizer* MainSizer;
+	MainSizer = new wxGridBagSizer( 0, 0 );
+	MainSizer->SetFlexibleDirection( wxBOTH );
+	MainSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
 	wxStaticText* m_staticText5;
 	m_staticText5 = new wxStaticText( installs_pane, wxID_ANY, wxT("Detected Installations"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText5->Wrap( -1 );
 	m_staticText5->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-	iManSizer->Add( m_staticText5, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALL, 5 );
+	MainSizer->Add( m_staticText5, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALL, 5 );
 
 	wxStaticText* m_staticText6;
 	m_staticText6 = new wxStaticText( installs_pane, wxID_ANY, wxT("Install Search Paths"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText6->Wrap( -1 );
 	m_staticText6->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-	iManSizer->Add( m_staticText6, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxALL, 5 );
+	MainSizer->Add( m_staticText6, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxALL, 5 );
 
 	installsList = new wxListBox( installs_pane, wxID_FLOPPY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_HSCROLL|wxLB_NEEDED_SB|wxLB_SINGLE );
-	iManSizer->Add( installsList, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxALL|wxEXPAND, 5 );
+	MainSizer->Add( installsList, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxALL|wxEXPAND, 5 );
 
 	installsPathsList = new wxListBox( installs_pane, wxID_HOME, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_HSCROLL|wxLB_NEEDED_SB|wxLB_SINGLE );
-	iManSizer->Add( installsPathsList, wxGBPosition( 3, 0 ), wxGBSpan( 1, 1 ), wxALL|wxEXPAND, 5 );
+	MainSizer->Add( installsPathsList, wxGBPosition( 3, 0 ), wxGBSpan( 1, 1 ), wxALL|wxEXPAND, 5 );
 
 	wxBoxSizer* bSizer4;
 	bSizer4 = new wxBoxSizer( wxVERTICAL );
@@ -100,7 +100,7 @@ MainFrame::MainFrame( wxWindow* parent, wxWindowID id, const wxString& title, co
 	bSizer4->Add( m_button6, 0, wxALL|wxEXPAND, 5 );
 
 
-	iManSizer->Add( bSizer4, wxGBPosition( 3, 1 ), wxGBSpan( 1, 1 ), wxEXPAND, 5 );
+	MainSizer->Add( bSizer4, wxGBPosition( 3, 1 ), wxGBSpan( 1, 1 ), wxEXPAND, 5 );
 
 	wxBoxSizer* bSizer5;
 	bSizer5 = new wxBoxSizer( wxVERTICAL );
@@ -114,17 +114,49 @@ MainFrame::MainFrame( wxWindow* parent, wxWindowID id, const wxString& title, co
 	bSizer5->Add( reloadInstalls, 0, wxALL|wxEXPAND, 5 );
 
 
-	iManSizer->Add( bSizer5, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxEXPAND, 5 );
+	MainSizer->Add( bSizer5, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxEXPAND, 5 );
 
 
-	iManSizer->AddGrowableCol( 0 );
-	iManSizer->AddGrowableRow( 1 );
-	iManSizer->AddGrowableRow( 3 );
+	MainSizer->AddGrowableCol( 0 );
+	MainSizer->AddGrowableRow( 1 );
+	MainSizer->AddGrowableRow( 3 );
 
-	installs_pane->SetSizer( iManSizer );
+	installs_pane->SetSizer( MainSizer );
 	installs_pane->Layout();
-	iManSizer->Fit( installs_pane );
-	notebook->AddPage( installs_pane, wxT("Editor Versions"), true );
+	MainSizer->Fit( installs_pane );
+	notebook->AddPage( installs_pane, wxT("Editor Versions"), false );
+	learn_pane = new wxPanel( notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxGridBagSizer* learnSizer;
+	learnSizer = new wxGridBagSizer( 0, 0 );
+	learnSizer->SetFlexibleDirection( wxBOTH );
+	learnSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+	backBtn = new wxButton( learn_pane, wxID_ANY, wxT("<"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
+	learnSizer->Add( backBtn, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALL, 5 );
+
+	titleLabel = new wxStaticText( learn_pane, wxID_ANY, wxT("Title"), wxDefaultPosition, wxDefaultSize, 0 );
+	titleLabel->Wrap( -1 );
+	learnSizer->Add( titleLabel, wxGBPosition( 0, 3 ), wxGBSpan( 1, 1 ), wxALL, 5 );
+
+	forwardBtn = new wxButton( learn_pane, wxID_ANY, wxT(">"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
+	learnSizer->Add( forwardBtn, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxALL, 5 );
+
+	homeBtn = new wxButton( learn_pane, wxID_ANY, wxT("Home"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
+	learnSizer->Add( homeBtn, wxGBPosition( 0, 2 ), wxGBSpan( 1, 1 ), wxALL, 5 );
+
+	webSizer = new wxBoxSizer( wxVERTICAL );
+
+
+	learnSizer->Add( webSizer, wxGBPosition( 1, 0 ), wxGBSpan( 1, 4 ), wxEXPAND, 5 );
+
+
+	learnSizer->AddGrowableCol( 2 );
+	learnSizer->AddGrowableRow( 1 );
+
+	learn_pane->SetSizer( learnSizer );
+	learn_pane->Layout();
+	learnSizer->Fit( learn_pane );
+	notebook->AddPage( learn_pane, wxT("Learn"), false );
 
 	main_sizer->Add( notebook, 1, wxEXPAND | wxALL, 5 );
 

source/form.fbp

@@ -52,6 +52,12 @@ class MainFrame : public wxFrame
 		wxListCtrl* projectsList;
 		wxListBox* installsList;
 		wxListBox* installsPathsList;
+		wxPanel* learn_pane;
+		wxButton* backBtn;
+		wxStaticText* titleLabel;
+		wxButton* forwardBtn;
+		wxButton* homeBtn;
+		wxBoxSizer* webSizer;
 		wxMenuBar* menubar;
 		wxMenuItem* menuReveal;
 

source/interface.cpp

@@ -66,9 +66,11 @@ MainFrameDerived::MainFrameDerived() : MainFrame(NULL){
 		ReloadData();
 	}
 	//if no projects to load, the interface will be blank
-	
-	//force first tab to select
-	notebook->SetSelection(0);
+
+	//setup Learn window
+	learnView = wxWebView::New(learn_pane,wxID_ANY);
+	webSizer->Add(learnView,1,wxEXPAND,wxALL);
+	learnView->LoadURL("https://learn.unity.com");
 }
 
 /**

source/interface.h

@@ -11,6 +11,7 @@
 #include "interface.h"
 #include "globals.cpp"
 #include <functional>
+#include <wx/webview.h>
 
 using namespace std;
 
@@ -37,6 +38,8 @@ class MainFrameDerived : public MainFrame{
 	vector<string> installPaths;
 	vector<editor> editors;
 
+	wxWebView* learnView;
+
 	//events
 	void OnAbout(wxCommandEvent& event);
 	void OnAddProject(wxCommandEvent& event);

source/interface_derived.cpp

@@ -11,6 +11,7 @@ Cătălin Răceanu							<maildus@gmail.com>
 			<maildus@gmail.com>			<catalinraceanu2@gmail.com>
 Danny Scott							<doscott@doscott.ca>
 			<doscott@doscott.ca>			<doscott@gmail.com>
+			<doscott@doscott.ca>			<d.o.scott@unb.ca>
 Dimitri Schoolwerth	<dimitri.schoolwerth@gmail.com>		<dimitri@schoolwerth.com>
 Hashir Ahmad							<hashirahmadleo@gmail.com>
 Frédéric Bron		<frederic.bron@m4x.org>			<ufospoke@gmail.com>