Merge pull request #19 from yousefvand/dev

Dev

.github/workflows/cmake-multi-platform.yml

@@ -54,6 +54,76 @@ jobs:
         choco install visualstudio2022buildtools -y
         choco install ninja -y
         choco install cmake --installargs 'ADD_CMAKE_TO_PATH=System' -y
+        choco install python3 -y
+        choco install llvm -y
+        choco install gperf -y
+        pip install html5lib
+
+    - name: Cache Qt Source (Windows)
+      if: matrix.os == 'windows-latest'
+      uses: actions/cache@v3
+      with:
+        path: D:\qt-source
+        key: qt-source-6.5.3
+        restore-keys: qt-source-
+
+    - name: Download Qt Source if Missing (Windows)
+      if: matrix.os == 'windows-latest'
+      shell: powershell
+      run: |
+        $qtSourceDir = "D:\qt-source"
+        $qtZip = "$qtSourceDir\qt-everywhere-src-6.5.3.zip"
+
+        if (-Not (Test-Path "$qtSourceDir\qt-everywhere-src-6.5.3\qtbase\configure.bat")) {
+          Write-Host "Qt source not found in cache. Downloading..."
+          New-Item -ItemType Directory -Path $qtSourceDir -Force
+          Invoke-WebRequest -Uri "https://download.qt.io/official_releases/qt/6.5/6.5.3/single/qt-everywhere-src-6.5.3.zip" -OutFile $qtZip
+          Expand-Archive -Path $qtZip -DestinationPath $qtSourceDir
+        } else {
+          Write-Host "Qt source found in cache."
+        }
+
+    - name: Build and Install Qt from Source (Windows)
+      if: matrix.os == 'windows-latest'
+      shell: cmd
+      run: |
+        REM Locate Visual Studio Build Tools
+        FOR /F "tokens=*" %%i IN ('"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" ^
+          -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath') DO SET VS_PATH=%%i
+        IF NOT DEFINED VS_PATH (
+          echo Visual Studio Build Tools not found! && exit /b 1
+        )
+        SET "VS_VARS_CMD=%VS_PATH%\VC\Auxiliary\Build\vcvars64.bat"
+        CALL "%VS_VARS_CMD%" || exit /b 1
+
+        REM Build Qt from source
+        SET QT_SOURCE=D:\qt-source\qt-everywhere-src-6.5.3
+        IF NOT EXIST "%QT_SOURCE%\qtbase\configure.bat" (
+          echo "configure.bat not found in %QT_SOURCE%\qtbase" && exit /b 1
+        )
+        cd "%QT_SOURCE%\qtbase"
+        call configure.bat -top-level -prefix C:\Qt -release -opensource -confirm-license -nomake examples -nomake tests -platform win32-msvc -cmake-generator Ninja ^
+          -DFEATURE_clang=ON ^
+          -DFEATURE_clangcpp=ON ^
+          -DLLVM_INSTALL_DIR="C:/Program Files/LLVM" ^
+          -Wno-dev || exit /b 1
+
+        REM Verify if build.ninja exists
+        IF NOT EXIST build.ninja (
+          echo "Error: build.ninja not generated. Check configuration step for issues." && exit /b 1
+        )
+
+        REM Proceed with the build and install steps
+        ninja || exit /b 1
+        ninja install || exit /b 1
+
+    - name: Set Qt Environment Variables (Windows)
+      if: matrix.os == 'windows-latest'
+      shell: powershell
+      run: |
+        echo "Qt6_DIR=C:\Qt\lib\cmake\Qt6" >> $env:GITHUB_ENV
+        echo "QT_PLUGIN_PATH=C:\Qt\plugins" >> $env:GITHUB_ENV
+        echo "QML2_IMPORT_PATH=C:\Qt\qml" >> $env:GITHUB_ENV
 
     - name: Configure CMake
       run: |

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 0.0.54
+
+- Implemented:
+- Search Menu -> Finished
+
 ## 0.0.53
 
 - Implemented:

CMakeLists.txt.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 14.0.2, 2024-11-23T23:54:00. -->
+<!-- Written by QtCreator 14.0.2, 2024-11-27T13:10:58. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -102,14 +102,14 @@
     <value type="int" key="CMake.Configure.BaseEnvironment">2</value>
     <value type="bool" key="CMake.Configure.ClearSystemEnvironment">false</value>
     <valuelist type="QVariantList" key="CMake.Configure.UserEnvironmentChanges"/>
-    <value type="QString" key="CMake.Initial.Parameters">-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
--DCMAKE_BUILD_TYPE:STRING=Debug
--DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
+    <value type="QString" key="CMake.Initial.Parameters">-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
 -DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
 -DCMAKE_GENERATOR:STRING=Ninja
--DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
--DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
--DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake</value>
+-DCMAKE_BUILD_TYPE:STRING=Debug
+-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
+-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
+-DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
+-DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}</value>
     <value type="QString" key="CMake.Source.Directory">/data/Code/Qt/Notepad--</value>
     <value type="int" key="EnableQmlDebugging">0</value>
     <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/data/Code/Qt/Notepad--/build/Desktop-Debug</value>
@@ -160,14 +160,14 @@
     <value type="int" key="CMake.Configure.BaseEnvironment">2</value>
     <value type="bool" key="CMake.Configure.ClearSystemEnvironment">false</value>
     <valuelist type="QVariantList" key="CMake.Configure.UserEnvironmentChanges"/>
-    <value type="QString" key="CMake.Initial.Parameters">-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
--DCMAKE_BUILD_TYPE:STRING=Release
--DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
+    <value type="QString" key="CMake.Initial.Parameters">-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
 -DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
 -DCMAKE_GENERATOR:STRING=Ninja
--DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
--DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
--DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake</value>
+-DCMAKE_BUILD_TYPE:STRING=Release
+-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
+-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
+-DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
+-DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}</value>
     <value type="QString" key="CMake.Source.Directory">/data/Code/Qt/Notepad--</value>
     <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/data/Code/Qt/Notepad--/build/Desktop-Release</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">

src/systemfind/systemfinddialog.cpp

@@ -38,8 +38,6 @@ SystemFindDialog::SystemFindDialog(QWidget *parent)
     // Connect advancedOptions checkbox to toggle advanced options visibility
     connect(ui->advancedOptions, &QCheckBox::toggled, this, &SystemFindDialog::toggleAdvancedOptions);
 
-    m_searchOptions->findMethod = FindMethod::SimpleText; // default method
-
     ui->comboBoxFind->installEventFilter(this);
     ui->comboBoxLocation->installEventFilter(this);
     ui->comboBoxPattern->installEventFilter(this);