v3.6.0 - Revision 2

israpps · Sep 10, 2024 · 8444f21 · 8444f21
1 parent 1c2bc4b
commit 8444f21
Show file tree

Hide file tree

Showing 13 changed files with 239 additions and 16 deletions.
diff --git a/HDL-Batch-installer-SRC/HDL-Batch-installer.cbp b/HDL-Batch-installer-SRC/HDL-Batch-installer.cbp
@@ -14,7 +14,7 @@ implementar switch para buscar HASH en tabla interna o redirigir a redump.org
 			</notes>
 		</Option>
 		<Build>
-			<Target title="Debug">
+			<Target title="64-bits">
 				<Option platforms="Windows;" />
 				<Option output="_bin/playground/HDL-Batch-installer" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="_bin/playground/" />
@@ -259,7 +259,7 @@ implementar switch para buscar HASH en tabla interna o redirigir a redump.org
 			</Target>
 		</Build>
 		<VirtualTargets>
-			<Add alias="Releasers" targets="Debug;32-bits;" />
+			<Add alias="Releasers" targets="64-bits;32-bits;" />
 		</VirtualTargets>
 		<Compiler>
 			<Add option="-Wall" />
@@ -316,6 +316,8 @@ implementar switch para buscar HASH en tabla interna o redirigir a redump.org
 		<Unit filename="PFSShellBrowser.h" />
 		<Unit filename="Post_Install_Report.cpp" />
 		<Unit filename="Post_Install_Report.h" />
+		<Unit filename="UpdateMan.cpp" />
+		<Unit filename="UpdateMan.h" />
 		<Unit filename="_bin/Debug/Common/commit.sys" />
 		<Unit filename="_bin/Debug/Common/config.INI" />
 		<Unit filename="_bin/Debug/README.TXT" />
@@ -365,6 +367,7 @@ implementar switch para buscar HASH en tabla interna o redirigir a redump.org
 		<Unit filename="wxsmith/NDBMan.wxs" />
 		<Unit filename="wxsmith/PFSShellBrowser.wxs" />
 		<Unit filename="wxsmith/Post_Install_Report.wxs" />
+		<Unit filename="wxsmith/UpdateMan.wxs" />
 		<Unit filename="wxsmith/mkpartdlg.wxs" />
 		<Unit filename="wxsmith/pfsshell_wizard.wxs" />
 		<Unit filename="xpm/cd.xpm" />
@@ -399,6 +402,7 @@ implementar switch para buscar HASH en tabla interna o redirigir a redump.org
 					<wxDialog wxs="wxsmith/mkpartdlg.wxs" src="mkpartdlg.cpp" hdr="mkpartdlg.h" fwddecl="0" i18n="1" name="mkpartdlg" language="CPP" />
 					<wxDialog wxs="wxsmith/MD5Report.wxs" src="MD5Report.cpp" hdr="MD5Report.h" fwddecl="0" i18n="1" name="MD5Report" language="CPP" />
 					<wxDialog wxs="wxsmith/PFSShellBrowser.wxs" src="PFSShellBrowser.cpp" hdr="PFSShellBrowser.h" fwddecl="0" i18n="1" name="PFSShellBrowser" language="CPP" />
+					<wxDialog wxs="wxsmith/UpdateMan.wxs" src="UpdateMan.cpp" hdr="UpdateMan.h" fwddecl="0" i18n="1" name="UpdateMan" language="CPP" />
 				</resources>
 			</wxsmith>
 		</Extensions>

diff --git a/HDL-Batch-installer-SRC/HDL_Batch_installerApp.cpp b/HDL-Batch-installer-SRC/HDL_Batch_installerApp.cpp
@@ -7,6 +7,7 @@
  * License:   GPL-3.0
  **************************************************************/
 #include "HDL_Batch_installerApp.h"
+#include "UpdateMan.h"
 #include "flags.h"
 #include <wx/snglinst.h>
 
@@ -221,11 +222,12 @@ bool HDL_Batch_installerApp::OnInit()
     }
 
     SPLASH_SCREEN->Hide();
-    HDL_Batch_installerFrame* Frame = new HDL_Batch_installerFrame(0,m_locale,custom_styles,ctor_flags);
+    HDL_Batch_installerFrame* Frame = new HDL_Batch_installerFrame(nullptr ,m_locale,custom_styles,ctor_flags);
     delete SPLASH_SCREEN;
     if (new_ver_available)
     {
-        if (wxMessageBox(wxString::Format(_("There's an update available for this program!\n\nGo to download page?\n\nCurrent version: [%s]\nLatest version: [%s]"), versionTAG, svr_ver),"",wxICON_INFORMATION|wxYES_NO) == wxYES)
+        UpdateMan* A = new UpdateMan(nullptr, svr_ver, versionTAG);
+        if (A->ShowModal() == wxYES)
             wxLaunchDefaultBrowser("https://github.com/israpps/HDL-Batch-installer/releases");
     }
     if (first_time)

diff --git a/HDL-Batch-installer-SRC/PFSShellBrowser.cpp b/HDL-Batch-installer-SRC/PFSShellBrowser.cpp
@@ -363,9 +363,9 @@ void PFSShellBrowser::RefreshList(void) {
                 continue; // sub partition
         } else {
             if (
-                ((m & FIO_S_IFMT) != FIO_S_IFLNK) && // not symlink
+                (((m & FIO_S_IFMT) != FIO_S_IFLNK) && // not symlink
                 ((m & FIO_S_IFMT) != FIO_S_IFREG) && // not file?
-                ((m & FIO_S_IFMT) != FIO_S_IFDIR) // not dir
+                ((m & FIO_S_IFMT) != FIO_S_IFDIR)) // not dir
                 || !strcasecmp(".", ITEMLIST[x].name) // not parent
                 ) continue; // ignoring non supported elements and `..`
         }

diff --git a/HDL-Batch-installer-SRC/UpdateMan.cpp b/HDL-Batch-installer-SRC/UpdateMan.cpp
@@ -0,0 +1,89 @@
+#include "UpdateMan.h"
+
+#include <wx/arrstr.h>
+//(*InternalHeaders(UpdateMan)
+#include <wx/intl.h>
+#include <wx/string.h>
+//*)
+
+//(*IdInit(UpdateMan)
+const long UpdateMan::ID_STATICTEXT2 = wxNewId();
+const long UpdateMan::ID_TEXTCTRL1 = wxNewId();
+const long UpdateMan::ID_BUTTON1 = wxNewId();
+const long UpdateMan::ID_BUTTON2 = wxNewId();
+//*)
+
+BEGIN_EVENT_TABLE(UpdateMan,wxDialog)
+	//(*EventTable(UpdateMan)
+	//*)
+END_EVENT_TABLE()
+
+UpdateMan::UpdateMan(wxWindow* parent, wxString newv, wxString oldv, wxWindowID id, const wxPoint& pos, const wxSize& size)
+{
+	//(*Initialize(UpdateMan)
+	wxBoxSizer* BoxSizer1;
+	wxBoxSizer* BoxSizer2;
+	wxBoxSizer* BoxSizer4;
+	wxStaticBoxSizer* StaticBoxSizer1;
+
+	Create(parent, id, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxCAPTION|wxRESIZE_BORDER|wxDIALOG_NO_PARENT|wxMAXIMIZE_BOX, _T("id"));
+	SetClientSize(wxDefaultSize);
+	Move(wxDefaultPosition);
+	BoxSizer1 = new wxBoxSizer(wxVERTICAL);
+	BoxSizer2 = new wxBoxSizer(wxVERTICAL);
+	heading = new wxStaticText(this, ID_STATICTEXT2, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE, _T("ID_STATICTEXT2"));
+	heading->SetMinSize(wxSize(200,0));
+	BoxSizer2->Add(heading, 1, wxALL|wxEXPAND, 5);
+	BoxSizer1->Add(BoxSizer2, 2, wxALL|wxEXPAND, 5);
+	StaticBoxSizer1 = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Changes:"));
+	UpdateDetails = new wxTextCtrl(this, ID_TEXTCTRL1, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY, wxDefaultValidator, _T("ID_TEXTCTRL1"));
+	UpdateDetails->SetMinSize(wxSize(700,200));
+	StaticBoxSizer1->Add(UpdateDetails, 2, wxEXPAND, 5);
+	BoxSizer1->Add(StaticBoxSizer1, 3, wxLEFT|wxRIGHT|wxEXPAND, 5);
+	BoxSizer4 = new wxBoxSizer(wxHORIZONTAL);
+	OK = new wxButton(this, ID_BUTTON1, _("OK"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_BUTTON1"));
+	BoxSizer4->Add(OK, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
+	CANCEL = new wxButton(this, ID_BUTTON2, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_BUTTON2"));
+	BoxSizer4->Add(CANCEL, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
+	BoxSizer1->Add(BoxSizer4, 1, wxALL|wxEXPAND, 5);
+	SetSizer(BoxSizer1);
+	BoxSizer1->Fit(this);
+	BoxSizer1->SetSizeHints(this);
+
+	Connect(ID_BUTTON1,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&UpdateMan::OnOKClick);
+	Connect(ID_BUTTON2,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&UpdateMan::OnCANCELClick);
+	//*)
+	wxString msg;
+	msg.Printf(_("There's an update available for this program!\n\nGo to download page?\n\nCurrent version: [%s]\nLatest version: [%s]"), oldv, newv);
+    heading->SetLabel(msg);
+    wxArrayString data;
+    long a = wxExecute("Common\\WGET.EXE -q https://github.com/israpps/HDL-Batch-installer/raw/main/Release/changes.log -O -", data, wxEXEC_SYNC);
+    if (a == 0) {
+        for (size_t x=0, s=0; x < data.GetCount() && s < 2; x++) {
+            if (data.Item(x) == wxEmptyString) {
+                //std::cout << "empty line at :"<<x<<"\n";
+                s++;
+            }
+            UpdateDetails->AppendText(data.Item(x));
+            UpdateDetails->AppendText("\n");
+        }
+    } else {UpdateDetails->AppendText(_("Failed to obtain update changelog!"));}
+	wxBell();
+}
+
+UpdateMan::~UpdateMan()
+{
+	//(*Destroy(UpdateMan)
+	//*)
+}
+
+
+void UpdateMan::OnOKClick(wxCommandEvent& event)
+{
+    EndModal(wxYES);
+}
+
+void UpdateMan::OnCANCELClick(wxCommandEvent& event)
+{
+    EndModal(wxNO);
+}

diff --git a/HDL-Batch-installer-SRC/UpdateMan.h b/HDL-Batch-installer-SRC/UpdateMan.h
@@ -0,0 +1,45 @@
+#ifndef UPDATEMAN_H
+#define UPDATEMAN_H
+
+//(*Headers(UpdateMan)
+#include <wx/button.h>
+#include <wx/dialog.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+//*)
+
+class UpdateMan: public wxDialog
+{
+	public:
+
+		UpdateMan(wxWindow* parent, wxString newv, wxString oldv ,wxWindowID id=wxID_ANY,const wxPoint& pos=wxDefaultPosition,const wxSize& size=wxDefaultSize);
+		virtual ~UpdateMan();
+
+		//(*Declarations(UpdateMan)
+		wxButton* CANCEL;
+		wxButton* OK;
+		wxStaticText* heading;
+		wxTextCtrl* UpdateDetails;
+		//*)
+
+	protected:
+
+		//(*Identifiers(UpdateMan)
+		static const long ID_STATICTEXT2;
+		static const long ID_TEXTCTRL1;
+		static const long ID_BUTTON1;
+		static const long ID_BUTTON2;
+		//*)
+
+	private:
+
+		//(*Handlers(UpdateMan)
+		void OnOKClick(wxCommandEvent& event);
+		void OnCANCELClick(wxCommandEvent& event);
+		//*)
+
+		DECLARE_EVENT_TABLE()
+};
+
+#endif
diff --git a/HDL-Batch-installer-SRC/_bin/playground/HDL-Batch-installer-x86.exe b/HDL-Batch-installer-SRC/_bin/playground/HDL-Batch-installer-x86.exe
diff --git a/HDL-Batch-installer-SRC/_bin/playground/HDL-Batch-installer.exe b/HDL-Batch-installer-SRC/_bin/playground/HDL-Batch-installer.exe
diff --git a/HDL-Batch-installer-SRC/_bin/playground/changes.log b/HDL-Batch-installer-SRC/_bin/playground/changes.log
@@ -1,3 +1,10 @@
+10 September 2024
+   [v3.6.0 - Revision 2]
+
+     Change log:
+        -HDDManager: Darker green for better readability (credits to @lottehime for the idea)
+        -Update manager: added dedicated update information UI wich will download and display the changelog for the latest update
+
 24 May 2024
    [v3.6.0 - Revision 1]
 

diff --git a/HDL-Batch-installer-SRC/version.h b/HDL-Batch-installer-SRC/version.h
@@ -4,10 +4,10 @@
 namespace AutoVersion{
 
 	//Date Version Types
-	static const char DATE[] = "24";
-	static const char MONTH[] = "05";
+	static const char DATE[] = "10";
+	static const char MONTH[] = "09";
 	static const char YEAR[] = "2024";
-	static const char UBUNTU_VERSION_STYLE[] =  "24.05";
+	static const char UBUNTU_VERSION_STYLE[] =  "24.09";
 
 	//Software Status
 	static const char STATUS[] =  "Release Candidate";
@@ -17,13 +17,13 @@ namespace AutoVersion{
 	static const long MAJOR  = 3;
 	static const long MINOR  = 6;
 	static const long BUILD  = 0;
-	static const long REVISION  = 1;
+	static const long REVISION  = 2;
 
 	//Miscellaneous Version Types
-	static const long BUILDS_COUNT  = 12;
-	#define RC_FILEVERSION 3,6,0,1
-	#define RC_FILEVERSION_STRING "3, 6, 0, 1\0"
-	static const char FULLVERSION_STRING [] = "3.6.0.1";
+	static const long BUILDS_COUNT  = 0;
+	#define RC_FILEVERSION 3,6,0,2
+	#define RC_FILEVERSION_STRING "3, 6, 0, 2\0"
+	static const char FULLVERSION_STRING [] = "3.6.0.2";
 
 	//These values are to keep track of your versioning state, don't modify them.
 	static const long BUILD_HISTORY  = 99;

diff --git a/HDL-Batch-installer-SRC/wxsmith/UpdateMan.wxs b/HDL-Batch-installer-SRC/wxsmith/UpdateMan.wxs
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<wxsmith>
+	<object class="wxDialog" name="UpdateMan">
+		<pos_arg>1</pos_arg>
+		<size_arg>1</size_arg>
+		<style>wxRESIZE_BORDER|wxDIALOG_NO_PARENT|wxMAXIMIZE_BOX</style>
+		<object class="wxBoxSizer" variable="BoxSizer1" member="no">
+			<orient>wxVERTICAL</orient>
+			<object class="sizeritem">
+				<object class="wxBoxSizer" variable="BoxSizer2" member="no">
+					<orient>wxVERTICAL</orient>
+					<object class="sizeritem">
+						<object class="wxStaticText" name="ID_STATICTEXT2" variable="heading" member="yes">
+							<label></label>
+							<minsize>200,0</minsize>
+							<style>wxALIGN_CENTRE</style>
+						</object>
+						<flag>wxALL|wxEXPAND</flag>
+						<border>5</border>
+						<option>1</option>
+					</object>
+				</object>
+				<flag>wxALL|wxEXPAND</flag>
+				<border>5</border>
+				<option>2</option>
+			</object>
+			<object class="sizeritem">
+				<object class="wxStaticBoxSizer" variable="StaticBoxSizer1" member="no">
+					<label>Changes:</label>
+					<object class="sizeritem">
+						<object class="wxTextCtrl" name="ID_TEXTCTRL1" variable="UpdateDetails" member="yes">
+							<minsize>700,200</minsize>
+							<style>wxTE_MULTILINE|wxTE_READONLY</style>
+						</object>
+						<flag>wxEXPAND</flag>
+						<border>5</border>
+						<option>2</option>
+					</object>
+				</object>
+				<flag>wxLEFT|wxRIGHT|wxEXPAND</flag>
+				<border>5</border>
+				<option>3</option>
+			</object>
+			<object class="sizeritem">
+				<object class="wxBoxSizer" variable="BoxSizer4" member="no">
+					<object class="sizeritem">
+						<object class="wxButton" name="ID_BUTTON1" variable="OK" member="yes">
+							<label>OK</label>
+							<handler function="OnOKClick" entry="EVT_BUTTON" />
+						</object>
+						<flag>wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL</flag>
+						<border>5</border>
+						<option>1</option>
+					</object>
+					<object class="sizeritem">
+						<object class="wxButton" name="ID_BUTTON2" variable="CANCEL" member="yes">
+							<label>Cancel</label>
+							<handler function="OnCANCELClick" entry="EVT_BUTTON" />
+						</object>
+						<flag>wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL</flag>
+						<border>5</border>
+						<option>1</option>
+					</object>
+				</object>
+				<flag>wxALL|wxEXPAND</flag>
+				<border>5</border>
+				<option>1</option>
+			</object>
+		</object>
+	</object>
+</wxsmith>
diff --git a/Release/HDL-Batch-installer.exe b/Release/HDL-Batch-installer.exe
diff --git a/Release/changes.log b/Release/changes.log
@@ -1,3 +1,10 @@
+10 September 2024
+   [v3.6.0 - Revision 2]
+
+     Change log:
+        -HDDManager: Darker green for better readability (credits to @lottehime for the idea)
+        -Update manager: added dedicated update information UI wich will download and display the changelog for the latest update
+
 24 May 2024
    [v3.6.0 - Revision 1]
 
@@ -11,14 +18,12 @@
    [v3.6.0 - Revision 0]
 
      Change log:
-        -__NEW__: builtin PFS Filebrowser (only for 64bit version)
         -__NEW__: builtin PFS Filebrowser
         -PFS Filebrowser: allow operating on both physical HDDs connected to the PC and Virtual Images (eg: HDD dump or PCSX2 Images)
         -UI: Added Icons for most menus, dialogs and popups
         -Install queue and installed game list: Display a disc icon on the list with unique colors for CD, DVD and dual layer images
         -install queue: Dont show a dialogue telling how many games were added to queue if no errors arised
 
-IMPORTANT: this new PFS Filebrowser could still have some bugs around on the UI handling. its not perfect. however the backend is rock solid. if you find any issues on this new feature, please report it so I can fix it ASAP
 13 March 2024
    [v3.5.1 - Revision 6]
 

diff --git a/Release32/HDL-Batch-installer.exe b/Release32/HDL-Batch-installer.exe