Learn tab on Linux

makefile
+ include webview library in linker

setup-linux.sh
+ compile webview in initial configure

source/globals.h
+ increase version

source/interface_derived.cpp
- remove preprocessor that disables learn tab and web view on linux

source/interface_derived.hpp
- remove calls to hide learn tab on Linux

Author: Ravbug

README.md

@@ -42,6 +42,7 @@ This application stores its own files in an application data directory. If the a
 3. Build.
 ### Linux
 1. In the repository root folder, run `make`. The app will compile to `linux-build/`. If you are missing a dependency, the build system will stop and alert you with which dependency is missing. 
+   - You will need to have the webkit2gtk3 package installed for your system. For Fedora, this can be installed with `sudo dnf install webkit2gtk3-devel.x86_64`
 
 ## Issues
 Please report all problems in the [Issues](https://github.com/Ravbug/wxWidgetsTemplate/issues) section of this repository. 

makefile

@@ -1,6 +1,6 @@
 # flags needed to build the target (compiler, target name, and compiler flags)
 CC = g++
-CFLAGS := `wxWidgets/build/linux/wx-config --cxxflags --libs` -Wl,-rpath,wxWidgets/build/linux/lib/
+CFLAGS := `wxWidgets/build/linux/wx-config --cxxflags --libs std, webview` -Wl,-rpath,wxWidgets/build/linux/lib/
 target = UnityHubNative
 
 # location of source files

setup-linux.sh

@@ -36,7 +36,7 @@ cd build/linux;
 echoStatus "configure" "Running configure script"
 # run the configure script
 success=0;
-../../configure --enable-unicode --disable-shared && success=1
+../../configure --enable-unicode --disable-shared --enable-webviewwebkit && success=1
 
 # check success
 if [ $success = 0 ]; then

source/globals.h

@@ -16,7 +16,7 @@ using namespace std;
 static const string projectsFile = "projects.txt";
 static const string editorPathsFile = "editorPaths.txt";
 static const string templatePrefix = "com.unity.template";
-static const string AppVersion = "v1.35";
+static const string AppVersion = "v1.36";
 
 //structure for representing an editor and for locating it
 struct editor{

source/interface_derived.cpp

@@ -45,15 +45,13 @@ EVT_LIST_ITEM_ACTIVATED(wxID_HARDDISK, MainFrameDerived::OnOpenProject)
 EVT_LISTBOX_DCLICK(wxID_FLOPPY,MainFrameDerived::OnRevealEditor)
 EVT_LISTBOX_DCLICK(wxID_HOME,MainFrameDerived::OnRevealInstallLocation)
 
-#if defined __APPLE__ || defined _WIN32
 EVT_NOTEBOOK_PAGE_CHANGED(NOTEBOOK, MainFrameDerived::OnPageChanging)
 EVT_BUTTON(Nav_Back, MainFrameDerived::OnNavigateBack)
 EVT_BUTTON(Nav_Forward, MainFrameDerived::OnNavigateForwards)
 EVT_BUTTON(Nav_Home, MainFrameDerived::OnNavigateHome)
 EVT_WEBVIEW_NAVIGATED(WEBVIEW,MainFrameDerived::OnNavigationComplete)
 EVT_WEBVIEW_NEWWINDOW(WEBVIEW, MainFrameDerived::OnNavigationNewWindow)
 EVT_TIMER(TIMER, MainFrameDerived::OnTimerExpire)
-#endif
 
 wxEND_EVENT_TABLE()
 
@@ -84,14 +82,8 @@ MainFrameDerived::MainFrameDerived() : MainFrame(NULL){
 	}
 	//if no projects to load, the interface will be blank	
 
-	#if defined __APPLE__ || defined _WIN32
 	timeout = new wxTimer(this, TIMER);
 
-	#elif defined __linux__
-	//hide the learn tab on Linux
-	notebook->DeletePage(notebook->GetPageCount() - 1);
-	launchHubBtn->Hide();
-	#endif
 	//show current version in titlebar
 	this->SetLabel("Unity Hub Native " + AppVersion);
 }
@@ -198,7 +190,6 @@ void MainFrameDerived::OnAddProject(wxCommandEvent& event){
 	}
 }
 
-#if defined __APPLE__ || defined _WIN32
 /**
  Called when the top segmented control switches pages
  @param event the wxBookCtrlEvent sent by the segmented control. Used to get the currently selected page
@@ -229,7 +220,6 @@ void MainFrameDerived::OnPageChanging(wxBookCtrlEvent& event){
 		}
 	}
 }
-#endif
 /**
  Loads an editor search path into the app, updating the UI and the vector
  @param path the string path to laod

source/interface_derived.hpp

@@ -46,7 +46,6 @@ class MainFrameDerived : public MainFrame{
 	vector<project> projects;
 	vector<string> installPaths;
 	vector<editor> editors;
-#if defined __APPLE__ || defined _WIN32
 	wxWebView* learnView = NULL;
 	const string homeurl = "https://learn.unity.com";
 	wxString lastURL = wxString(homeurl);
@@ -86,7 +85,6 @@ class MainFrameDerived : public MainFrame{
 		delete learnView;
 		learnView = NULL;
 	}
-#endif
 	//window events
 	void OnAbout(wxCommandEvent& event);
 	void OnAddProject(wxCommandEvent& event);