#13 Minor enhancements

+ buttons now enable / disable based on selection state
~ update readme

Author: Ravbug

CMakeLists.txt

@@ -4,8 +4,6 @@ project("UnityHubNative")
 set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR})
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/$<CONFIGURATION>)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/$<CONFIGURATION>)
-# link time optimization
-set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE TRUE CACHE INTERNAL "")	# only enable on release
 
 option(BUILD_SHARED_LIBS OFF "Build static")
 
@@ -129,4 +127,4 @@ endmacro()
 set(all_unity "wxcore;wxbase;fmt;wxpng;")
 if(MSVC)
 #enable_unity("${all_unity}")
-endif()
+endif()

README.md

@@ -4,7 +4,7 @@ UnityHubNative is a lightweight C++ / wxWidgets alternative to the unnecessarily
 
 It launches many times faster, uses far less memory and CPU, and is a fraction of the total size of the offical Unity Hub.
 
-![Mac Dark Mode screenshot](https://i.imgur.com/pE1q5HV.png)
+<img width="912" alt="image" src="https://user-images.githubusercontent.com/22283943/193929653-a4aad2b6-229b-4438-afee-c30a7ae39949.png">
 > Supports Mac dark mode!
 
 
@@ -13,9 +13,11 @@ It launches many times faster, uses far less memory and CPU, and is a fraction o
 - Open projects by double-clicking them in the list, or by selecting them and pressing Enter
 - Create new unity projects with templates, for any modern Unity version you have installed, with the Create New button
 - View Unity installs by double clicking them in the list views in the Editor Versions section
+- Manage Unity installs
+- Manage Unity licenses
 - Update projects to a Unity version of your choosing
 
-UnityHubNative does not have every feature that the official hub has, namely managing licenses. In addition, depending on your license, you may not be able to uninstall the official Unity Hub. UnityHubNative serves as a shortcut to get into your projects faster. 
+UnityHubNative does not have every feature that the official hub has, but it has most of them. UnityHubNative serves as a shortcut to get into your projects faster. 
 
 ## Installation
 This application is self-contained.
@@ -40,4 +42,4 @@ cmake --build . --config Release --target install
 
 ## Issues
 Please report all problems in the [Issues](https://github.com/Ravbug/UnityHubNative/issues) section of this repository. 
-Make sure to include as many details as possible, or I won't be able to fix it.
+Make sure to include as many details as possible, otherwise I won't be able to fix it.

source/form.fbp

@@ -24,18 +24,20 @@ MainFrame::MainFrame( wxWindow* parent, wxWindowID id, const wxString& title, co
 	projectManSizer->SetFlexibleDirection( wxBOTH );
 	projectManSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-	projectsList = new wxListCtrl( projects_pane, wxID_HARDDISK, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxLC_SINGLE_SEL );
+	projectsList = new wxListCtrl( projects_pane, wxID_HARDDISK, wxDefaultPosition, wxDefaultSize, wxLC_ALIGN_LEFT|wxLC_REPORT|wxLC_SINGLE_SEL );
 	projectManSizer->Add( projectsList, wxGBPosition( 2, 0 ), wxGBSpan( 1, 3 ), wxALL|wxEXPAND|wxFIXED_MINSIZE, 5 );
 
 	wxBoxSizer* pManSizer;
 	pManSizer = new wxBoxSizer( wxHORIZONTAL );
 
-	wxButton* revealProjBtn;
 	revealProjBtn = new wxButton( projects_pane, wxID_JUMP_TO, wxT("Reveal"), wxDefaultPosition, wxDefaultSize, 0 );
+	revealProjBtn->Enable( false );
+
 	pManSizer->Add( revealProjBtn, 0, wxALL, 5 );
 
-	wxButton* removeProjBtn;
 	removeProjBtn = new wxButton( projects_pane, wxID_DELETE, wxT(" Remove from list"), wxDefaultPosition, wxDefaultSize, 0 );
+	removeProjBtn->Enable( false );
+
 	pManSizer->Add( removeProjBtn, 0, wxALL, 5 );
 
 	wxButton* add_new_proj;
@@ -46,8 +48,9 @@ MainFrame::MainFrame( wxWindow* parent, wxWindowID id, const wxString& title, co
 	add_existing_proj = new wxButton( projects_pane, wxID_ADD, wxT("Add Existing"), wxDefaultPosition, wxDefaultSize, 0 );
 	pManSizer->Add( add_existing_proj, 0, wxALL, 5 );
 
-	wxButton* openWithBtn;
 	openWithBtn = new wxButton( projects_pane, OPEN_WITH, wxT("Open With"), wxDefaultPosition, wxDefaultSize, 0 );
+	openWithBtn->Enable( false );
+
 	pManSizer->Add( openWithBtn, 0, wxALL, 5 );
 
 
@@ -102,32 +105,39 @@ MainFrame::MainFrame( wxWindow* parent, wxWindowID id, const wxString& title, co
 	m_button5 = new wxButton( installs_pane, wxID_FIND, wxT("Add Location"), wxDefaultPosition, wxDefaultSize, 0 );
 	bSizer4->Add( m_button5, 0, wxALL|wxEXPAND, 5 );
 
-	wxButton* m_button6;
-	m_button6 = new wxButton( installs_pane, wxID_CLEAR, wxT("Remove"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer4->Add( m_button6, 0, wxALL|wxEXPAND, 5 );
+	removeInstallPathBtn = new wxButton( installs_pane, wxID_CLEAR, wxT("Remove"), wxDefaultPosition, wxDefaultSize, 0 );
+	removeInstallPathBtn->Enable( false );
+
+	bSizer4->Add( removeInstallPathBtn, 0, wxALL|wxEXPAND, 5 );
 
 
 	MainSizer->Add( bSizer4, wxGBPosition( 3, 1 ), wxGBSpan( 1, 1 ), wxEXPAND, 5 );
 
 	wxBoxSizer* bSizer5;
 	bSizer5 = new wxBoxSizer( wxVERTICAL );
 
-	launchHubBtn = new wxButton( installs_pane, wxID_BACKWARD, wxT("Add New"), wxDefaultPosition, wxDefaultSize, 0 );
+	launchHubBtn = new wxButton( installs_pane, wxID_BACKWARD, wxT("Install New"), wxDefaultPosition, wxDefaultSize, 0 );
 	bSizer5->Add( launchHubBtn, 0, wxALL|wxEXPAND, 5 );
 
 	removeInstallBtn = new wxButton( installs_pane, wxID_NO, wxT("Uninstall"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer5->Add( removeInstallBtn, 0, wxALL|wxEXPAND, 5 );
+	removeInstallBtn->Enable( false );
 
-	wxButton* reloadInstalls;
-	reloadInstalls = new wxButton( installs_pane, wxID_RELOAD, wxT("Reload"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer5->Add( reloadInstalls, 0, wxALL|wxEXPAND, 5 );
+	bSizer5->Add( removeInstallBtn, 0, wxALL|wxEXPAND, 5 );
 
 	activateProPlusBtn = new wxButton( installs_pane, ACTIV_PROPLUS, wxT("Activate (Plus/Pro)"), wxDefaultPosition, wxDefaultSize, 0 );
+	activateProPlusBtn->Enable( false );
+
 	bSizer5->Add( activateProPlusBtn, 0, wxALL|wxEXPAND, 5 );
 
 	activatePersonalBtn = new wxButton( installs_pane, ACTIV_PERSONAL, wxT("Activate (Personal)"), wxDefaultPosition, wxDefaultSize, 0 );
+	activatePersonalBtn->Enable( false );
+
 	bSizer5->Add( activatePersonalBtn, 0, wxALL|wxEXPAND, 5 );
 
+	wxButton* reloadInstalls;
+	reloadInstalls = new wxButton( installs_pane, wxID_RELOAD, wxT("Reload"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer5->Add( reloadInstalls, 0, wxALL|wxEXPAND, 5 );
+
 
 	MainSizer->Add( bSizer5, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxEXPAND, 5 );
 
@@ -157,18 +167,19 @@ MainFrame::MainFrame( wxWindow* parent, wxWindowID id, const wxString& title, co
 	menuAdd = new wxMenuItem( menuProject, wxID_ADD, wxString( wxT("Add Existing Project") ) + wxT('\t') + wxT("Ctrl-Shift-N"), wxEmptyString, wxITEM_NORMAL );
 	menuProject->Append( menuAdd );
 
-	wxMenuItem* menuRemove;
 	menuRemove = new wxMenuItem( menuProject, wxID_DELETE, wxString( wxT("Remove Project From List") ) + wxT('\t') + wxT("Ctrl--"), wxEmptyString, wxITEM_NORMAL );
 	menuProject->Append( menuRemove );
+	menuRemove->Enable( false );
 
 	menuProject->AppendSeparator();
 
 	menuReveal = new wxMenuItem( menuProject, wxID_FIND, wxString( wxT("Reveal") ) + wxT('\t') + wxT("Ctrl-F"), wxEmptyString, wxITEM_NORMAL );
 	menuProject->Append( menuReveal );
+	menuReveal->Enable( false );
 
-	wxMenuItem* menuOpenWith;
 	menuOpenWith = new wxMenuItem( menuProject, wxID_PROPERTIES, wxString( wxT("Open In Different Version") ) + wxT('\t') + wxT("Ctrl-O"), wxEmptyString, wxITEM_NORMAL );
 	menuProject->Append( menuOpenWith );
+	menuOpenWith->Enable( false );
 
 	wxMenuItem* menuReload;
 	menuReload = new wxMenuItem( menuProject, wxID_REFRESH, wxString( wxT("Reload Data") ) + wxT('\t') + wxT("Ctrl-R"), wxEmptyString, wxITEM_NORMAL );

source/interface.cpp

@@ -42,9 +42,9 @@
 #define OPEN_WITH 1003
 #define FILTER_PROJ_ID 1004
 #define wxID_FLOPPY 1005
-#define wxID_RELOAD 1006
-#define ACTIV_PROPLUS 1007
-#define ACTIV_PERSONAL 1008
+#define ACTIV_PROPLUS 1006
+#define ACTIV_PERSONAL 1007
+#define wxID_RELOAD 1008
 #define wxID_TOP 1009
 #define PAD_CREATE 1010
 #define PAD_ACTIVATE 1011
@@ -62,15 +62,21 @@ class MainFrame : public wxFrame
 	protected:
 		wxNotebook* notebook;
 		wxListCtrl* projectsList;
+		wxButton* revealProjBtn;
+		wxButton* removeProjBtn;
+		wxButton* openWithBtn;
 		wxSearchCtrl* projSearchCtrl;
 		wxListBox* installsList;
 		wxListBox* installsPathsList;
+		wxButton* removeInstallPathBtn;
 		wxButton* launchHubBtn;
 		wxButton* removeInstallBtn;
 		wxButton* activateProPlusBtn;
 		wxButton* activatePersonalBtn;
 		wxMenuBar* menubar;
+		wxMenuItem* menuRemove;
 		wxMenuItem* menuReveal;
+		wxMenuItem* menuOpenWith;
 
 	public:
 

source/interface.h

@@ -53,7 +53,15 @@ EVT_BUTTON(wxID_RELOAD,MainFrameDerived::OnReloadEditors)
 EVT_BUTTON(OPEN_WITH, MainFrameDerived::OnOpenWith)
 EVT_BUTTON(ACTIV_PROPLUS, MainFrameDerived::OnActivateProPlus)
 EVT_BUTTON(ACTIV_PERSONAL, MainFrameDerived::OnActivatePersonal)
+
 EVT_LIST_ITEM_ACTIVATED(wxID_HARDDISK, MainFrameDerived::OnOpenProject)
+EVT_LIST_ITEM_SELECTED(wxID_HARDDISK, MainFrameDerived::OnSelectProject)
+EVT_LIST_ITEM_DESELECTED(wxID_HARDDISK, MainFrameDerived::OnDeselectProject)
+EVT_LIST_DELETE_ITEM(wxID_HARDDISK,  MainFrameDerived::OnDeselectProject)
+
+EVT_LISTBOX(wxID_FLOPPY, MainFrameDerived::OnSelectEditor)
+EVT_LISTBOX(wxID_HOME, MainFrameDerived::OnSelectEditorPath)
+
 EVT_LISTBOX_DCLICK(wxID_FLOPPY,MainFrameDerived::OnRevealEditor)
 EVT_LISTBOX_DCLICK(wxID_HOME,MainFrameDerived::OnRevealInstallLocation)
 //EVT_SEARCHCTRL_SEARCH_BTN(FILTER_PROJ_ID,MainFrameDerived::Filter)
@@ -98,13 +106,65 @@ MainFrameDerived::MainFrameDerived() : MainFrame(NULL){
 	projSearchCtrl->SetFocus();
 }
 
+void MainFrameDerived::OnSelectProject(wxListEvent&){
+    for (auto ptr : projectActionItems){
+        ptr->Enable();
+    }
+    for (auto ptr : projectActionMenus){
+        ptr->Enable();
+    }
+}
+
+void MainFrameDerived::OnDeselectProject(wxListEvent&){
+    for (auto ptr : projectActionItems){
+        ptr->Disable();
+    }
+    for (auto ptr : projectActionMenus){
+        ptr->Enable(false);
+    }
+}
+
+void MainFrameDerived::OnSelectEditor(wxCommandEvent& evt){
+    if ( installsList->GetSelection() != -1) {
+        for (auto ptr : editorActionItems){
+            ptr->Enable();
+        }
+    }
+    else{
+        for (auto ptr : editorActionItems){
+            ptr->Disable();
+        }
+    }
+}
+
+void MainFrameDerived::OnSelectEditorPath(wxCommandEvent&){
+    if ( installsPathsList->GetSelection() != -1) {
+        for (auto ptr : editorPathActionItems){
+            ptr->Enable();
+        }
+    }
+    else{
+        for (auto ptr : editorPathActionItems){
+            ptr->Disable();
+        }
+    }
+}
+
 /**
  Loads the data in the main view. If anything is currently loaded, it will be cleared and re-loaded
  */
 void MainFrameDerived::ReloadData(){
 	//clear any existing items
+    {
+        wxListEvent e;
+        OnDeselectProject(e);
+    }
 	projectsList->DeleteAllItems();
 	installsPathsList->Clear();
+    {
+        wxCommandEvent e;
+        OnSelectEditorPath(e);
+    }
 	projects.clear();
 	installPaths.clear();
 	editors.clear();
@@ -167,6 +227,8 @@ void MainFrameDerived::LoadProjects(const std::string &filter){
 
 void MainFrameDerived::Filter(wxKeyEvent &){
     projectsList->DeleteAllItems();
+    wxListEvent e;
+    OnDeselectProject(e);
     projects.clear();
     auto filter = projSearchCtrl->GetValue();
     transform(filter.begin(), filter.end(), filter.begin(), ::tolower);
@@ -259,6 +321,8 @@ void MainFrameDerived::OnRemoveInstallPath(wxCommandEvent& event){
 
 		//update the UI
 		installsPathsList->Delete(itemIndex);
+        wxCommandEvent e;
+        OnSelectEditorPath(e);
 
 		//commit to file
 		SaveEditorVersions();
@@ -284,7 +348,7 @@ void MainFrameDerived::OnCreateProject(wxCommandEvent& event){
 		dialog->show();
 	}
 	else{
-		wxMessageBox("UnityHubNative could not find any Unity Editors installed on this sytem. If you have an editor installed, make sure UnityHubNative can find it by adding its location to the Install Search Paths section of the Editor Versions Tab.\n\nIf you do not have any Unity editors installed, you must use the official hub to install one before you can create a new project with UnityHubNative.","Cannot Create Project",wxOK | wxICON_ERROR);
+		wxMessageBox("UnityHubNative could not find any Unity Editors installed on this sytem. If you have an editor installed, make sure UnityHubNative can find it by adding its location to the Install Search Paths section of the Editor Versions Tab.","Cannot Create Project",wxOK | wxICON_ERROR);
 	}
 }
 
@@ -497,6 +561,8 @@ void MainFrameDerived::AddProject(const project& p, const std::string& filter){
 void MainFrameDerived::LoadEditorVersions(){
 	//clear list control
 	installsList->Clear();
+    wxCommandEvent e;
+    OnSelectEditor(e);
 	editors.clear();
 
 	//iterate over the search paths

source/interface_derived.cpp

@@ -41,6 +41,34 @@ class MainFrameDerived : public MainFrame{
 	void OnActivatePersonal(wxCommandEvent&);
     void Filter(wxKeyEvent&);
     void LoadProjects(const std::string& filter);
+    
+    void OnSelectProject(wxListEvent&);
+    void OnDeselectProject(wxListEvent&);
+    
+    void OnSelectEditor(wxCommandEvent&);
+    void OnSelectEditorPath(wxCommandEvent&);
+    
+    wxWindow* const projectActionItems[3]{
+        revealProjBtn,
+        removeProjBtn,
+        openWithBtn
+    };
+    
+    wxMenuItem* const projectActionMenus[3]{
+        menuRemove,
+        menuReveal,
+        menuOpenWith
+    };
+    
+    wxWindow* const editorActionItems[3]{
+        removeInstallBtn,
+        activateProPlusBtn,
+        activatePersonalBtn
+    };
+    
+    wxWindow* const editorPathActionItems[1]{
+        removeInstallPathBtn
+    };
 
 	//will store the list of projects
 	std::vector<project> projects;