chore: do something make windows happy

Author: x-tools-author

CMakeLists.txt

@@ -159,7 +159,7 @@ if(APPLE)
     POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_SOURCE_DIR}/res/files"
             "$<TARGET_FILE_DIR:wxTools>/../Resources/files")
-else()
+elseif(LINUX)
   add_custom_command(
     TARGET wxTools
     POST_BUILD

src/Common/wxTools.cpp

@@ -23,6 +23,23 @@
 #include "iconv.h"
 #endif
 
+wxString wxtMsAppLocalDataPath()
+{
+    // The path is: C:\Users\<User>\AppData\Local\wxTools
+    wxString path = wxStandardPaths::Get().GetUserLocalDataDir();
+
+    // Remove "/wxTools" from path, now the path is: C:\Users\<User>\AppData\Local
+    path = path.BeforeLast(wxFileName::GetPathSeparator());
+
+    // Using Microsoft app path:
+    // C:\Users\<User>\AppData\Local\Packages\50263Qsaker2018.wxTools_83fbcck3baqe6\LocalState
+    const wxString appFlag = wxString("50263Qsaker2018.wxTools_83fbcck3baqe6");
+    path += wxString(wxFileName::GetPathSeparator()) + wxString("Packages");
+    path += wxString(wxFileName::GetPathSeparator()) + appFlag;
+
+    return path;
+}
+
 void FailureWriter(const char *data, size_t size)
 {
     // Remove the settings file
@@ -34,11 +51,19 @@ void FailureWriter(const char *data, size_t size)
 
 std::string LogPath()
 {
+#if defined(__WINDOWS__)
+#if defined(WXT_PORTABLE_EDITION)
     wxString path = GetSettingsPath();
     path += wxFileName::GetPathSeparator();
     path += wxString("..");
     path += wxFileName::GetPathSeparator();
     path += wxString("log");
+#else
+    wxString path = wxtMsAppLocalDataPath();
+    path += wxString(wxFileName::GetPathSeparator()) + wxString("LocalState");
+    path += wxString(wxFileName::GetPathSeparator()) + wxString("log");
+#endif
+#endif
 
 #if defined(WIN32)
     wxMkDir(path);
@@ -1133,11 +1158,24 @@ void SetComboBoxSectionByIntClientData(wxComboBox *comboBox, int clientDataValue
 
 wxString GetSettingsPath()
 {
-#if defined(WXT_PORTABLE_EDITION) && defined(WIN32)
+#if defined(__WINDOWS__)
+#if defined(WXT_PORTABLE_EDITION)
     wxString path = wxGetCwd() + wxFileName::GetPathSeparator() + wxString("conf");
 #else
+    wxString path = wxtMsAppLocalDataPath();
+    path += wxString(wxFileName::GetPathSeparator()) + wxString("Settings");
+    path += wxString(wxFileName::GetPathSeparator()) + wxString("conf");
+#endif
+#endif
+
+#if defined(__LINUX__)
     wxString path = wxStandardPaths::Get().GetUserDataDir();
 #endif
+
+#if defined(__APPLE__)
+    wxString path = wxStandardPaths::Get().GetUserDataDir();
+#endif
+
     // Make full dir...
     if (!wxDirExists(path)) {
 #if defined(WIN32)

src/MainWindow.cpp

@@ -348,7 +348,11 @@ void MainWindow::InitMenuHelp(wxMenuBar* menuBar)
 
     // if history file not found, ignore this menu item
     wxString historyFileName = GetHistoryFileName();
+#if defined(__WINDOWS__)
+    {
+#else
     if (wxFileExists(historyFileName)) {
+#endif
         tmpId = wxtNewID();
         menuHelp->Append(tmpId, _("History"), _("Show the history of the application."));
         Bind(wxEVT_MENU, &MainWindow::DoShowHistory, this, tmpId);
@@ -510,12 +514,18 @@ void MainWindow::DoCheckForUpdates(wxCommandEvent&)
 
 void MainWindow::DoShowHistory(wxCommandEvent&)
 {
+#if defined(__WINDOWS__)
+    int len = 0;
+    char* txt = wxLoadUserResource(wxString("HISTORY_TXT"), wxT("TEXT"), &len);
+    wxString historyText = wxString::FromUTF8(txt, len);
+    delete[] txt;
+#else
     wxString path = GetHistoryFileName();
     if (!wxFileExists(path)) {
         wxMessageBox(_("History file not found!"), _("Error"), wxOK | wxICON_ERROR);
         return;
     }
-
+#endif
     wxDialog dlg(this, wxID_ANY, _("wxTools Release History"), wxDefaultPosition, wxSize(600, 400));
     dlg.SetIcon(wxArtProvider::GetIcon(wxART_INFORMATION, wxART_OTHER, wxSize(64, 64)));
     wxTextCtrl* textCtrl = new wxTextCtrl(&dlg,
@@ -524,7 +534,11 @@ void MainWindow::DoShowHistory(wxCommandEvent&)
                                           wxDefaultPosition,
                                           wxDefaultSize,
                                           wxTE_MULTILINE | wxTE_DONTWRAP | wxTE_READONLY);
+#if defined(__WINDOWS__)
+    textCtrl->SetValue(historyText);
+#else
     textCtrl->LoadFile(path);
+#endif
     dlg.ShowModal();
 }
 

wxTools.rc

@@ -1 +1,2 @@
 IDI_ICON1 ICON DISCARDABLE "wxTools.ico"
+HISTORY_TXT TEXT "res/files/history.txt"