diff --git a/.github/workflows/build-portable.yml b/.github/workflows/build-portable.yml new file mode 100644 index 00000000..03cfe7dd --- /dev/null +++ b/.github/workflows/build-portable.yml @@ -0,0 +1,33 @@ + +name: Build Ditto Portable + +on: + workflow_dispatch: + +jobs: + build: + runs-on: windows-latest + + steps: + - name: Checkout source + uses: actions/checkout@v4 + + - name: Add MSBuild to PATH + uses: microsoft/setup-msbuild@v2 + + - name: Restore NuGet packages + run: nuget restore CP_Main_10.sln + + - name: Build Ditto x64 + run: msbuild CP_Main_10.sln /p:Configuration=Release /p:Platform=x64 + + - name: Create portable ZIP + run: .\DittoSetup\BuildPortableZIP.bat "DittoPortable" bit64 + + - name: Upload portable build + uses: actions/upload-artifact@v4 + with: + name: Ditto-Portable-x64 + path: DittoSetup/output/DittoPortable*.zip + if-no-files-found: error + retention-days: 7 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f3489bc6..75f1f2ae 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,141 +15,57 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v4 - - - name: Generate build number - id: buildnumber - uses: onyxmueller/build-tag-number@v1 - with: - token: ${{secrets.GITHUB_TOKEN}} - - name: Set the value run: | echo "VERSION_FILENAME=3_25_${env:BUILD_NUMBER}_0" | Out-File -FilePath $env:GITHUB_ENV -Append echo "VERSION_DOT_FILENAME=3.25.${env:BUILD_NUMBER}.0" | Out-File -FilePath $env:GITHUB_ENV -Append - + + - name: Checkout source + uses: actions/checkout@v4 + with: + repository: hardcorehdc/Ditto + ref: master + clean: true + fetch-depth: 1 + + - name: Verify checkout + shell: pwsh + run: | + Write-Host "Workspace: $env:GITHUB_WORKSPACE" + Write-Host "GitHub repository: $env:GITHUB_REPOSITORY" + git status + Get-ChildItem -Force + if (!(Test-Path "CP_Main_10.sln")) { + throw "CP_Main_10.sln not found after checkout" + } + + - name: Diagnose repository files + shell: pwsh + run: | + Write-Host "Workspace: $env:GITHUB_WORKSPACE" + Write-Host "Root files:" + Get-ChildItem $env:GITHUB_WORKSPACE -Force | + Format-Table Name, Mode + Write-Host "Solution files:" + Get-ChildItem $env:GITHUB_WORKSPACE -Filter "*.sln*" -Recurse | + Select-Object -ExpandProperty FullName + - name: Add MSBuild to PATH uses: microsoft/setup-msbuild@v2 - name: Restore NuGet packages - working-directory: ${{env.GITHUB_WORKSPACE}} - run: nuget restore ${{env.SOLUTION_FILE_PATH}} - - - name: Build + run: nuget restore CP_Main_10.sln + + - name: Build Ditto x64 run: msbuild CP_Main_10.sln /p:Configuration=Release /p:Platform=x64 - - - name: Set Versions - run: | - DittoSetup\rcedit-x64 Release64\Ditto.exe --set-file-version ${{env.VERSION_DOT_FILENAME}} --set-product-version ${{env.VERSION_DOT_FILENAME}} - - name: upload-unsigned-exe - id: upload-unsigned-exe - uses: actions/upload-artifact@v4 - with: - name: unsigned-exe - retention-days: 1 - path: | - Release64\Ditto.exe - Release64\ICU_Loader.dll - Release64\Addins\DittoUtil.dll - - - id: sign-exe - uses: signpath/github-action-submit-signing-request@v1.1 - with: - api-token: '${{ secrets.SIGNPATH_API_TOKEN }}' - organization-id: 'fcf33ea4-4343-46b3-be50-f8fe64e1a900' - project-slug: 'Ditto' - artifact-configuration-slug: 'exe' - signing-policy-slug: 'release-signing' - github-artifact-id: '${{ steps.upload-unsigned-exe.outputs.artifact-id }}' - wait-for-completion: true - output-artifact-directory: '/Release64' - - - name: Installer - uses: Minionguyjpro/Inno-Setup-Action@v1.2.7 - with: - path: DittoSetup\DittoSetup_10.iss - - - name: upload-unsigned-artifact - id: upload-unsigned-artifact + - name: Create portable ZIP + run: .\DittoSetup\BuildPortableZIP.bat "DittoPortable" bit64 + + - name: Upload portable build uses: actions/upload-artifact@v4 - with: - name: unsigned-intaller - retention-days: 1 - path: DittoSetup\output\DittoSetup_${{env.VERSION_FILENAME}}.exe - - - id: sing-installer - uses: signpath/github-action-submit-signing-request@v1.1 with: - api-token: '${{ secrets.SIGNPATH_API_TOKEN }}' - organization-id: 'fcf33ea4-4343-46b3-be50-f8fe64e1a900' - project-slug: 'Ditto' - artifact-configuration-slug: 'Installer' - signing-policy-slug: 'release-signing' - github-artifact-id: '${{ steps.upload-unsigned-artifact.outputs.artifact-id }}' - wait-for-completion: true - output-artifact-directory: '/DittoSetup/output' - - - name: Build Portable - run: | - DittoSetup\BuildPortableZIP.bat "DittoPortable_${{env.VERSION_FILENAME}}" bit64 - - - name: Zip Debug Files - run: | - 7z a DittoSetup\output\DittoDebug_${{env.VERSION_FILENAME}}.7z *.pdb -r - 7z a DittoSetup\output\DittoDebug_${{env.VERSION_FILENAME}}.7z *.map -r - - - name: Choco - Ditto - run: | - (Get-Content 'DittoSetup\Chocolatey\ditto.nuspec' -Raw).Replace("%version%", "${{env.VERSION_DOT_FILENAME}}") | Out-File 'DittoSetup\Chocolatey\ditto.nuspec' - copy DittoSetup\Output\DittoSetup_${{env.VERSION_FILENAME}}.exe DittoSetup\Chocolatey\tools\DittoSetup_${{env.VERSION_FILENAME}}.exe - cd DittoSetup\Chocolatey - choco pack - choco push --source https://push.chocolatey.org/ --key ${{ secrets.CHOCO_API_KEY}} - cd .. - cd .. - - - name: Choco - Ditto.Install - run: | - (Get-Content 'DittoSetup\Chocolatey.install\ditto.nuspec' -Raw).Replace("%version%", "${{env.VERSION_DOT_FILENAME}}") | Out-File 'DittoSetup\Chocolatey.install\ditto.nuspec' - copy DittoSetup\output\DittoSetup_${{env.VERSION_FILENAME}}.exe DittoSetup\Chocolatey.install\tools\DittoSetup_${{env.VERSION_FILENAME}}.exe - cd DittoSetup\Chocolatey.install - choco pack - choco push --source https://push.chocolatey.org/ --key ${{ secrets.CHOCO_API_KEY}} - cd .. - cd .. - - - name: Choco - Ditto.Portable - run: | - (Get-Content 'DittoSetup\Chocolatey.portable\ditto.nuspec' -Raw).Replace("%version%", "${{env.VERSION_DOT_FILENAME}}") | Out-File 'DittoSetup\Chocolatey.portable\ditto.nuspec' - copy DittoSetup\output\DittoPortable_${{env.VERSION_FILENAME}}.zip DittoSetup\Chocolatey.portable\tools\DittoPortable_${{env.VERSION_FILENAME}}.zip - cd DittoSetup\Chocolatey.portable - choco pack - choco push --source https://push.chocolatey.org/ --key ${{ secrets.CHOCO_API_KEY}} - cd .. - cd .. - - - name: Build appx - run: | - 7z x DittoSetup\output\DittoPortable_${{env.VERSION_FILENAME}}.zip -oDittoSetup\appx -r - (Get-Content 'DittoSetup\appx\appxmanifest.xml' -Raw).Replace("%version%", "${{env.VERSION_DOT_FILENAME}}") | Out-File 'DittoSetup\appx\appxmanifest.xml' - cd DittoSetup\appx - - $env:Path += ";C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x86" - - makeappx.exe pack /f files.ini /p Ditto_${{env.VERSION_FILENAME}}.appx - signtool.exe sign -f my.pfx -fd SHA256 -v Ditto_${{env.VERSION_FILENAME}}.appx - cd .. - cd .. - copy DittoSetup\appx\Ditto_${{env.VERSION_FILENAME}}.appx DittoSetup\Output\Ditto_${{env.VERSION_FILENAME}}.appx - - - name: Publish to GitHub - env: - token: ${{secrets.GITHUB_TOKEN}} - uploadPath: DittoSetup\output\ - tag: ${{env.VERSION_FILENAME}} - previous_tag: 3.25.113.0 - run: | - npm install ./DittoSetup/GitHubRelease - node ./DittoSetup/GitHubRelease/index.js - + name: Ditto-Portable-x64 + path: DittoSetup/output/DittoPortable*.zip + if-no-files-found: error + retention-days: 7 diff --git a/CP_Main.rc b/CP_Main.rc index 5a41e2b4..e756f983 100644 --- a/CP_Main.rc +++ b/CP_Main.rc @@ -904,7 +904,7 @@ BEGIN PUSHBUTTON "About Language",IDC_BUTTON_ABOUT,207,60,106,14 EDITTEXT IDC_PATH,67,148,283,12,ES_AUTOHSCROLL PUSHBUTTON "....",IDC_GET_PATH,354,148,14,12 - LTEXT "Days",IDC_STATIC_DAYS,196,40,51,12,SS_CENTERIMAGE + LTEXT "Minutes",IDC_STATIC_DAYS,196,40,70,12,SS_CENTERIMAGE LTEXT "Language",IDC_STATIC_LANGUAGE,9,60,36,12,SS_CENTERIMAGE LTEXT "Include",IDC_STATIC_INCLUDE_APPS,14,191,36,13,SS_CENTERIMAGE LTEXT "Exclude",IDC_STATIC_EXCLUDE_APPS,14,213,36,13,SS_CENTERIMAGE diff --git a/Debug/Language/Bulgarian.xml b/Debug/Language/Bulgarian.xml index 0f9c0614..11a3a96b 100644 --- a/Debug/Language/Bulgarian.xml +++ b/Debug/Language/Bulgarian.xml @@ -1,4 +1,4 @@ - + Групи @@ -181,7 +181,7 @@ Икона в системната лента Максимален брой на пазените елементи Елементите губят давност след - дена + минути Проверяване Допускане на дублирани diff --git a/Debug/Language/Chinese Simplified.xml b/Debug/Language/Chinese Simplified.xml index 406de259..8611cfd5 100644 --- a/Debug/Language/Chinese Simplified.xml +++ b/Debug/Language/Chinese Simplified.xml @@ -1,4 +1,4 @@ - + 组 @@ -194,7 +194,7 @@ 在系统托盘显示图标 保存复制项目的最大数量 粘贴条目的过期日期 - 天 + 分钟 压缩和修复 立即检查 允许重复 diff --git a/Debug/Language/Chinese Traditional.xml b/Debug/Language/Chinese Traditional.xml index 86cc8a42..da453497 100644 --- a/Debug/Language/Chinese Traditional.xml +++ b/Debug/Language/Chinese Traditional.xml @@ -1,4 +1,4 @@ - + 群組 @@ -182,7 +182,7 @@ 於系統列顯示圖示 儲存複製項的最大數量 貼上項目的保留期為 - 天 + 分鐘 壓縮及修復 立刻檢查 允許重複內容 diff --git a/Debug/Language/Croatian.xml b/Debug/Language/Croatian.xml index aa7c8e81..7116f37c 100644 --- a/Debug/Language/Croatian.xml +++ b/Debug/Language/Croatian.xml @@ -1,4 +1,4 @@ - + Skupina @@ -147,7 +147,7 @@ Prikaži ikonu u sistemskoj traci Maksimalan broj spremljenih kopija Zaljepljeni objekti se brišu nakon - Dana + minuta Sažimaj i popravi Automatski provjeri nove nadogradnje Provjeri sad diff --git a/Debug/Language/Czech.xml b/Debug/Language/Czech.xml index bd5a59ae..9822c935 100644 --- a/Debug/Language/Czech.xml +++ b/Debug/Language/Czech.xml @@ -1,4 +1,4 @@ - + Skupiny @@ -150,7 +150,7 @@ Zobrazit ikonu v systémové liště Maximální počet uložených kopií Vložené vstupy vyprší za - dnů + minut Zkonsolidovat a opravit Ověřit nyní Povolit duplikáty diff --git a/Debug/Language/Danish.xml b/Debug/Language/Danish.xml index 5ad45c7e..46e95b78 100644 --- a/Debug/Language/Danish.xml +++ b/Debug/Language/Danish.xml @@ -1,4 +1,4 @@ - + Grupper @@ -145,7 +145,7 @@ Vis ikon på proceslinien Maks antal gemte klip Klip fjernes efter - Dage + Minutter Komprimér och reparér Søg automatisk efter opdateringer Søg nu diff --git a/Debug/Language/Deutsch.xml b/Debug/Language/Deutsch.xml index 6e17b4a9..80c7bff9 100644 --- a/Debug/Language/Deutsch.xml +++ b/Debug/Language/Deutsch.xml @@ -1,4 +1,4 @@ - + Gruppen @@ -194,7 +194,7 @@ Symbol im Infobereich anzeigen Maximal gespeicherte Einträge Einträge löschen nach - Tagen + Minuten Komprimieren und reparieren Automatisch auf Updates prüfen Jetzt prüfen diff --git a/Debug/Language/Dutch.xml b/Debug/Language/Dutch.xml index aa4f68dc..94e74dd6 100644 --- a/Debug/Language/Dutch.xml +++ b/Debug/Language/Dutch.xml @@ -150,7 +150,7 @@ Toon pictogram in System Tray Maximum aantal opgeslagen clips Opgeslagen clips vervallen na - Dagen + Minuten Komprimeren en Repareren Check Nu Duplicaten toestaan diff --git a/Debug/Language/English.xml b/Debug/Language/English.xml index 9d87d6e3..0bdd0904 100644 --- a/Debug/Language/English.xml +++ b/Debug/Language/English.xml @@ -194,7 +194,7 @@ - + diff --git a/Debug/Language/Finnish.xml b/Debug/Language/Finnish.xml index d2786766..1af51ebf 100644 --- a/Debug/Language/Finnish.xml +++ b/Debug/Language/Finnish.xml @@ -1,4 +1,4 @@ - + Ryhmät @@ -151,7 +151,7 @@ Näytä kuvake järjestelmäpalkissa Tallennettujen leikkeiden maksimimäärä Poista leikkeet, kun aikaa kulunut - Päivää + Minuuttia Pakkaa ja korjaa Tarkista nyt Salli duplikaatit diff --git a/Debug/Language/French.xml b/Debug/Language/French.xml index b4368891..fecdcf4d 100644 --- a/Debug/Language/French.xml +++ b/Debug/Language/French.xml @@ -1,4 +1,4 @@ - + Groupes @@ -182,7 +182,7 @@ Afficher l'icône dans la barre système Nombre maxi de copies sauvegardées Les entrées de collage expirent après - jours + minutes Compacter et Réparer la base Vérifier maintenant Autoriser les doublons diff --git a/Debug/Language/Greek.xml b/Debug/Language/Greek.xml index 09b7d4d6..bbceeec7 100644 --- a/Debug/Language/Greek.xml +++ b/Debug/Language/Greek.xml @@ -1,4 +1,4 @@ - + Ομάδες @@ -146,7 +146,7 @@ Εμφάνιση εικονιδίου στην περιοχή ειδοποιήσεων Μέγιστο πλήθος αποθηκευμένων κλιπς Οντότητες προς επικόλληση λήγουν σε - Ημέρες + Λεπτά Σύμπτυξη και επιδιόρθωση Αυτόματος έλεγχος ανανεωμένων εκδόσεων Έλεγχος τώρα diff --git a/Debug/Language/Hebrew.xml b/Debug/Language/Hebrew.xml index 6394bf56..cc2730bb 100644 --- a/Debug/Language/Hebrew.xml +++ b/Debug/Language/Hebrew.xml @@ -1,4 +1,4 @@ - + קבוצות @@ -149,7 +149,7 @@ הצג צלמית במגש המערכת מספר מקסימלי של העתקים שמורים זמן תפוגת העתקים אחרי - ימים + דקות כווץ ותקן בדוק כעת אפשר כפילויות diff --git a/Debug/Language/Hungarian.xml b/Debug/Language/Hungarian.xml index 6df6a8dd..72459123 100644 --- a/Debug/Language/Hungarian.xml +++ b/Debug/Language/Hungarian.xml @@ -151,7 +151,7 @@ Az ikon megjelenítése az értesítési területen A mentett másolatok maximális száma Az adatok beillesztése lejár - Napok + Perc Csomagolás és javítás Ellenőrizd most Duplikátumok engedélyezése diff --git a/Debug/Language/Italian.xml b/Debug/Language/Italian.xml index d446761b..73360656 100644 --- a/Debug/Language/Italian.xml +++ b/Debug/Language/Italian.xml @@ -1,4 +1,4 @@ - + Gruppo @@ -172,7 +172,7 @@ Visualizza icona nella barra di sistema Massimo numero copie salvate Incolla voci che scadono dopo - Giorni + Minuti Compatta e ripara Controlla ora Consenti duplicati diff --git a/Debug/Language/Japanese.xml b/Debug/Language/Japanese.xml index 25166813..04ef2f11 100644 --- a/Debug/Language/Japanese.xml +++ b/Debug/Language/Japanese.xml @@ -1,4 +1,4 @@ - + グループ(&G) @@ -182,7 +182,7 @@ システムトレイにアイコンを表示する コピーを保存する最大数 貼り付け項目を期限切れにする - 日後 + 分 コンパクト化と修復 今すぐチェック 重複を許可する diff --git a/Debug/Language/Korean.xml b/Debug/Language/Korean.xml index 6a169e15..869e2cc5 100644 --- a/Debug/Language/Korean.xml +++ b/Debug/Language/Korean.xml @@ -1,4 +1,4 @@ - + 그룹 @@ -181,7 +181,7 @@ 시스템 트레이 아이콘 표시 저장된 복사본 최대 수 붙여넣기 항목 만료 기간 - 일 + 분 압축 및 복구 지금 확인 중복 허용 diff --git a/Debug/Language/Persian.xml b/Debug/Language/Persian.xml index 6aecfc87..c67f2b9b 100644 --- a/Debug/Language/Persian.xml +++ b/Debug/Language/Persian.xml @@ -1,4 +1,4 @@ - + گروه‌ها @@ -171,7 +171,7 @@ آیکون برنامه را در سینی سیستم نشان بده بیشترین تعداد بریده‌های ذخیره شده تاریخ انقضای بریده‌ها - روز + دقیقه فشرده‌سازی و تعمیر پایگاه داده الآن بررسی کن تکراری مجاز باشد diff --git a/Debug/Language/Polski.xml b/Debug/Language/Polski.xml index ab0ef0c0..e4cd4515 100644 --- a/Debug/Language/Polski.xml +++ b/Debug/Language/Polski.xml @@ -150,7 +150,7 @@ Pokaż ikonę w zasobniku systemowym Maksymalna ilość skopiowanych elementów Trwałość skopiowanych elementów - dzień/dni + minut/minuty Kompaktuj i napraw Sprawdź teraz Pozwól na duplikaty diff --git a/Debug/Language/Portuguese (Brazil).xml b/Debug/Language/Portuguese (Brazil).xml index 84e13fcc..b548dbf2 100644 --- a/Debug/Language/Portuguese (Brazil).xml +++ b/Debug/Language/Portuguese (Brazil).xml @@ -1,4 +1,4 @@ - + Grupos @@ -194,7 +194,7 @@ Mostrar ícone na bandeja do sistema Número máximo de itens salvos Itens copiados expiram após - Dias + Minutos Compactar e reparar Verificar agora Permitir duplicatas diff --git a/Debug/Language/Portuguese.xml b/Debug/Language/Portuguese.xml index 75f5d35f..8d625efa 100644 --- a/Debug/Language/Portuguese.xml +++ b/Debug/Language/Portuguese.xml @@ -1,4 +1,4 @@ - + Grupos @@ -148,7 +148,7 @@ Mostrar Ditto na bandeja Total de seguranças Entradas coladas expiram após - dias + minutos Comprimir e reparar Procurar actualizações automaticamente Procurar agora diff --git a/Debug/Language/Romanian.xml b/Debug/Language/Romanian.xml index 5239c89a..b384277a 100644 --- a/Debug/Language/Romanian.xml +++ b/Debug/Language/Romanian.xml @@ -1,4 +1,4 @@ - + Grupuri @@ -147,7 +147,7 @@ Arată iconița softului în sistaler [system tray] Numărul maxim de copieri salvate Itemurile ce au fost lipite expiră după - zile + minute Compactează și Repară BD Caută automat pe internet actualizări ale softului Verifică Acum diff --git a/Debug/Language/Russian.xml b/Debug/Language/Russian.xml index 6f95b2e7..994b28d5 100644 --- a/Debug/Language/Russian.xml +++ b/Debug/Language/Russian.xml @@ -1,4 +1,4 @@ - + Группы @@ -197,7 +197,7 @@ Показывать значок в области уведомлений Максимум объектов для сохранения Срок хранения истекает через - дней + минут Сжать и восстановить Автоматически проверять обновления Проверить сейчас diff --git a/Debug/Language/Slovak.xml b/Debug/Language/Slovak.xml index a9aa0f93..d77815b3 100644 --- a/Debug/Language/Slovak.xml +++ b/Debug/Language/Slovak.xml @@ -1,4 +1,4 @@ - + Skupiny @@ -174,7 +174,7 @@ Zobraziť ikonu v oblasti oznámení Maximálny počet uložených kópií Vložené položky exspirujú po - dňoch + minút Skomprimovať a opraviť Skontrolovať teraz Povoliť duplikáty diff --git a/Debug/Language/Slovenian.xml b/Debug/Language/Slovenian.xml index d9a48695..fbb71e57 100644 --- a/Debug/Language/Slovenian.xml +++ b/Debug/Language/Slovenian.xml @@ -1,4 +1,4 @@ - + Skupine @@ -147,7 +147,7 @@ Prikaži ikono v programski vrstici Najv. število shranjenih kopij Vnosi za lepljenje potečejo po - dneh + minut Stisni in popravi Samodejno preveri, če so v spletu posodobitve Preveri zdaj diff --git a/Debug/Language/Spanish.xml b/Debug/Language/Spanish.xml index c7e89822..206918d9 100644 --- a/Debug/Language/Spanish.xml +++ b/Debug/Language/Spanish.xml @@ -1,4 +1,4 @@ - + Grupos @@ -168,7 +168,7 @@ Mostrar icono en la Bandeja del Sistema Número máximo de copias guardadas Las entradas copiadas expiran tras - días + minutos Compactar y Reparar Comprobar ahora Permitir Duplicados diff --git a/Debug/Language/Swedish.xml b/Debug/Language/Swedish.xml index 85c8ae89..341deecf 100644 --- a/Debug/Language/Swedish.xml +++ b/Debug/Language/Swedish.xml @@ -1,4 +1,4 @@ - + Grupper @@ -148,7 +148,7 @@ Visa ikon i systemfältet Maxantal sparade klipp Inklistrade klipp tas bort efter - Dagar + Minuter Komprimera och reparera Sök automatiskt efter uppdateringar online Sök nu diff --git a/Debug/Language/Tamil.xml b/Debug/Language/Tamil.xml index 2e84da83..29948712 100644 --- a/Debug/Language/Tamil.xml +++ b/Debug/Language/Tamil.xml @@ -1,4 +1,4 @@ - + குழுக்கள் @@ -160,7 +160,7 @@ கணினி தட்டில் உருவம் காண்பி சேமிக்கப்பட்ட நகல்களின் அதிகபட்ச எண்ணிக்கை ஒட்டு உள்ளீடுகள் இதற்க்குப் பிறகு காலாவதியாகும் - நாட்கள் + நிமிடங்கள் சுருக்க மற்றும் பழுதுபார்ப்பு இப்போது சரிபார்க்கவும் நகல்களை அனுமதி diff --git a/Debug/Language/Turkish.xml b/Debug/Language/Turkish.xml index f465574f..0964d683 100644 --- a/Debug/Language/Turkish.xml +++ b/Debug/Language/Turkish.xml @@ -1,4 +1,4 @@ - + Gruplar @@ -191,7 +191,7 @@ Sistem Tepsisi Simgesini Göster Kaydedilecek En Fazla Kopya Sayısı Yapıştırma Girdileri Şu Süreden Sonra Sona Erer - Gün + Dakika Sıkıştır ve Tamir Et Programı Otomatik Güncelle Şimdi Kontrol Et diff --git a/Debug/Language/Ukrainian.xml b/Debug/Language/Ukrainian.xml index c48a21ad..59cf1131 100644 --- a/Debug/Language/Ukrainian.xml +++ b/Debug/Language/Ukrainian.xml @@ -1,4 +1,4 @@ - + Групи @@ -198,7 +198,7 @@ Показувати іконку в панелі задач Зберігати максимум Зберігати протягом - днів + хвилин Стиснути й відновити Автоматично перевіряти оновлення Перевірити зараз diff --git a/src/DatabaseUtilities.cpp b/src/DatabaseUtilities.cpp index 3c69d475..5bde2435 100644 --- a/src/DatabaseUtilities.cpp +++ b/src/DatabaseUtilities.cpp @@ -843,7 +843,7 @@ BOOL RepairDatabase() BOOL RemoveOldEntries(bool checkIdleTime) { - Log(StrF(_T("Beginning of RemoveOldEntries MaxEntries: %d - Keep days: %d"), CGetSetOptions::GetMaxEntries(), CGetSetOptions::GetExpiredEntries())); + Log(StrF(_T("Beginning of RemoveOldEntries MaxEntries: %d - Keep minutes: %d"), CGetSetOptions::GetMaxEntries(), CGetSetOptions::GetExpiredEntries())); try { @@ -897,7 +897,7 @@ BOOL RemoveOldEntries(bool checkIdleTime) if (lExpire) { CTime now = CTime::GetCurrentTime(); - now -= CTimeSpan(lExpire, 0, 0, 0); + now -= CTimeSpan(0, 0, lExpire, 0); CClipIDs IDs; diff --git a/src/MainFrm.cpp b/src/MainFrm.cpp index b3c4de1e..859637bd 100644 --- a/src/MainFrm.cpp +++ b/src/MainFrm.cpp @@ -171,7 +171,7 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct) //SetTimer(CLOSE_WINDOW_TIMER, ONE_HOUR*24, 0); SetTimer(REMOVE_OLD_TEMP_FILES, ONE_HOUR * 6, 0); - SetTimer(REMOVE_OLD_ENTRIES_TIMER, ONE_MINUTE*15, 0); + SetTimer(REMOVE_OLD_ENTRIES_TIMER, ONE_MINUTE*1, 0); SetTimer(CLOSE_NO_DB_WINDOW_TIMER, 10000, 0); //found on some computers GetTickCount gettickcount returns a smaller value than other, can't explain