Przeglądaj źródła

Développement..

master
jfmartel 2 lat temu
rodzic
commit
ceec4fa2e8
67 zmienionych plików z 604 dodań i 140 usunięć
  1. +1
    -0
      .gitignore
  2. BIN
      Config - Copy.bin
  3. BIN
      Config.bin
  4. +316
    -0
      LogsValet.pro.user.22
  5. +33
    -35
      Makefile
  6. +27
    -5
      Makefile.Debug
  7. +27
    -5
      Makefile.Release
  8. +63
    -2
      Sources/Gui/ConfigPage.cpp
  9. +10
    -23
      Sources/Gui/ConfigPage.ui
  10. +2
    -1
      Sources/Gui/MainWindow.cpp
  11. +6
    -1
      Sources/Gui/StatusWindow.cpp
  12. +20
    -0
      Sources/Gui/StatusWindow.ui
  13. +70
    -54
      Sources/LogsHandler.cpp
  14. +8
    -2
      Sources/LogsSorterConfigData.cpp
  15. +2
    -0
      Sources/LogsSorterConfigData.h
  16. +1
    -0
      Sources/defines.h
  17. BIN
      debug/LogsValet.exe
  18. BIN
      release/Config.bin
  19. BIN
      release/D3Dcompiler_47.dll
  20. BIN
      release/LogsValet.exe
  21. BIN
      release/Qt5Core.dll
  22. BIN
      release/Qt5Gui.dll
  23. BIN
      release/Qt5Svg.dll
  24. BIN
      release/Qt5Widgets.dll
  25. BIN
      release/iconengines/qsvgicon.dll
  26. BIN
      release/imageformats/qgif.dll
  27. BIN
      release/imageformats/qicns.dll
  28. BIN
      release/imageformats/qico.dll
  29. BIN
      release/imageformats/qjpeg.dll
  30. BIN
      release/imageformats/qsvg.dll
  31. BIN
      release/imageformats/qtga.dll
  32. BIN
      release/imageformats/qtiff.dll
  33. BIN
      release/imageformats/qwbmp.dll
  34. BIN
      release/imageformats/qwebp.dll
  35. BIN
      release/libEGL.dll
  36. BIN
      release/libGLESv2.dll
  37. BIN
      release/libgcc_s_seh-1.dll
  38. BIN
      release/libstdc++-6.dll
  39. BIN
      release/libwinpthread-1.dll
  40. BIN
      release/opengl32sw.dll
  41. BIN
      release/platforms/qwindows.dll
  42. BIN
      release/styles/qwindowsvistastyle.dll
  43. BIN
      release/translations/qt_ar.qm
  44. BIN
      release/translations/qt_bg.qm
  45. BIN
      release/translations/qt_ca.qm
  46. BIN
      release/translations/qt_cs.qm
  47. BIN
      release/translations/qt_da.qm
  48. BIN
      release/translations/qt_de.qm
  49. BIN
      release/translations/qt_en.qm
  50. BIN
      release/translations/qt_es.qm
  51. BIN
      release/translations/qt_fi.qm
  52. BIN
      release/translations/qt_fr.qm
  53. BIN
      release/translations/qt_gd.qm
  54. BIN
      release/translations/qt_he.qm
  55. BIN
      release/translations/qt_hu.qm
  56. BIN
      release/translations/qt_it.qm
  57. BIN
      release/translations/qt_ja.qm
  58. BIN
      release/translations/qt_ko.qm
  59. BIN
      release/translations/qt_lv.qm
  60. BIN
      release/translations/qt_pl.qm
  61. BIN
      release/translations/qt_ru.qm
  62. BIN
      release/translations/qt_sk.qm
  63. BIN
      release/translations/qt_uk.qm
  64. BIN
      release/translations/qt_zh_TW.qm
  65. BIN
      release/windeployqt.exe
  66. +7
    -12
      ui_ConfigPage.h
  67. +11
    -0
      ui_StatusWindow.h

+ 1
- 0
.gitignore Wyświetl plik

@@ -1,3 +1,4 @@
*.o
/LogsValet.pro.user
*moc_*
/Deploy/*

BIN
Config - Copy.bin Wyświetl plik


BIN
Config.bin Wyświetl plik


+ 316
- 0
LogsValet.pro.user.22 Wyświetl plik

@@ -0,0 +1,316 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.11.1, 2023-04-15T08:38:19. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
<value type="QByteArray">{49dba0cf-bcb2-4719-a5e3-f633e3e28161}</value>
</data>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
<value type="int">0</value>
</data>
<data>
<variable>ProjectExplorer.Project.EditorSettings</variable>
<valuemap type="QVariantMap">
<value type="bool" key="EditorConfiguration.AutoIndent">true</value>
<value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
<value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
<valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
<value type="QString" key="language">Cpp</value>
<valuemap type="QVariantMap" key="value">
<value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
</valuemap>
</valuemap>
<valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
<value type="QString" key="language">QmlJS</value>
<valuemap type="QVariantMap" key="value">
<value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
</valuemap>
</valuemap>
<value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
<value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
<value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
<value type="int" key="EditorConfiguration.IndentSize">4</value>
<value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
<value type="int" key="EditorConfiguration.MarginColumn">80</value>
<value type="bool" key="EditorConfiguration.MouseHiding">true</value>
<value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
<value type="int" key="EditorConfiguration.PaddingMode">1</value>
<value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
<value type="bool" key="EditorConfiguration.ShowMargin">false</value>
<value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
<value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
<value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
<value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
<value type="int" key="EditorConfiguration.TabSize">8</value>
<value type="bool" key="EditorConfiguration.UseGlobal">true</value>
<value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
<value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
<value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
<value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
<value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
</valuemap>
</data>
<data>
<variable>ProjectExplorer.Project.PluginSettings</variable>
<valuemap type="QVariantMap">
<valuelist type="QVariantList" key="ClangCodeModel.CustomCommandLineKey">
<value type="QString">-fno-delayed-template-parsing</value>
</valuelist>
<value type="bool" key="ClangCodeModel.UseGlobalConfig">true</value>
</valuemap>
</data>
<data>
<variable>ProjectExplorer.Project.Target.0</variable>
<valuemap type="QVariantMap">
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">QT 5.14.2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">QT 5.14.2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{894798a9-78b3-4123-aa44-c90339d460a9}</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:/Main/Dev/LogsValet</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
<value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
<value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
<value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:/Main/Dev/LogsValet</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
<value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
<value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
<value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:/Main/Dev/build-LogsValet-QT_5_14_2-Profile</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
<value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">true</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
<value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
<value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
</valuemap>
<value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
</valuemap>
<value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
<value type="QString" key="Analyzer.Perf.CallgraphMode">dwarf</value>
<valuelist type="QVariantList" key="Analyzer.Perf.Events">
<value type="QString">cpu-cycles</value>
</valuelist>
<valuelist type="QVariantList" key="Analyzer.Perf.ExtraArguments"/>
<value type="int" key="Analyzer.Perf.Frequency">250</value>
<valuelist type="QVariantList" key="Analyzer.Perf.RecordArguments">
<value type="QString">-e</value>
<value type="QString">cpu-cycles</value>
<value type="QString">--call-graph</value>
<value type="QString">dwarf,4096</value>
<value type="QString">-F</value>
<value type="QString">250</value>
</valuelist>
<value type="QString" key="Analyzer.Perf.SampleMode">-F</value>
<value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
<value type="int" key="Analyzer.Perf.StackSize">4096</value>
<value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
<value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
<value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
<value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
<value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
<valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
<value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
<value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
<value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
<value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
<value type="QString" key="Analyzer.Valgrind.KCachegrindExecutable">kcachegrind</value>
<value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
<value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
<valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
<value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
<value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
<value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
<value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
<value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
<valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
<value type="int">0</value>
<value type="int">1</value>
<value type="int">2</value>
<value type="int">3</value>
<value type="int">4</value>
<value type="int">5</value>
<value type="int">6</value>
<value type="int">7</value>
<value type="int">8</value>
<value type="int">9</value>
<value type="int">10</value>
<value type="int">11</value>
<value type="int">12</value>
<value type="int">13</value>
<value type="int">14</value>
</valuelist>
<value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:D:/Main/Dev/LogsValet/LogsValet.pro</value>
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">D:/Main/Dev/LogsValet/LogsValet.pro</value>
<value type="QString" key="RunConfiguration.Arguments"></value>
<value type="bool" key="RunConfiguration.Arguments.multi">false</value>
<value type="QString" key="RunConfiguration.OverrideDebuggerStartup"></value>
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
<value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
<value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
<value type="QString" key="RunConfiguration.WorkingDirectory"></value>
<value type="QString" key="RunConfiguration.WorkingDirectory.default">D:/Main/Dev/LogsValet</value>
</valuemap>
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
</valuemap>
</data>
<data>
<variable>ProjectExplorer.Project.TargetCount</variable>
<value type="int">1</value>
</data>
<data>
<variable>ProjectExplorer.Project.Updater.FileVersion</variable>
<value type="int">22</value>
</data>
<data>
<variable>Version</variable>
<value type="int">22</value>
</data>
</qtcreator>

+ 33
- 35
Makefile Wyświetl plik

@@ -3,16 +3,16 @@
# Generated by qmake (3.1) (Qt 5.14.2)
# Project: LogsValet.pro
# Template: app
# Command: C:\Qt\Qt5.14.2\5.14.2\mingw73_64\bin\qmake.exe -o Makefile LogsValet.pro -spec win32-g++ "CONFIG+=debug" "CONFIG+=qml_debug"
# Command: C:\Qt\Qt5.14.2\5.14.2\mingw73_64\bin\qmake.exe -o Makefile LogsValet.pro -spec win32-g++
#############################################################################

MAKEFILE = Makefile

EQ = =

first: debug
install: debug-install
uninstall: debug-uninstall
first: release
install: release-install
uninstall: release-uninstall
QMAKE = C:\Qt\Qt5.14.2\5.14.2\mingw73_64\bin\qmake.exe
DEL_FILE = del
CHK_DIR_EXISTS= if not exist
@@ -37,24 +37,10 @@ RES_FILE =
SED = $(QMAKE) -install sed
MOVE = move
SUBTARGETS = \
debug \
release
release \
debug


debug: FORCE
$(MAKE) -f $(MAKEFILE).Debug
debug-make_first: FORCE
$(MAKE) -f $(MAKEFILE).Debug
debug-all: FORCE
$(MAKE) -f $(MAKEFILE).Debug all
debug-clean: FORCE
$(MAKE) -f $(MAKEFILE).Debug clean
debug-distclean: FORCE
$(MAKE) -f $(MAKEFILE).Debug distclean
debug-install: FORCE
$(MAKE) -f $(MAKEFILE).Debug install
debug-uninstall: FORCE
$(MAKE) -f $(MAKEFILE).Debug uninstall
release: FORCE
$(MAKE) -f $(MAKEFILE).Release
release-make_first: FORCE
@@ -69,6 +55,20 @@ release-install: FORCE
$(MAKE) -f $(MAKEFILE).Release install
release-uninstall: FORCE
$(MAKE) -f $(MAKEFILE).Release uninstall
debug: FORCE
$(MAKE) -f $(MAKEFILE).Debug
debug-make_first: FORCE
$(MAKE) -f $(MAKEFILE).Debug
debug-all: FORCE
$(MAKE) -f $(MAKEFILE).Debug all
debug-clean: FORCE
$(MAKE) -f $(MAKEFILE).Debug clean
debug-distclean: FORCE
$(MAKE) -f $(MAKEFILE).Debug distclean
debug-install: FORCE
$(MAKE) -f $(MAKEFILE).Debug install
debug-uninstall: FORCE
$(MAKE) -f $(MAKEFILE).Debug uninstall

Makefile: LogsValet.pro C:/Qt/Qt5.14.2/5.14.2/mingw73_64/mkspecs/win32-g++/qmake.conf C:/Qt/Qt5.14.2/5.14.2/mingw73_64/mkspecs/features/spec_pre.prf \
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/mkspecs/qdevice.pri \
@@ -237,7 +237,6 @@ Makefile: LogsValet.pro C:/Qt/Qt5.14.2/5.14.2/mingw73_64/mkspecs/win32-g++/qmake
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/mkspecs/features/resolve_config.prf \
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/mkspecs/features/exclusive_builds_post.prf \
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/mkspecs/features/default_post.prf \
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/mkspecs/features/qml_debug.prf \
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/mkspecs/features/precompile_header.prf \
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/mkspecs/features/warn_on.prf \
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/mkspecs/features/qt.prf \
@@ -259,7 +258,7 @@ Makefile: LogsValet.pro C:/Qt/Qt5.14.2/5.14.2/mingw73_64/mkspecs/win32-g++/qmake
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/lib/Qt5Core.prl \
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/lib/qtmain.prl \
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/mkspecs/features/build_pass.prf
$(QMAKE) -o Makefile LogsValet.pro -spec win32-g++ "CONFIG+=debug" "CONFIG+=qml_debug"
$(QMAKE) -o Makefile LogsValet.pro -spec win32-g++
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/mkspecs/features/spec_pre.prf:
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/mkspecs/qdevice.pri:
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/mkspecs/features/device_config.prf:
@@ -427,7 +426,6 @@ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/mkspecs/features/win32/default_pre.prf:
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/mkspecs/features/resolve_config.prf:
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/mkspecs/features/exclusive_builds_post.prf:
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/mkspecs/features/default_post.prf:
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/mkspecs/features/qml_debug.prf:
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/mkspecs/features/precompile_header.prf:
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/mkspecs/features/warn_on.prf:
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/mkspecs/features/qt.prf:
@@ -450,32 +448,32 @@ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/lib/Qt5Core.prl:
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/lib/qtmain.prl:
C:/Qt/Qt5.14.2/5.14.2/mingw73_64/mkspecs/features/build_pass.prf:
qmake: FORCE
@$(QMAKE) -o Makefile LogsValet.pro -spec win32-g++ "CONFIG+=debug" "CONFIG+=qml_debug"
@$(QMAKE) -o Makefile LogsValet.pro -spec win32-g++

qmake_all: FORCE

make_first: debug-make_first release-make_first FORCE
all: debug-all release-all FORCE
clean: debug-clean release-clean FORCE
distclean: debug-distclean release-distclean FORCE
make_first: release-make_first debug-make_first FORCE
all: release-all debug-all FORCE
clean: release-clean debug-clean FORCE
distclean: release-distclean debug-distclean FORCE
-$(DEL_FILE) Makefile

debug-mocclean:
$(MAKE) -f $(MAKEFILE).Debug mocclean
release-mocclean:
$(MAKE) -f $(MAKEFILE).Release mocclean
mocclean: debug-mocclean release-mocclean
debug-mocclean:
$(MAKE) -f $(MAKEFILE).Debug mocclean
mocclean: release-mocclean debug-mocclean

debug-mocables:
$(MAKE) -f $(MAKEFILE).Debug mocables
release-mocables:
$(MAKE) -f $(MAKEFILE).Release mocables
mocables: debug-mocables release-mocables
debug-mocables:
$(MAKE) -f $(MAKEFILE).Debug mocables
mocables: release-mocables debug-mocables

check: first

benchmark: first
FORCE:

$(MAKEFILE).Debug: Makefile
$(MAKEFILE).Release: Makefile
$(MAKEFILE).Debug: Makefile

+ 27
- 5
Makefile.Debug
Plik diff jest za duży
Wyświetl plik


+ 27
- 5
Makefile.Release
Plik diff jest za duży
Wyświetl plik


+ 63
- 2
Sources/Gui/ConfigPage.cpp Wyświetl plik

@@ -1,6 +1,8 @@
#include "ConfigPage.h"
#include "ui_ConfigPage.h"
#include "LogsSorterConfigData.h"
#include <QCheckBox>
#include <QComboBox>

#include "LogsSorter.h"
#include "LogsSorterConfigData.h"
@@ -21,10 +23,18 @@ CConfigPage::CConfigPage(QWidget *parent) :
setAutoFillBackground(true);

ui->mConfigTable->setAutoFillBackground(true);
ui->mConfigTable->setColumnCount(5);
ui->mConfigTable->setHorizontalHeaderLabels(QStringList() << "Filtre" << "Type" << "Préfixe" << "Description" << "Destination");
ui->mConfigTable->setColumnCount(7);
ui->mConfigTable->setHorizontalHeaderLabels(QStringList() << "Filtre" << "Type" << "Préfixe" << "Description" << "Destination" << "Séparer\nRépertoires" << "Actif");
ui->mConfigTable->setSelectionBehavior(QAbstractItemView::SelectRows);

ui->mConfigTable->horizontalHeaderItem(0)->setToolTip("Permet de déterminer le fichier LOG\nPar exemple 'BooleanData' identifie un fichier SEI\nUn fichier ne contenant aucun filtre dans son titre sera ignoré");
ui->mConfigTable->horizontalHeaderItem(1)->setToolTip("Identifie le type de filtrage, attention à la syntaxe.\nL'option 'DÉPLACER' déplacera le fichier dans le répertoire de destination\nL'option 'EFFACER' détruit le fichier dans le répertoire source.\nNote:Le répertoire de destination est ignoré avec l'option 'EFFACER'");
ui->mConfigTable->horizontalHeaderItem(2)->setToolTip("Préfixe ajouté lors du transfert du fichier afin d'identifier le lieu.\nCette chaîne de caractère sera retirée du nom lors de la copie vers le répertoire source.");
ui->mConfigTable->horizontalHeaderItem(3)->setToolTip("Une simple description du filtre pour comprendre à quoi il sert.");
ui->mConfigTable->horizontalHeaderItem(4)->setToolTip("Répertoire de destination lors du déplacement du fichier Log.\nCe paramètre est ignoré avec le type de filtre 'EFFACER'");
ui->mConfigTable->horizontalHeaderItem(5)->setToolTip("Lorsque ce paramètre est coché, un sous-répertoire sera créé à chaque jour dans le répertoire de destination.\nUtile pour les source de logs très nombreux (comme la Zone Test)");
ui->mConfigTable->horizontalHeaderItem(6)->setToolTip("Permet de désactiver un filtre sans avoir à l'effacer.\nUn filtre inactif est ignoré par le programme.");

ui->mConfigTable->setRowCount(0);
ui->mConfigTable->setSortingEnabled(true);

@@ -58,6 +68,16 @@ void CConfigPage::AddFilterBtnPressed()
NewItem = new QTableWidgetItem("");
ui->mConfigTable->setItem(0,4,NewItem);
ui->mConfigTable->setSortingEnabled(true);

QCheckBox *CheckBx = new QCheckBox();
ui->mConfigTable->setCellWidget(0,5,CheckBx);

QComboBox *ComboBx = new QComboBox();
ComboBx->insertItem(0,"ACTIF");
ComboBx->insertItem(1,"INACTIF");
ComboBx->setCurrentIndex(0);
ui->mConfigTable->setCellWidget(0,6,ComboBx);

}

void CConfigPage::DeleteFilterBtnPressed()
@@ -89,6 +109,19 @@ void CConfigPage::SaveConfigBtnPressed()
FilterData.mFilterName = ui->mConfigTable->item(i,3)->text();
FilterData.mLogDestination = ui->mConfigTable->item(i,4)->text();

QCheckBox *ChkBx = (QCheckBox*) ui->mConfigTable->cellWidget(i,5);
FilterData.mCreateDayDirectories = ChkBx->isChecked();

QComboBox *ComboBx = (QComboBox*)ui->mConfigTable->cellWidget(i,6);
if(ComboBx->currentIndex() == 0)
{
FilterData.mIsFilterActive = true;
}
else
{
FilterData.mIsFilterActive = false;
}

if(ui->mConfigTable->item(i,1)->text() == "DÉPLACER")
{
FilterData.mFilterOperation = CLogsFilterData::LOG_FILTER_MOVE_OPERATION_TYPE;
@@ -143,6 +176,23 @@ void CConfigPage::InitializeConfigData(const CLogsSorterConfigData *DataStruct)
ui->mConfigTable->setItem(i,3,NewItem);
NewItem = new QTableWidgetItem(DataStruct->mLogsFiltersList.at(i).mLogDestination);
ui->mConfigTable->setItem(i,4,NewItem);

QCheckBox *CheckBx = new QCheckBox();
CheckBx->setChecked(DataStruct->mLogsFiltersList.at(i).mCreateDayDirectories);
ui->mConfigTable->setCellWidget(i,5,CheckBx);

QComboBox *ComboBx = new QComboBox();
ComboBx->insertItem(0,"ACTIF");
ComboBx->insertItem(1,"INACTIF");
if(DataStruct->mLogsFiltersList.at(i).mIsFilterActive == true)
{
ComboBx->setCurrentIndex(0);
}
else
{
ComboBx->setCurrentIndex(1);
}
ui->mConfigTable->setCellWidget(i,6,ComboBx);
}

ui->mConfigTable->resizeColumnsToContents();
@@ -168,6 +218,17 @@ void CConfigPage::CopyFilterBtnPressed()
NewItem = new QTableWidgetItem(*ui->mConfigTable->item(row,4));
ui->mConfigTable->setItem(0,4,NewItem);

QCheckBox *CheckBx = new QCheckBox();
ui->mConfigTable->setCellWidget(0,5,CheckBx);

QComboBox *ComboBx = (QComboBox*)ui->mConfigTable->cellWidget(row,6);
int index = ComboBx->currentIndex();
ComboBx = new QComboBox();
ComboBx->insertItem(0,"ACTIF");
ComboBx->insertItem(1,"INACTIF");
ComboBx->setCurrentIndex(index);
ui->mConfigTable->setCellWidget(0,6,ComboBx);

ui->mConfigTable->setSortingEnabled(true);

}

+ 10
- 23
Sources/Gui/ConfigPage.ui Wyświetl plik

@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>1204</width>
<width>1423</width>
<height>509</height>
</rect>
</property>
@@ -18,7 +18,7 @@
<rect>
<x>10</x>
<y>150</y>
<width>801</width>
<width>1201</width>
<height>331</height>
</rect>
</property>
@@ -54,23 +54,10 @@
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
<widget class="QPushButton" name="mChooseSourceDirBtn">
<property name="geometry">
<rect>
<x>720</x>
<y>60</y>
<width>80</width>
<height>22</height>
</rect>
</property>
<property name="text">
<string>Choisir</string>
</property>
</widget>
<widget class="QPushButton" name="mSaveBtn">
<property name="geometry">
<rect>
<x>960</x>
<x>1300</x>
<y>450</y>
<width>81</width>
<height>22</height>
@@ -83,7 +70,7 @@
<widget class="QPushButton" name="mCancelBtn">
<property name="geometry">
<rect>
<x>870</x>
<x>1220</x>
<y>450</y>
<width>81</width>
<height>22</height>
@@ -96,8 +83,8 @@
<widget class="QPushButton" name="mAddFilterBtn">
<property name="geometry">
<rect>
<x>830</x>
<y>160</y>
<x>1220</x>
<y>150</y>
<width>81</width>
<height>22</height>
</rect>
@@ -109,8 +96,8 @@
<widget class="QPushButton" name="mDeleteFilterBtn">
<property name="geometry">
<rect>
<x>830</x>
<y>190</y>
<x>1220</x>
<y>180</y>
<width>81</width>
<height>22</height>
</rect>
@@ -122,8 +109,8 @@
<widget class="QPushButton" name="mCopyFilterBtn">
<property name="geometry">
<rect>
<x>830</x>
<y>230</y>
<x>1220</x>
<y>220</y>
<width>81</width>
<height>22</height>
</rect>


+ 2
- 1
Sources/Gui/MainWindow.cpp Wyświetl plik

@@ -1,6 +1,6 @@
#include "MainWindow.h"
#include "ui_MainWindow.h"
#include "defines.h"

CMainWindow::CMainWindow(QWidget *parent) :
QMainWindow(parent),
@@ -8,6 +8,7 @@ CMainWindow::CMainWindow(QWidget *parent) :
{
ui->setupUi(this);

setWindowTitle(QString("LogsValet - %1").arg(SOFTWARE_VERSION));
mMainWindowTab = new QTabWidget(this);
mConfigPage = new CConfigPage(this);
mStatusPage = new CStatusWindow(this);


+ 6
- 1
Sources/Gui/StatusWindow.cpp Wyświetl plik

@@ -14,6 +14,10 @@ CStatusWindow::CStatusWindow(QWidget *parent) :
mProgramPtr = 0;

connect(ui->mForceScanBtn,&QPushButton::pressed,this,&CStatusWindow::ManualScanBtnPressed);

ui->mSoftVersionLbl->setText(QString("Version: %1").arg(SOFTWARE_VERSION));

ui->mMsgTxtEditBox->setReadOnly(true);
}

CStatusWindow::~CStatusWindow()
@@ -94,6 +98,7 @@ int CStatusWindow::AddColoredLineToGenMsgBox(QString Line, QColor Color)

void CStatusWindow::ManualScanBtnPressed()
{
AddGeneralMsgBoxLineEntry("Lancement d'un scan manuel",Qt::darkBlue);
AddGeneralMsgBoxLineEntry("Lancement d'un scan manuel.",Qt::darkBlue);
mProgramPtr->LauchManualScanRequest();
AddGeneralMsgBoxLineEntry("Scan manuel terminé.",Qt::darkBlue);
}

+ 20
- 0
Sources/Gui/StatusWindow.ui Wyświetl plik

@@ -36,6 +36,26 @@
<string>Forcer scan</string>
</property>
</widget>
<widget class="QLabel" name="mSoftVersionLbl">
<property name="geometry">
<rect>
<x>50</x>
<y>645</y>
<width>381</width>
<height>21</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</widget>
<resources/>
<connections/>


+ 70
- 54
Sources/LogsHandler.cpp Wyświetl plik

@@ -3,6 +3,7 @@
#include "LogsSorter.h"
#include <QDir>
#include <QFileInfo>
#include <QDate>

CLogsHandler::CLogsHandler() : QObject()
{
@@ -36,7 +37,10 @@ int CLogsHandler::SetSortingConfigData(CLogsSorterConfigData *ConfigData)
}
else
{
QString msg = QString("Erreur, le répertoire source %1 n'existe pas").arg(ConfigData->mLogsSourceDirectory);
QString msg = QString("Le répertoire source est inexistant. Vérifier la configuration ou activer le VPN");
qDebug(qPrintable(msg));
mProgramPtr->AddGeneralMsgTextRequest(msg,Qt::red);

}
return RET_OK;
}
@@ -75,66 +79,78 @@ int CLogsHandler::ParseWatchedDirectory(QString Path)
{
Filter = &mSortingConfigData->mLogsFiltersList[j];

if(LogFiles.at(i).fileName().contains(Filter->mLogIdentificator) && //Le fichier contient le différentiateur comme ZT1, ZT2, BooleanData, etc.
LogFiles.at(i).fileName().contains(Filter->mLogPrefix)) //ET le fichier contient le bon préfixe (identification de la station).
if(Filter->mIsFilterActive == true)
{
if(Filter->mFilterOperation == CLogsFilterData::LOG_FILTER_MOVE_OPERATION_TYPE)
{
QString msg= QString("Filtre trouvé pour le fichier %1").arg(LogFiles.at(i).fileName());
qDebug(qPrintable(msg));

QString FullDestinationPath = Filter->mLogDestination;
QString DestFilename = LogFiles.at(i).fileName();
FullDestinationPath.append("\\");

DestFilename.remove(Filter->mLogPrefix);
FullDestinationPath.append(DestFilename);

if(!QDir(Filter->mLogDestination).exists()) //Créer le répertoire cible s'il n'exite pas déjà
{
QDir().mkdir(Filter->mLogDestination);
}

if(QFile::copy(LogFiles.at(i).absoluteFilePath(),FullDestinationPath))
{
QString msg = QString("Fichier %1 copié vers %2").arg(LogFiles.at(i).absoluteFilePath()).arg(FullDestinationPath);
qDebug(qPrintable(msg));
mProgramPtr->AddGeneralMsgTextRequest(msg);
}
else
if(LogFiles.at(i).fileName().contains(Filter->mLogIdentificator) && //Le fichier contient le différentiateur comme LOGZT1, LOGZT2, BooleanData, etc.
LogFiles.at(i).fileName().contains(Filter->mLogPrefix)) //ET le fichier contient le bon préfixe (identification de la station).
{
if(Filter->mFilterOperation == CLogsFilterData::LOG_FILTER_MOVE_OPERATION_TYPE)
{
QString msg = QString("Impossible de copier %1 vers %2 (le fichier existe-t-il déjà ???)").arg(LogFiles.at(i).absoluteFilePath()).arg(FullDestinationPath);
QString msg= QString("Filtre trouvé pour le fichier %1").arg(LogFiles.at(i).fileName());
qDebug(qPrintable(msg));
mProgramPtr->AddGeneralMsgTextRequest(msg,Qt::red);
}

if(QFile::remove(LogFiles.at(i).absoluteFilePath()))
{
QString msg = QString("Fichier %1 effacé").arg(LogFiles.at(i).absoluteFilePath());
qDebug(qPrintable(msg));
mProgramPtr->AddGeneralMsgTextRequest(msg);
}
else
{
QString msg = QString("Impossible d'effacer le fichier %1").arg(LogFiles.at(i).absoluteFilePath());
qDebug(qPrintable(msg));
mProgramPtr->AddGeneralMsgTextRequest(msg,Qt::red);
}

}
else if(Filter->mFilterOperation == CLogsFilterData::LOG_FILTER_DELETE_OPERATION_TYPE)
{
if(QFile::remove(LogFiles.at(i).absoluteFilePath()))
{
QString msg = QString("Fichier %1 effacé").arg(LogFiles.at(i).absoluteFilePath());
qDebug(qPrintable(msg));
mProgramPtr->AddGeneralMsgTextRequest(msg);
QString DestinationDir = Filter->mLogDestination;
if(Filter->mCreateDayDirectories == true)
{
DestinationDir.append("\\");
DestinationDir.append(QDate::currentDate().toString("yyyyMMdd"));
}

QString FullDestinationPath = DestinationDir;
QString DestFilename = LogFiles.at(i).fileName();
FullDestinationPath.append("\\");

DestFilename.remove(Filter->mLogPrefix);
FullDestinationPath.append(DestFilename);


if(!QDir(DestinationDir).exists()) //Créer le répertoire cible s'il n'exite pas déjà
{
QDir().mkdir(DestinationDir);
}

if(QFile::copy(LogFiles.at(i).absoluteFilePath(),FullDestinationPath))
{
QString msg = QString("Fichier %1 copié vers %2").arg(LogFiles.at(i).absoluteFilePath()).arg(FullDestinationPath);
qDebug(qPrintable(msg));
mProgramPtr->AddGeneralMsgTextRequest(msg);


if(QFile::remove(LogFiles.at(i).absoluteFilePath()))
{
QString msg = QString("Fichier %1 effacé").arg(LogFiles.at(i).absoluteFilePath());
qDebug(qPrintable(msg));
mProgramPtr->AddGeneralMsgTextRequest(msg);
}
else
{
QString msg = QString("Impossible d'effacer le fichier %1").arg(LogFiles.at(i).absoluteFilePath());
qDebug(qPrintable(msg));
mProgramPtr->AddGeneralMsgTextRequest(msg,Qt::red);
}
}
else
{
QString msg = QString("Impossible de copier %1 vers %2 (le fichier existe probablement déjà !)").arg(LogFiles.at(i).absoluteFilePath()).arg(FullDestinationPath);
qDebug(qPrintable(msg));
mProgramPtr->AddGeneralMsgTextRequest(msg,Qt::red);
}
}
else
else if(Filter->mFilterOperation == CLogsFilterData::LOG_FILTER_DELETE_OPERATION_TYPE)
{
QString msg = QString("Impossible d'effacer le fichier %1").arg(LogFiles.at(i).absoluteFilePath());
qDebug(qPrintable(msg));
mProgramPtr->AddGeneralMsgTextRequest(msg);
if(QFile::remove(LogFiles.at(i).absoluteFilePath()))
{
QString msg = QString("Fichier %1 effacé").arg(LogFiles.at(i).absoluteFilePath());
qDebug(qPrintable(msg));
mProgramPtr->AddGeneralMsgTextRequest(msg);
}
else
{
QString msg = QString("Impossible d'effacer le fichier %1").arg(LogFiles.at(i).absoluteFilePath());
qDebug(qPrintable(msg));
mProgramPtr->AddGeneralMsgTextRequest(msg);
}
}
}
}


+ 8
- 2
Sources/LogsSorterConfigData.cpp Wyświetl plik

@@ -59,6 +59,8 @@ CLogsFilterData& CLogsFilterData::operator=(const CLogsFilterData *source)
this->mLogPrefix = source->mLogPrefix;
this->mLogDestination = source->mLogDestination;
this->mFilterOperation = source->mFilterOperation;
this->mCreateDayDirectories = source->mCreateDayDirectories;
this->mIsFilterActive = source->mIsFilterActive;

return *this;
}
@@ -69,7 +71,9 @@ QDataStream &operator>>(QDataStream &in, CLogsFilterData &dest)
>> dest.mLogIdentificator
>> dest.mLogPrefix
>> dest.mLogDestination
>> dest.mFilterOperation;
>> dest.mFilterOperation
>> dest.mCreateDayDirectories
>> dest.mIsFilterActive;

return in;
}
@@ -79,7 +83,9 @@ QDataStream &operator<<(QDataStream &out, const CLogsFilterData &source)
<< source.mLogIdentificator
<< source.mLogPrefix
<< source.mLogDestination
<< source.mFilterOperation;
<< source.mFilterOperation
<< source.mCreateDayDirectories
<< source.mIsFilterActive;

return out;
}

+ 2
- 0
Sources/LogsSorterConfigData.h Wyświetl plik

@@ -38,6 +38,8 @@ public:
QString mLogPrefix; //Le préfixe qui identifie généralement la station
QString mLogDestination; //Le répertoire de destination
eFilterOperationType mFilterOperation; //Le type d'opération qu'on doit faire sur le fichier
bool mCreateDayDirectories; //Si à true, les fichiers seront placés dans un nouveau répertoire à chaque jour
bool mIsFilterActive; //Permet de rendre le filtre inactif (si à false)

CLogsFilterData& operator=(const CLogsFilterData *source);



+ 1
- 0
Sources/defines.h Wyświetl plik

@@ -4,6 +4,7 @@


#define GENERAL_MESSAGES_MAX_LOG_LINES 5000 //The number of lines of general status log we keep in the general status window (avoids fucking up because you know.... RAM)
#define SOFTWARE_VERSION "V01.00"

enum eOtarcikGeneralReturns
{


BIN
debug/LogsValet.exe Wyświetl plik


BIN
release/Config.bin Wyświetl plik


BIN
release/D3Dcompiler_47.dll Wyświetl plik


BIN
release/LogsValet.exe Wyświetl plik


BIN
release/Qt5Core.dll Wyświetl plik


BIN
release/Qt5Gui.dll Wyświetl plik


BIN
release/Qt5Svg.dll Wyświetl plik


BIN
release/Qt5Widgets.dll Wyświetl plik


BIN
release/iconengines/qsvgicon.dll Wyświetl plik


BIN
release/imageformats/qgif.dll Wyświetl plik


BIN
release/imageformats/qicns.dll Wyświetl plik


BIN
release/imageformats/qico.dll Wyświetl plik


BIN
release/imageformats/qjpeg.dll Wyświetl plik


BIN
release/imageformats/qsvg.dll Wyświetl plik


BIN
release/imageformats/qtga.dll Wyświetl plik


BIN
release/imageformats/qtiff.dll Wyświetl plik


BIN
release/imageformats/qwbmp.dll Wyświetl plik


BIN
release/imageformats/qwebp.dll Wyświetl plik


BIN
release/libEGL.dll Wyświetl plik


BIN
release/libGLESv2.dll Wyświetl plik


BIN
release/libgcc_s_seh-1.dll Wyświetl plik


BIN
release/libstdc++-6.dll Wyświetl plik


BIN
release/libwinpthread-1.dll Wyświetl plik


BIN
release/opengl32sw.dll Wyświetl plik


BIN
release/platforms/qwindows.dll Wyświetl plik


BIN
release/styles/qwindowsvistastyle.dll Wyświetl plik


BIN
release/translations/qt_ar.qm Wyświetl plik


BIN
release/translations/qt_bg.qm Wyświetl plik


BIN
release/translations/qt_ca.qm Wyświetl plik


BIN
release/translations/qt_cs.qm Wyświetl plik


BIN
release/translations/qt_da.qm Wyświetl plik


BIN
release/translations/qt_de.qm Wyświetl plik


BIN
release/translations/qt_en.qm Wyświetl plik


BIN
release/translations/qt_es.qm Wyświetl plik


BIN
release/translations/qt_fi.qm Wyświetl plik


BIN
release/translations/qt_fr.qm Wyświetl plik


BIN
release/translations/qt_gd.qm Wyświetl plik


BIN
release/translations/qt_he.qm Wyświetl plik


BIN
release/translations/qt_hu.qm Wyświetl plik


BIN
release/translations/qt_it.qm Wyświetl plik


BIN
release/translations/qt_ja.qm Wyświetl plik


BIN
release/translations/qt_ko.qm Wyświetl plik


BIN
release/translations/qt_lv.qm Wyświetl plik


BIN
release/translations/qt_pl.qm Wyświetl plik


BIN
release/translations/qt_ru.qm Wyświetl plik


BIN
release/translations/qt_sk.qm Wyświetl plik


BIN
release/translations/qt_uk.qm Wyświetl plik


BIN
release/translations/qt_zh_TW.qm Wyświetl plik


BIN
release/windeployqt.exe Wyświetl plik


+ 7
- 12
ui_ConfigPage.h Wyświetl plik

@@ -26,7 +26,6 @@ public:
QTableWidget *mConfigTable;
QLineEdit *mSrcDirLineEdit;
QLabel *label;
QPushButton *mChooseSourceDirBtn;
QPushButton *mSaveBtn;
QPushButton *mCancelBtn;
QPushButton *mAddFilterBtn;
@@ -37,10 +36,10 @@ public:
{
if (CConfigPage->objectName().isEmpty())
CConfigPage->setObjectName(QString::fromUtf8("CConfigPage"));
CConfigPage->resize(1204, 509);
CConfigPage->resize(1423, 509);
mConfigTable = new QTableWidget(CConfigPage);
mConfigTable->setObjectName(QString::fromUtf8("mConfigTable"));
mConfigTable->setGeometry(QRect(10, 150, 801, 331));
mConfigTable->setGeometry(QRect(10, 150, 1201, 331));
mSrcDirLineEdit = new QLineEdit(CConfigPage);
mSrcDirLineEdit->setObjectName(QString::fromUtf8("mSrcDirLineEdit"));
mSrcDirLineEdit->setGeometry(QRect(150, 59, 561, 20));
@@ -51,24 +50,21 @@ public:
font.setPointSize(10);
label->setFont(font);
label->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
mChooseSourceDirBtn = new QPushButton(CConfigPage);
mChooseSourceDirBtn->setObjectName(QString::fromUtf8("mChooseSourceDirBtn"));
mChooseSourceDirBtn->setGeometry(QRect(720, 60, 80, 22));
mSaveBtn = new QPushButton(CConfigPage);
mSaveBtn->setObjectName(QString::fromUtf8("mSaveBtn"));
mSaveBtn->setGeometry(QRect(960, 450, 81, 22));
mSaveBtn->setGeometry(QRect(1300, 450, 81, 22));
mCancelBtn = new QPushButton(CConfigPage);
mCancelBtn->setObjectName(QString::fromUtf8("mCancelBtn"));
mCancelBtn->setGeometry(QRect(870, 450, 81, 22));
mCancelBtn->setGeometry(QRect(1220, 450, 81, 22));
mAddFilterBtn = new QPushButton(CConfigPage);
mAddFilterBtn->setObjectName(QString::fromUtf8("mAddFilterBtn"));
mAddFilterBtn->setGeometry(QRect(830, 160, 81, 22));
mAddFilterBtn->setGeometry(QRect(1220, 150, 81, 22));
mDeleteFilterBtn = new QPushButton(CConfigPage);
mDeleteFilterBtn->setObjectName(QString::fromUtf8("mDeleteFilterBtn"));
mDeleteFilterBtn->setGeometry(QRect(830, 190, 81, 22));
mDeleteFilterBtn->setGeometry(QRect(1220, 180, 81, 22));
mCopyFilterBtn = new QPushButton(CConfigPage);
mCopyFilterBtn->setObjectName(QString::fromUtf8("mCopyFilterBtn"));
mCopyFilterBtn->setGeometry(QRect(830, 230, 81, 22));
mCopyFilterBtn->setGeometry(QRect(1220, 220, 81, 22));

retranslateUi(CConfigPage);

@@ -79,7 +75,6 @@ public:
{
CConfigPage->setWindowTitle(QCoreApplication::translate("CConfigPage", "Dialog", nullptr));
label->setText(QCoreApplication::translate("CConfigPage", "R\303\251pertoire source:", nullptr));
mChooseSourceDirBtn->setText(QCoreApplication::translate("CConfigPage", "Choisir", nullptr));
mSaveBtn->setText(QCoreApplication::translate("CConfigPage", "Sauvegarder", nullptr));
mCancelBtn->setText(QCoreApplication::translate("CConfigPage", "Annuler", nullptr));
mAddFilterBtn->setText(QCoreApplication::translate("CConfigPage", "Ajouter Filtre", nullptr));


+ 11
- 0
ui_StatusWindow.h Wyświetl plik

@@ -11,6 +11,7 @@

#include <QtCore/QVariant>
#include <QtWidgets/QApplication>
#include <QtWidgets/QLabel>
#include <QtWidgets/QPushButton>
#include <QtWidgets/QTextEdit>
#include <QtWidgets/QWidget>
@@ -22,6 +23,7 @@ class Ui_CStatusWindow
public:
QTextEdit *mMsgTxtEditBox;
QPushButton *mForceScanBtn;
QLabel *mSoftVersionLbl;

void setupUi(QWidget *CStatusWindow)
{
@@ -34,6 +36,14 @@ public:
mForceScanBtn = new QPushButton(CStatusWindow);
mForceScanBtn->setObjectName(QString::fromUtf8("mForceScanBtn"));
mForceScanBtn->setGeometry(QRect(30, 60, 80, 22));
mSoftVersionLbl = new QLabel(CStatusWindow);
mSoftVersionLbl->setObjectName(QString::fromUtf8("mSoftVersionLbl"));
mSoftVersionLbl->setGeometry(QRect(50, 645, 381, 21));
QFont font;
font.setPointSize(10);
font.setBold(true);
font.setWeight(75);
mSoftVersionLbl->setFont(font);

retranslateUi(CStatusWindow);

@@ -44,6 +54,7 @@ public:
{
CStatusWindow->setWindowTitle(QCoreApplication::translate("CStatusWindow", "Form", nullptr));
mForceScanBtn->setText(QCoreApplication::translate("CStatusWindow", "Forcer scan", nullptr));
mSoftVersionLbl->setText(QCoreApplication::translate("CStatusWindow", "TextLabel", nullptr));
} // retranslateUi

};


Ładowanie…
Anuluj
Zapisz