diff --git a/Configuration/Settings.ozs b/Configuration/Settings.ozs index a778b8f..47d002a 100644 Binary files a/Configuration/Settings.ozs and b/Configuration/Settings.ozs differ diff --git a/Makefile b/Makefile index ab9655d..862c4d2 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,16 @@ ############################################################################# # Makefile for building: OutilZT -# Generated by qmake (2.01a) (Qt 4.8.1) on: Thu Mar 28 08:53:59 2019 +# Generated by qmake (2.01a) (Qt 4.8.4) on: Tue Jun 2 14:45:09 2020 # Project: OutilZT.pro # Template: app -# Command: c:\Qt\4.8.1\bin\qmake.exe -spec ..\..\Qt\4.8.1\mkspecs\win32-g++ CONFIG+=release -o Makefile OutilZT.pro +# Command: c:\Qt\4.8.4\bin\qmake.exe -spec c:\Qt\4.8.4\mkspecs\win32-g++ -o Makefile OutilZT.pro ############################################################################# -first: release -install: release-install -uninstall: release-uninstall +first: debug +install: debug-install +uninstall: debug-uninstall MAKEFILE = Makefile -QMAKE = c:\Qt\4.8.1\bin\qmake.exe +QMAKE = c:\Qt\4.8.4\bin\qmake.exe DEL_FILE = del CHK_DIR_EXISTS= if not exist MKDIR = mkdir @@ -27,25 +27,9 @@ MOVE = move CHK_DIR_EXISTS= if not exist MKDIR = mkdir SUBTARGETS = \ - release \ - debug + debug \ + release -release: $(MAKEFILE).Release FORCE - $(MAKE) -f $(MAKEFILE).Release -release-make_default: $(MAKEFILE).Release FORCE - $(MAKE) -f $(MAKEFILE).Release -release-make_first: $(MAKEFILE).Release FORCE - $(MAKE) -f $(MAKEFILE).Release first -release-all: $(MAKEFILE).Release FORCE - $(MAKE) -f $(MAKEFILE).Release all -release-clean: $(MAKEFILE).Release FORCE - $(MAKE) -f $(MAKEFILE).Release clean -release-distclean: $(MAKEFILE).Release FORCE - $(MAKE) -f $(MAKEFILE).Release distclean -release-install: $(MAKEFILE).Release FORCE - $(MAKE) -f $(MAKEFILE).Release install -release-uninstall: $(MAKEFILE).Release FORCE - $(MAKE) -f $(MAKEFILE).Release uninstall debug: $(MAKEFILE).Debug FORCE $(MAKE) -f $(MAKEFILE).Debug debug-make_default: $(MAKEFILE).Debug FORCE @@ -62,86 +46,104 @@ debug-install: $(MAKEFILE).Debug FORCE $(MAKE) -f $(MAKEFILE).Debug install debug-uninstall: $(MAKEFILE).Debug FORCE $(MAKE) -f $(MAKEFILE).Debug uninstall +release: $(MAKEFILE).Release FORCE + $(MAKE) -f $(MAKEFILE).Release +release-make_default: $(MAKEFILE).Release FORCE + $(MAKE) -f $(MAKEFILE).Release +release-make_first: $(MAKEFILE).Release FORCE + $(MAKE) -f $(MAKEFILE).Release first +release-all: $(MAKEFILE).Release FORCE + $(MAKE) -f $(MAKEFILE).Release all +release-clean: $(MAKEFILE).Release FORCE + $(MAKE) -f $(MAKEFILE).Release clean +release-distclean: $(MAKEFILE).Release FORCE + $(MAKE) -f $(MAKEFILE).Release distclean +release-install: $(MAKEFILE).Release FORCE + $(MAKE) -f $(MAKEFILE).Release install +release-uninstall: $(MAKEFILE).Release FORCE + $(MAKE) -f $(MAKEFILE).Release uninstall -Makefile: OutilZT.pro ../../Qt/4.8.1/mkspecs/win32-g++/qmake.conf ../../Qt/4.8.1/mkspecs/qconfig.pri \ - ../../Qt/4.8.1/mkspecs/modules/qt_webkit_version.pri \ - ../../Qt/4.8.1/mkspecs/features/qt_functions.prf \ - ../../Qt/4.8.1/mkspecs/features/qt_config.prf \ - ../../Qt/4.8.1/mkspecs/features/exclusive_builds.prf \ - ../../Qt/4.8.1/mkspecs/features/default_pre.prf \ - ../../Qt/4.8.1/mkspecs/features/win32/default_pre.prf \ - ../../Qt/4.8.1/mkspecs/features/release.prf \ - ../../Qt/4.8.1/mkspecs/features/debug_and_release.prf \ - ../../Qt/4.8.1/mkspecs/features/default_post.prf \ - ../../Qt/4.8.1/mkspecs/features/win32/default_post.prf \ - ../../Qt/4.8.1/mkspecs/features/win32/rtti.prf \ - ../../Qt/4.8.1/mkspecs/features/win32/exceptions.prf \ - ../../Qt/4.8.1/mkspecs/features/win32/stl.prf \ - ../../Qt/4.8.1/mkspecs/features/shared.prf \ - ../../Qt/4.8.1/mkspecs/features/warn_on.prf \ - ../../Qt/4.8.1/mkspecs/features/qt.prf \ - ../../Qt/4.8.1/mkspecs/features/win32/thread.prf \ - ../../Qt/4.8.1/mkspecs/features/moc.prf \ - ../../Qt/4.8.1/mkspecs/features/win32/windows.prf \ - ../../Qt/4.8.1/mkspecs/features/resources.prf \ - ../../Qt/4.8.1/mkspecs/features/uic.prf \ - ../../Qt/4.8.1/mkspecs/features/yacc.prf \ - ../../Qt/4.8.1/mkspecs/features/lex.prf \ - ../../Qt/4.8.1/mkspecs/features/include_source_dir.prf \ - c:/Qt/4.8.1/lib/qtmain.prl - $(QMAKE) -spec ..\..\Qt\4.8.1\mkspecs\win32-g++ CONFIG+=release -o Makefile OutilZT.pro -..\..\Qt\4.8.1\mkspecs\qconfig.pri: -..\..\Qt\4.8.1\mkspecs\modules\qt_webkit_version.pri: -..\..\Qt\4.8.1\mkspecs\features\qt_functions.prf: -..\..\Qt\4.8.1\mkspecs\features\qt_config.prf: -..\..\Qt\4.8.1\mkspecs\features\exclusive_builds.prf: -..\..\Qt\4.8.1\mkspecs\features\default_pre.prf: -..\..\Qt\4.8.1\mkspecs\features\win32\default_pre.prf: -..\..\Qt\4.8.1\mkspecs\features\release.prf: -..\..\Qt\4.8.1\mkspecs\features\debug_and_release.prf: -..\..\Qt\4.8.1\mkspecs\features\default_post.prf: -..\..\Qt\4.8.1\mkspecs\features\win32\default_post.prf: -..\..\Qt\4.8.1\mkspecs\features\win32\rtti.prf: -..\..\Qt\4.8.1\mkspecs\features\win32\exceptions.prf: -..\..\Qt\4.8.1\mkspecs\features\win32\stl.prf: -..\..\Qt\4.8.1\mkspecs\features\shared.prf: -..\..\Qt\4.8.1\mkspecs\features\warn_on.prf: -..\..\Qt\4.8.1\mkspecs\features\qt.prf: -..\..\Qt\4.8.1\mkspecs\features\win32\thread.prf: -..\..\Qt\4.8.1\mkspecs\features\moc.prf: -..\..\Qt\4.8.1\mkspecs\features\win32\windows.prf: -..\..\Qt\4.8.1\mkspecs\features\resources.prf: -..\..\Qt\4.8.1\mkspecs\features\uic.prf: -..\..\Qt\4.8.1\mkspecs\features\yacc.prf: -..\..\Qt\4.8.1\mkspecs\features\lex.prf: -..\..\Qt\4.8.1\mkspecs\features\include_source_dir.prf: -c:\Qt\4.8.1\lib\qtmain.prl: +Makefile: OutilZT.pro c:/Qt/4.8.4/mkspecs/win32-g++/qmake.conf c:/Qt/4.8.4/mkspecs/features/device_config.prf \ + c:/Qt/4.8.4/mkspecs/qconfig.pri \ + c:/Qt/4.8.4/mkspecs/modules/qt_webkit_version.pri \ + c:/Qt/4.8.4/mkspecs/features/qt_functions.prf \ + c:/Qt/4.8.4/mkspecs/features/qt_config.prf \ + c:/Qt/4.8.4/mkspecs/features/exclusive_builds.prf \ + c:/Qt/4.8.4/mkspecs/features/default_pre.prf \ + c:/Qt/4.8.4/mkspecs/features/win32/default_pre.prf \ + c:/Qt/4.8.4/mkspecs/features/debug.prf \ + c:/Qt/4.8.4/mkspecs/features/debug_and_release.prf \ + c:/Qt/4.8.4/mkspecs/features/default_post.prf \ + c:/Qt/4.8.4/mkspecs/features/win32/default_post.prf \ + c:/Qt/4.8.4/mkspecs/features/win32/rtti.prf \ + c:/Qt/4.8.4/mkspecs/features/win32/exceptions.prf \ + c:/Qt/4.8.4/mkspecs/features/win32/stl.prf \ + c:/Qt/4.8.4/mkspecs/features/shared.prf \ + c:/Qt/4.8.4/mkspecs/features/warn_on.prf \ + c:/Qt/4.8.4/mkspecs/features/qt.prf \ + c:/Qt/4.8.4/mkspecs/features/win32/thread.prf \ + c:/Qt/4.8.4/mkspecs/features/moc.prf \ + c:/Qt/4.8.4/mkspecs/features/win32/windows.prf \ + c:/Qt/4.8.4/mkspecs/features/resources.prf \ + c:/Qt/4.8.4/mkspecs/features/uic.prf \ + c:/Qt/4.8.4/mkspecs/features/yacc.prf \ + c:/Qt/4.8.4/mkspecs/features/lex.prf \ + c:/Qt/4.8.4/mkspecs/features/include_source_dir.prf \ + c:/Qt/4.8.4/lib/qtmaind.prl + $(QMAKE) -spec c:\Qt\4.8.4\mkspecs\win32-g++ -o Makefile OutilZT.pro +c:\Qt\4.8.4\mkspecs\features\device_config.prf: +c:\Qt\4.8.4\mkspecs\qconfig.pri: +c:\Qt\4.8.4\mkspecs\modules\qt_webkit_version.pri: +c:\Qt\4.8.4\mkspecs\features\qt_functions.prf: +c:\Qt\4.8.4\mkspecs\features\qt_config.prf: +c:\Qt\4.8.4\mkspecs\features\exclusive_builds.prf: +c:\Qt\4.8.4\mkspecs\features\default_pre.prf: +c:\Qt\4.8.4\mkspecs\features\win32\default_pre.prf: +c:\Qt\4.8.4\mkspecs\features\debug.prf: +c:\Qt\4.8.4\mkspecs\features\debug_and_release.prf: +c:\Qt\4.8.4\mkspecs\features\default_post.prf: +c:\Qt\4.8.4\mkspecs\features\win32\default_post.prf: +c:\Qt\4.8.4\mkspecs\features\win32\rtti.prf: +c:\Qt\4.8.4\mkspecs\features\win32\exceptions.prf: +c:\Qt\4.8.4\mkspecs\features\win32\stl.prf: +c:\Qt\4.8.4\mkspecs\features\shared.prf: +c:\Qt\4.8.4\mkspecs\features\warn_on.prf: +c:\Qt\4.8.4\mkspecs\features\qt.prf: +c:\Qt\4.8.4\mkspecs\features\win32\thread.prf: +c:\Qt\4.8.4\mkspecs\features\moc.prf: +c:\Qt\4.8.4\mkspecs\features\win32\windows.prf: +c:\Qt\4.8.4\mkspecs\features\resources.prf: +c:\Qt\4.8.4\mkspecs\features\uic.prf: +c:\Qt\4.8.4\mkspecs\features\yacc.prf: +c:\Qt\4.8.4\mkspecs\features\lex.prf: +c:\Qt\4.8.4\mkspecs\features\include_source_dir.prf: +c:\Qt\4.8.4\lib\qtmaind.prl: qmake: qmake_all FORCE - @$(QMAKE) -spec ..\..\Qt\4.8.1\mkspecs\win32-g++ CONFIG+=release -o Makefile OutilZT.pro + @$(QMAKE) -spec c:\Qt\4.8.4\mkspecs\win32-g++ -o Makefile OutilZT.pro qmake_all: FORCE -make_default: release-make_default debug-make_default 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 +make_default: debug-make_default release-make_default 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 -$(DEL_FILE) Makefile check: first -release-mocclean: $(MAKEFILE).Release - $(MAKE) -f $(MAKEFILE).Release mocclean debug-mocclean: $(MAKEFILE).Debug $(MAKE) -f $(MAKEFILE).Debug mocclean -mocclean: release-mocclean debug-mocclean +release-mocclean: $(MAKEFILE).Release + $(MAKE) -f $(MAKEFILE).Release mocclean +mocclean: debug-mocclean release-mocclean -release-mocables: $(MAKEFILE).Release - $(MAKE) -f $(MAKEFILE).Release mocables debug-mocables: $(MAKEFILE).Debug $(MAKE) -f $(MAKEFILE).Debug mocables -mocables: release-mocables debug-mocables +release-mocables: $(MAKEFILE).Release + $(MAKE) -f $(MAKEFILE).Release mocables +mocables: debug-mocables release-mocables FORCE: -$(MAKEFILE).Release: Makefile $(MAKEFILE).Debug: Makefile +$(MAKEFILE).Release: Makefile diff --git a/Makefile.Debug b/Makefile.Debug index 802b371..b6e394e 100644 --- a/Makefile.Debug +++ b/Makefile.Debug @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: OutilZT -# Generated by qmake (2.01a) (Qt 4.8.1) on: Thu Mar 28 08:53:59 2019 +# Generated by qmake (2.01a) (Qt 4.8.4) on: Tue Jun 2 14:45:09 2020 # Project: OutilZT.pro # Template: app ############################################################################# @@ -10,14 +10,14 @@ CC = gcc CXX = g++ DEFINES = -DUNICODE -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_THREAD_SUPPORT -DQT_NEEDS_QMAIN -CFLAGS = -g -Wall $(DEFINES) -CXXFLAGS = -g -frtti -fexceptions -mthreads -Wall $(DEFINES) -INCPATH = -I"..\..\Qt\4.8.1\include\QtCore" -I"..\..\Qt\4.8.1\include\QtNetwork" -I"..\..\Qt\4.8.1\include\QtGui" -I"..\..\Qt\4.8.1\include" -I"." -I"sources" -I"sources\GuiElements" -I"..\..\Qt\4.8.1\include\ActiveQt" -I"debug" -I"..\..\Qt\4.8.1\mkspecs\win32-g++" +CFLAGS = -pipe -g -Wall -Wextra $(DEFINES) +CXXFLAGS = -pipe -g -frtti -fexceptions -mthreads -Wall -Wextra $(DEFINES) +INCPATH = -I"c:\Qt\4.8.4\include\QtCore" -I"c:\Qt\4.8.4\include\QtNetwork" -I"c:\Qt\4.8.4\include\QtGui" -I"c:\Qt\4.8.4\include" -I"." -I"sources" -I"sources\GuiElements" -I"c:\Qt\4.8.4\include\ActiveQt" -I"debug" -I"c:\Qt\4.8.4\mkspecs\win32-g++" LINK = g++ LFLAGS = -mthreads -Wl,-subsystem,windows -LIBS = -L"c:\Qt\4.8.1\lib" -lmingw32 -lqtmaind -lQtGuid4 -lQtNetworkd4 -lQtCored4 -QMAKE = c:\Qt\4.8.1\bin\qmake.exe -IDC = c:\Qt\4.8.1\bin\idc.exe +LIBS = -L"c:\Qt\4.8.4\lib" -lmingw32 -lqtmaind -lQtGuid4 -lQtNetworkd4 -lQtCored4 +QMAKE = c:\Qt\4.8.4\bin\qmake.exe +IDC = c:\Qt\4.8.4\bin\idc.exe IDL = midl ZIP = zip -r -9 DEF_FILE = @@ -203,10 +203,10 @@ $(DESTDIR_TARGET): $(OBJECTS) $(LINK) $(LFLAGS) -o $(DESTDIR_TARGET) object_script.OutilZT.Debug $(LIBS) qmake: FORCE - @$(QMAKE) -spec ..\..\Qt\4.8.1\mkspecs\win32-g++ CONFIG+=release -o Makefile.Debug OutilZT.pro + @$(QMAKE) -spec c:\Qt\4.8.4\mkspecs\win32-g++ -o Makefile.Debug OutilZT.pro dist: - $(ZIP) OutilZT.zip $(SOURCES) $(DIST) OutilZT.pro ..\..\Qt\4.8.1\mkspecs\qconfig.pri ..\..\Qt\4.8.1\mkspecs\modules\qt_webkit_version.pri ..\..\Qt\4.8.1\mkspecs\features\qt_functions.prf ..\..\Qt\4.8.1\mkspecs\features\qt_config.prf ..\..\Qt\4.8.1\mkspecs\features\exclusive_builds.prf ..\..\Qt\4.8.1\mkspecs\features\default_pre.prf ..\..\Qt\4.8.1\mkspecs\features\win32\default_pre.prf ..\..\Qt\4.8.1\mkspecs\features\debug.prf ..\..\Qt\4.8.1\mkspecs\features\debug_and_release.prf ..\..\Qt\4.8.1\mkspecs\features\default_post.prf ..\..\Qt\4.8.1\mkspecs\features\win32\default_post.prf ..\..\Qt\4.8.1\mkspecs\features\build_pass.prf ..\..\Qt\4.8.1\mkspecs\features\win32\rtti.prf ..\..\Qt\4.8.1\mkspecs\features\win32\exceptions.prf ..\..\Qt\4.8.1\mkspecs\features\win32\stl.prf ..\..\Qt\4.8.1\mkspecs\features\shared.prf ..\..\Qt\4.8.1\mkspecs\features\warn_on.prf ..\..\Qt\4.8.1\mkspecs\features\qt.prf ..\..\Qt\4.8.1\mkspecs\features\win32\thread.prf ..\..\Qt\4.8.1\mkspecs\features\moc.prf ..\..\Qt\4.8.1\mkspecs\features\win32\windows.prf ..\..\Qt\4.8.1\mkspecs\features\resources.prf ..\..\Qt\4.8.1\mkspecs\features\uic.prf ..\..\Qt\4.8.1\mkspecs\features\yacc.prf ..\..\Qt\4.8.1\mkspecs\features\lex.prf ..\..\Qt\4.8.1\mkspecs\features\include_source_dir.prf c:\Qt\4.8.1\lib\qtmaind.prl HEADERS RESOURCES IMAGES SOURCES OBJECTIVE_SOURCES FORMS YACCSOURCES YACCSOURCES LEXSOURCES + $(ZIP) OutilZT.zip $(SOURCES) $(DIST) OutilZT.pro c:\Qt\4.8.4\mkspecs\features\device_config.prf c:\Qt\4.8.4\mkspecs\qconfig.pri c:\Qt\4.8.4\mkspecs\modules\qt_webkit_version.pri c:\Qt\4.8.4\mkspecs\features\qt_functions.prf c:\Qt\4.8.4\mkspecs\features\qt_config.prf c:\Qt\4.8.4\mkspecs\features\exclusive_builds.prf c:\Qt\4.8.4\mkspecs\features\default_pre.prf c:\Qt\4.8.4\mkspecs\features\win32\default_pre.prf c:\Qt\4.8.4\mkspecs\features\debug.prf c:\Qt\4.8.4\mkspecs\features\debug_and_release.prf c:\Qt\4.8.4\mkspecs\features\default_post.prf c:\Qt\4.8.4\mkspecs\features\win32\default_post.prf c:\Qt\4.8.4\mkspecs\features\build_pass.prf c:\Qt\4.8.4\mkspecs\features\win32\rtti.prf c:\Qt\4.8.4\mkspecs\features\win32\exceptions.prf c:\Qt\4.8.4\mkspecs\features\win32\stl.prf c:\Qt\4.8.4\mkspecs\features\shared.prf c:\Qt\4.8.4\mkspecs\features\warn_on.prf c:\Qt\4.8.4\mkspecs\features\qt.prf c:\Qt\4.8.4\mkspecs\features\win32\thread.prf c:\Qt\4.8.4\mkspecs\features\moc.prf c:\Qt\4.8.4\mkspecs\features\win32\windows.prf c:\Qt\4.8.4\mkspecs\features\resources.prf c:\Qt\4.8.4\mkspecs\features\uic.prf c:\Qt\4.8.4\mkspecs\features\yacc.prf c:\Qt\4.8.4\mkspecs\features\lex.prf c:\Qt\4.8.4\mkspecs\features\include_source_dir.prf c:\Qt\4.8.4\lib\qtmaind.prl HEADERS RESOURCES IMAGES SOURCES OBJECTIVE_SOURCES FORMS YACCSOURCES YACCSOURCES LEXSOURCES clean: compiler_clean -$(DEL_FILE) debug\main.o debug\OutilZT.o debug\MainPanel.o debug\MainPage.o debug\GuiPage.o debug\PushButton.o debug\LogViewPage.o debug\TextButtonWidget.o debug\RankRulerWidget.o debug\GraphCursorWidget.o debug\EventsRulerWidget.o debug\AnalogGraphItem.o debug\GraphItem.o debug\GraphRulerWidget.o debug\ZTData.o debug\LogMgr.o debug\TrainLogFileMgr.o debug\LogsListPage.o debug\OptionsPage.o debug\Settings.o debug\NetworkZTListPage.o debug\ToggleTextButtonWidget.o debug\NetworkCtrlPage.o debug\NetworkManager.o debug\TxRxWidget.o debug\TCPProtocol.o debug\RemoteZTPage.o debug\ZTLogViewerPage.o debug\ProgressBarPage.o debug\RemoteZTCtrlPage.o debug\ToggleButtonWidget.o debug\UDPProtocol.o debug\DatabaseMgrPage.o debug\ZTLogsListPage.o debug\ZTLogFilesMgr.o debug\DirParserThread.o debug\moc_OutilZT.o debug\moc_MainPanel.o debug\moc_MainPage.o debug\moc_Guipage.o debug\moc_PushButton.o debug\moc_LogViewPage.o debug\moc_TextButtonWidget.o debug\moc_RankRulerWidget.o debug\moc_GraphCursorWidget.o debug\moc_EventsRulerWidget.o debug\moc_AnalogGraphItem.o debug\moc_GraphItem.o debug\moc_GraphRulerWidget.o debug\moc_LogMgr.o debug\moc_LogsListPage.o debug\moc_OptionsPage.o debug\moc_NetworkZTListPage.o debug\moc_ToggleTextButtonWidget.o debug\moc_NetworkCtrlPage.o debug\moc_NetworkManager.o debug\moc_TxRxWidget.o debug\moc_RemoteZTPage.o debug\moc_ZTLogViewerPage.o debug\moc_ProgressBarPage.o debug\moc_RemoteZTCtrlPage.o debug\moc_ToggleButtonWidget.o debug\moc_DatabaseMgrPage.o debug\moc_ZTLogsListPage.o debug\moc_ZTLogFilesMgr.o debug\moc_DirParserThread.o @@ -234,22 +234,22 @@ debug/moc_OutilZT.cpp: sources/MainPanel.h \ sources/TCPProtocol.h \ sources/ZTLogFilesMgr.h \ sources/OutilZT.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\OutilZT.h -o debug\moc_OutilZT.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\OutilZT.h -o debug\moc_OutilZT.cpp debug/moc_MainPanel.cpp: sources/GlobalDefine.h \ sources/MainPanel.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\MainPanel.h -o debug\moc_MainPanel.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\MainPanel.h -o debug\moc_MainPanel.cpp debug/moc_MainPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/MainPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\MainPage.h -o debug\moc_MainPage.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\MainPage.h -o debug\moc_MainPage.cpp debug/moc_Guipage.cpp: sources/GuiElements/Guipage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\Guipage.h -o debug\moc_Guipage.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\Guipage.h -o debug\moc_Guipage.cpp debug/moc_PushButton.cpp: sources/GuiElements/PushButton.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\PushButton.h -o debug\moc_PushButton.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\PushButton.h -o debug\moc_PushButton.cpp debug/moc_LogViewPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ @@ -261,123 +261,123 @@ debug/moc_LogViewPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/RankRulerWidget.h \ sources/GuiElements/EventsRulerWidget.h \ sources/GuiElements/LogViewPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\LogViewPage.h -o debug\moc_LogViewPage.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\LogViewPage.h -o debug\moc_LogViewPage.cpp debug/moc_TextButtonWidget.cpp: sources/GuiElements/TextButtonWidget.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\TextButtonWidget.h -o debug\moc_TextButtonWidget.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\TextButtonWidget.h -o debug\moc_TextButtonWidget.cpp debug/moc_RankRulerWidget.cpp: sources/GuiElements/RankRulerWidget.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\RankRulerWidget.h -o debug\moc_RankRulerWidget.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\RankRulerWidget.h -o debug\moc_RankRulerWidget.cpp debug/moc_GraphCursorWidget.cpp: sources/GuiElements/GraphCursorWidget.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\GraphCursorWidget.h -o debug\moc_GraphCursorWidget.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\GraphCursorWidget.h -o debug\moc_GraphCursorWidget.cpp debug/moc_EventsRulerWidget.cpp: sources/GuiElements/EventsRulerWidget.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\EventsRulerWidget.h -o debug\moc_EventsRulerWidget.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\EventsRulerWidget.h -o debug\moc_EventsRulerWidget.cpp debug/moc_AnalogGraphItem.cpp: sources/GuiElements/AnalogGraphItem.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\AnalogGraphItem.h -o debug\moc_AnalogGraphItem.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\AnalogGraphItem.h -o debug\moc_AnalogGraphItem.cpp debug/moc_GraphItem.cpp: sources/GuiElements/GraphItem.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\GraphItem.h -o debug\moc_GraphItem.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\GraphItem.h -o debug\moc_GraphItem.cpp debug/moc_GraphRulerWidget.cpp: sources/GuiElements/GraphRulerWidget.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\GraphRulerWidget.h -o debug\moc_GraphRulerWidget.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\GraphRulerWidget.h -o debug\moc_GraphRulerWidget.cpp debug/moc_LogMgr.cpp: sources/ZTData.h \ sources/GlobalDefine.h \ sources/DirParserThread.h \ sources/TrainLogFileMgr.h \ sources/LogMgr.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\LogMgr.h -o debug\moc_LogMgr.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\LogMgr.h -o debug\moc_LogMgr.cpp debug/moc_LogsListPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/LogsListPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\LogsListPage.h -o debug\moc_LogsListPage.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\LogsListPage.h -o debug\moc_LogsListPage.cpp debug/moc_OptionsPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/OptionsPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\OptionsPage.h -o debug\moc_OptionsPage.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\OptionsPage.h -o debug\moc_OptionsPage.cpp debug/moc_NetworkZTListPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/NetworkZTListPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\NetworkZTListPage.h -o debug\moc_NetworkZTListPage.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\NetworkZTListPage.h -o debug\moc_NetworkZTListPage.cpp debug/moc_ToggleTextButtonWidget.cpp: sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/ToggleTextButtonWidget.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ToggleTextButtonWidget.h -o debug\moc_ToggleTextButtonWidget.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ToggleTextButtonWidget.h -o debug\moc_ToggleTextButtonWidget.cpp debug/moc_NetworkCtrlPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/ToggleTextButtonWidget.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/TxRxWidget.h \ sources/GuiElements/NetworkCtrlPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\NetworkCtrlPage.h -o debug\moc_NetworkCtrlPage.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\NetworkCtrlPage.h -o debug\moc_NetworkCtrlPage.cpp debug/moc_NetworkManager.cpp: sources/GlobalDefine.h \ sources/ZTData.h \ sources/TCPProtocol.h \ sources/UDPProtocol.h \ sources/NetworkManager.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\NetworkManager.h -o debug\moc_NetworkManager.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\NetworkManager.h -o debug\moc_NetworkManager.cpp debug/moc_TxRxWidget.cpp: sources/GuiElements/TxRxWidget.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\TxRxWidget.h -o debug\moc_TxRxWidget.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\TxRxWidget.h -o debug\moc_TxRxWidget.cpp debug/moc_RemoteZTPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/ToggleTextButtonWidget.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/RemoteZTPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\RemoteZTPage.h -o debug\moc_RemoteZTPage.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\RemoteZTPage.h -o debug\moc_RemoteZTPage.cpp debug/moc_ZTLogViewerPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/ZTLogViewerPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ZTLogViewerPage.h -o debug\moc_ZTLogViewerPage.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ZTLogViewerPage.h -o debug\moc_ZTLogViewerPage.cpp debug/moc_ProgressBarPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/ProgressBarPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ProgressBarPage.h -o debug\moc_ProgressBarPage.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ProgressBarPage.h -o debug\moc_ProgressBarPage.cpp debug/moc_RemoteZTCtrlPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/ToggleButtonWidget.h \ sources/GuiElements/RemoteZTCtrlPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\RemoteZTCtrlPage.h -o debug\moc_RemoteZTCtrlPage.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\RemoteZTCtrlPage.h -o debug\moc_RemoteZTCtrlPage.cpp debug/moc_ToggleButtonWidget.cpp: sources/GuiElements/ToggleButtonWidget.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ToggleButtonWidget.h -o debug\moc_ToggleButtonWidget.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ToggleButtonWidget.h -o debug\moc_ToggleButtonWidget.cpp debug/moc_DatabaseMgrPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/DatabaseMgrPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\DatabaseMgrPage.h -o debug\moc_DatabaseMgrPage.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\DatabaseMgrPage.h -o debug\moc_DatabaseMgrPage.cpp debug/moc_ZTLogsListPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/ZTLogsListPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ZTLogsListPage.h -o debug\moc_ZTLogsListPage.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ZTLogsListPage.h -o debug\moc_ZTLogsListPage.cpp debug/moc_ZTLogFilesMgr.cpp: sources/ZTData.h \ sources/GlobalDefine.h \ sources/DirParserThread.h \ sources/TrainLogFileMgr.h \ sources/ZTLogFilesMgr.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\ZTLogFilesMgr.h -o debug\moc_ZTLogFilesMgr.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\ZTLogFilesMgr.h -o debug\moc_ZTLogFilesMgr.cpp debug/moc_DirParserThread.cpp: sources/GlobalDefine.h \ sources/TrainLogFileMgr.h \ sources/ZTData.h \ sources/DirParserThread.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\DirParserThread.h -o debug\moc_DirParserThread.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\DirParserThread.h -o debug\moc_DirParserThread.cpp compiler_rcc_make_all: compiler_rcc_clean: diff --git a/Makefile.Release b/Makefile.Release index d2dbe84..0c94d41 100644 --- a/Makefile.Release +++ b/Makefile.Release @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: OutilZT -# Generated by qmake (2.01a) (Qt 4.8.1) on: Thu Mar 28 08:53:59 2019 +# Generated by qmake (2.01a) (Qt 4.8.4) on: Tue Jun 2 14:45:09 2020 # Project: OutilZT.pro # Template: app ############################################################################# @@ -10,14 +10,14 @@ CC = gcc CXX = g++ DEFINES = -DUNICODE -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_THREAD_SUPPORT -DQT_NEEDS_QMAIN -CFLAGS = -O2 -Wall $(DEFINES) -CXXFLAGS = -O2 -frtti -fexceptions -mthreads -Wall $(DEFINES) -INCPATH = -I"..\..\Qt\4.8.1\include\QtCore" -I"..\..\Qt\4.8.1\include\QtNetwork" -I"..\..\Qt\4.8.1\include\QtGui" -I"..\..\Qt\4.8.1\include" -I"." -I"sources" -I"sources\GuiElements" -I"..\..\Qt\4.8.1\include\ActiveQt" -I"release" -I"..\..\Qt\4.8.1\mkspecs\win32-g++" +CFLAGS = -pipe -O2 -Wall -Wextra $(DEFINES) +CXXFLAGS = -pipe -O2 -frtti -fexceptions -mthreads -Wall -Wextra $(DEFINES) +INCPATH = -I"c:\Qt\4.8.4\include\QtCore" -I"c:\Qt\4.8.4\include\QtNetwork" -I"c:\Qt\4.8.4\include\QtGui" -I"c:\Qt\4.8.4\include" -I"." -I"sources" -I"sources\GuiElements" -I"c:\Qt\4.8.4\include\ActiveQt" -I"release" -I"c:\Qt\4.8.4\mkspecs\win32-g++" LINK = g++ LFLAGS = -Wl,-s -mthreads -Wl,-subsystem,windows -LIBS = -L"c:\Qt\4.8.1\lib" -lmingw32 -lqtmain -lQtGui4 -lQtNetwork4 -lQtCore4 -QMAKE = c:\Qt\4.8.1\bin\qmake.exe -IDC = c:\Qt\4.8.1\bin\idc.exe +LIBS = -L"c:\Qt\4.8.4\lib" -lmingw32 -lqtmain -lQtGui4 -lQtNetwork4 -lQtCore4 +QMAKE = c:\Qt\4.8.4\bin\qmake.exe +IDC = c:\Qt\4.8.4\bin\idc.exe IDL = midl ZIP = zip -r -9 DEF_FILE = @@ -203,10 +203,10 @@ $(DESTDIR_TARGET): $(OBJECTS) $(LINK) $(LFLAGS) -o $(DESTDIR_TARGET) object_script.OutilZT.Release $(LIBS) qmake: FORCE - @$(QMAKE) -spec ..\..\Qt\4.8.1\mkspecs\win32-g++ CONFIG+=release -o Makefile.Release OutilZT.pro + @$(QMAKE) -spec c:\Qt\4.8.4\mkspecs\win32-g++ -o Makefile.Release OutilZT.pro dist: - $(ZIP) OutilZT.zip $(SOURCES) $(DIST) OutilZT.pro ..\..\Qt\4.8.1\mkspecs\qconfig.pri ..\..\Qt\4.8.1\mkspecs\modules\qt_webkit_version.pri ..\..\Qt\4.8.1\mkspecs\features\qt_functions.prf ..\..\Qt\4.8.1\mkspecs\features\qt_config.prf ..\..\Qt\4.8.1\mkspecs\features\exclusive_builds.prf ..\..\Qt\4.8.1\mkspecs\features\default_pre.prf ..\..\Qt\4.8.1\mkspecs\features\win32\default_pre.prf ..\..\Qt\4.8.1\mkspecs\features\release.prf ..\..\Qt\4.8.1\mkspecs\features\debug_and_release.prf ..\..\Qt\4.8.1\mkspecs\features\default_post.prf ..\..\Qt\4.8.1\mkspecs\features\win32\default_post.prf ..\..\Qt\4.8.1\mkspecs\features\build_pass.prf ..\..\Qt\4.8.1\mkspecs\features\win32\rtti.prf ..\..\Qt\4.8.1\mkspecs\features\win32\exceptions.prf ..\..\Qt\4.8.1\mkspecs\features\win32\stl.prf ..\..\Qt\4.8.1\mkspecs\features\shared.prf ..\..\Qt\4.8.1\mkspecs\features\warn_on.prf ..\..\Qt\4.8.1\mkspecs\features\qt.prf ..\..\Qt\4.8.1\mkspecs\features\win32\thread.prf ..\..\Qt\4.8.1\mkspecs\features\moc.prf ..\..\Qt\4.8.1\mkspecs\features\win32\windows.prf ..\..\Qt\4.8.1\mkspecs\features\resources.prf ..\..\Qt\4.8.1\mkspecs\features\uic.prf ..\..\Qt\4.8.1\mkspecs\features\yacc.prf ..\..\Qt\4.8.1\mkspecs\features\lex.prf ..\..\Qt\4.8.1\mkspecs\features\include_source_dir.prf c:\Qt\4.8.1\lib\qtmain.prl HEADERS RESOURCES IMAGES SOURCES OBJECTIVE_SOURCES FORMS YACCSOURCES YACCSOURCES LEXSOURCES + $(ZIP) OutilZT.zip $(SOURCES) $(DIST) OutilZT.pro c:\Qt\4.8.4\mkspecs\features\device_config.prf c:\Qt\4.8.4\mkspecs\qconfig.pri c:\Qt\4.8.4\mkspecs\modules\qt_webkit_version.pri c:\Qt\4.8.4\mkspecs\features\qt_functions.prf c:\Qt\4.8.4\mkspecs\features\qt_config.prf c:\Qt\4.8.4\mkspecs\features\exclusive_builds.prf c:\Qt\4.8.4\mkspecs\features\default_pre.prf c:\Qt\4.8.4\mkspecs\features\win32\default_pre.prf c:\Qt\4.8.4\mkspecs\features\release.prf c:\Qt\4.8.4\mkspecs\features\debug_and_release.prf c:\Qt\4.8.4\mkspecs\features\default_post.prf c:\Qt\4.8.4\mkspecs\features\win32\default_post.prf c:\Qt\4.8.4\mkspecs\features\build_pass.prf c:\Qt\4.8.4\mkspecs\features\win32\rtti.prf c:\Qt\4.8.4\mkspecs\features\win32\exceptions.prf c:\Qt\4.8.4\mkspecs\features\win32\stl.prf c:\Qt\4.8.4\mkspecs\features\shared.prf c:\Qt\4.8.4\mkspecs\features\warn_on.prf c:\Qt\4.8.4\mkspecs\features\qt.prf c:\Qt\4.8.4\mkspecs\features\win32\thread.prf c:\Qt\4.8.4\mkspecs\features\moc.prf c:\Qt\4.8.4\mkspecs\features\win32\windows.prf c:\Qt\4.8.4\mkspecs\features\resources.prf c:\Qt\4.8.4\mkspecs\features\uic.prf c:\Qt\4.8.4\mkspecs\features\yacc.prf c:\Qt\4.8.4\mkspecs\features\lex.prf c:\Qt\4.8.4\mkspecs\features\include_source_dir.prf c:\Qt\4.8.4\lib\qtmain.prl HEADERS RESOURCES IMAGES SOURCES OBJECTIVE_SOURCES FORMS YACCSOURCES YACCSOURCES LEXSOURCES clean: compiler_clean -$(DEL_FILE) release\main.o release\OutilZT.o release\MainPanel.o release\MainPage.o release\GuiPage.o release\PushButton.o release\LogViewPage.o release\TextButtonWidget.o release\RankRulerWidget.o release\GraphCursorWidget.o release\EventsRulerWidget.o release\AnalogGraphItem.o release\GraphItem.o release\GraphRulerWidget.o release\ZTData.o release\LogMgr.o release\TrainLogFileMgr.o release\LogsListPage.o release\OptionsPage.o release\Settings.o release\NetworkZTListPage.o release\ToggleTextButtonWidget.o release\NetworkCtrlPage.o release\NetworkManager.o release\TxRxWidget.o release\TCPProtocol.o release\RemoteZTPage.o release\ZTLogViewerPage.o release\ProgressBarPage.o release\RemoteZTCtrlPage.o release\ToggleButtonWidget.o release\UDPProtocol.o release\DatabaseMgrPage.o release\ZTLogsListPage.o release\ZTLogFilesMgr.o release\DirParserThread.o release\moc_OutilZT.o release\moc_MainPanel.o release\moc_MainPage.o release\moc_Guipage.o release\moc_PushButton.o release\moc_LogViewPage.o release\moc_TextButtonWidget.o release\moc_RankRulerWidget.o release\moc_GraphCursorWidget.o release\moc_EventsRulerWidget.o release\moc_AnalogGraphItem.o release\moc_GraphItem.o release\moc_GraphRulerWidget.o release\moc_LogMgr.o release\moc_LogsListPage.o release\moc_OptionsPage.o release\moc_NetworkZTListPage.o release\moc_ToggleTextButtonWidget.o release\moc_NetworkCtrlPage.o release\moc_NetworkManager.o release\moc_TxRxWidget.o release\moc_RemoteZTPage.o release\moc_ZTLogViewerPage.o release\moc_ProgressBarPage.o release\moc_RemoteZTCtrlPage.o release\moc_ToggleButtonWidget.o release\moc_DatabaseMgrPage.o release\moc_ZTLogsListPage.o release\moc_ZTLogFilesMgr.o release\moc_DirParserThread.o @@ -234,22 +234,22 @@ release/moc_OutilZT.cpp: sources/MainPanel.h \ sources/TCPProtocol.h \ sources/ZTLogFilesMgr.h \ sources/OutilZT.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\OutilZT.h -o release\moc_OutilZT.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\OutilZT.h -o release\moc_OutilZT.cpp release/moc_MainPanel.cpp: sources/GlobalDefine.h \ sources/MainPanel.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\MainPanel.h -o release\moc_MainPanel.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\MainPanel.h -o release\moc_MainPanel.cpp release/moc_MainPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/MainPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\MainPage.h -o release\moc_MainPage.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\MainPage.h -o release\moc_MainPage.cpp release/moc_Guipage.cpp: sources/GuiElements/Guipage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\Guipage.h -o release\moc_Guipage.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\Guipage.h -o release\moc_Guipage.cpp release/moc_PushButton.cpp: sources/GuiElements/PushButton.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\PushButton.h -o release\moc_PushButton.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\PushButton.h -o release\moc_PushButton.cpp release/moc_LogViewPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ @@ -261,123 +261,123 @@ release/moc_LogViewPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/RankRulerWidget.h \ sources/GuiElements/EventsRulerWidget.h \ sources/GuiElements/LogViewPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\LogViewPage.h -o release\moc_LogViewPage.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\LogViewPage.h -o release\moc_LogViewPage.cpp release/moc_TextButtonWidget.cpp: sources/GuiElements/TextButtonWidget.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\TextButtonWidget.h -o release\moc_TextButtonWidget.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\TextButtonWidget.h -o release\moc_TextButtonWidget.cpp release/moc_RankRulerWidget.cpp: sources/GuiElements/RankRulerWidget.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\RankRulerWidget.h -o release\moc_RankRulerWidget.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\RankRulerWidget.h -o release\moc_RankRulerWidget.cpp release/moc_GraphCursorWidget.cpp: sources/GuiElements/GraphCursorWidget.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\GraphCursorWidget.h -o release\moc_GraphCursorWidget.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\GraphCursorWidget.h -o release\moc_GraphCursorWidget.cpp release/moc_EventsRulerWidget.cpp: sources/GuiElements/EventsRulerWidget.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\EventsRulerWidget.h -o release\moc_EventsRulerWidget.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\EventsRulerWidget.h -o release\moc_EventsRulerWidget.cpp release/moc_AnalogGraphItem.cpp: sources/GuiElements/AnalogGraphItem.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\AnalogGraphItem.h -o release\moc_AnalogGraphItem.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\AnalogGraphItem.h -o release\moc_AnalogGraphItem.cpp release/moc_GraphItem.cpp: sources/GuiElements/GraphItem.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\GraphItem.h -o release\moc_GraphItem.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\GraphItem.h -o release\moc_GraphItem.cpp release/moc_GraphRulerWidget.cpp: sources/GuiElements/GraphRulerWidget.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\GraphRulerWidget.h -o release\moc_GraphRulerWidget.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\GraphRulerWidget.h -o release\moc_GraphRulerWidget.cpp release/moc_LogMgr.cpp: sources/ZTData.h \ sources/GlobalDefine.h \ sources/DirParserThread.h \ sources/TrainLogFileMgr.h \ sources/LogMgr.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\LogMgr.h -o release\moc_LogMgr.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\LogMgr.h -o release\moc_LogMgr.cpp release/moc_LogsListPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/LogsListPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\LogsListPage.h -o release\moc_LogsListPage.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\LogsListPage.h -o release\moc_LogsListPage.cpp release/moc_OptionsPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/OptionsPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\OptionsPage.h -o release\moc_OptionsPage.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\OptionsPage.h -o release\moc_OptionsPage.cpp release/moc_NetworkZTListPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/NetworkZTListPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\NetworkZTListPage.h -o release\moc_NetworkZTListPage.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\NetworkZTListPage.h -o release\moc_NetworkZTListPage.cpp release/moc_ToggleTextButtonWidget.cpp: sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/ToggleTextButtonWidget.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ToggleTextButtonWidget.h -o release\moc_ToggleTextButtonWidget.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ToggleTextButtonWidget.h -o release\moc_ToggleTextButtonWidget.cpp release/moc_NetworkCtrlPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/ToggleTextButtonWidget.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/TxRxWidget.h \ sources/GuiElements/NetworkCtrlPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\NetworkCtrlPage.h -o release\moc_NetworkCtrlPage.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\NetworkCtrlPage.h -o release\moc_NetworkCtrlPage.cpp release/moc_NetworkManager.cpp: sources/GlobalDefine.h \ sources/ZTData.h \ sources/TCPProtocol.h \ sources/UDPProtocol.h \ sources/NetworkManager.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\NetworkManager.h -o release\moc_NetworkManager.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\NetworkManager.h -o release\moc_NetworkManager.cpp release/moc_TxRxWidget.cpp: sources/GuiElements/TxRxWidget.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\TxRxWidget.h -o release\moc_TxRxWidget.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\TxRxWidget.h -o release\moc_TxRxWidget.cpp release/moc_RemoteZTPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/ToggleTextButtonWidget.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/RemoteZTPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\RemoteZTPage.h -o release\moc_RemoteZTPage.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\RemoteZTPage.h -o release\moc_RemoteZTPage.cpp release/moc_ZTLogViewerPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/ZTLogViewerPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ZTLogViewerPage.h -o release\moc_ZTLogViewerPage.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ZTLogViewerPage.h -o release\moc_ZTLogViewerPage.cpp release/moc_ProgressBarPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/ProgressBarPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ProgressBarPage.h -o release\moc_ProgressBarPage.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ProgressBarPage.h -o release\moc_ProgressBarPage.cpp release/moc_RemoteZTCtrlPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/ToggleButtonWidget.h \ sources/GuiElements/RemoteZTCtrlPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\RemoteZTCtrlPage.h -o release\moc_RemoteZTCtrlPage.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\RemoteZTCtrlPage.h -o release\moc_RemoteZTCtrlPage.cpp release/moc_ToggleButtonWidget.cpp: sources/GuiElements/ToggleButtonWidget.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ToggleButtonWidget.h -o release\moc_ToggleButtonWidget.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ToggleButtonWidget.h -o release\moc_ToggleButtonWidget.cpp release/moc_DatabaseMgrPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/DatabaseMgrPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\DatabaseMgrPage.h -o release\moc_DatabaseMgrPage.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\DatabaseMgrPage.h -o release\moc_DatabaseMgrPage.cpp release/moc_ZTLogsListPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/ZTLogsListPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ZTLogsListPage.h -o release\moc_ZTLogsListPage.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ZTLogsListPage.h -o release\moc_ZTLogsListPage.cpp release/moc_ZTLogFilesMgr.cpp: sources/ZTData.h \ sources/GlobalDefine.h \ sources/DirParserThread.h \ sources/TrainLogFileMgr.h \ sources/ZTLogFilesMgr.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\ZTLogFilesMgr.h -o release\moc_ZTLogFilesMgr.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\ZTLogFilesMgr.h -o release\moc_ZTLogFilesMgr.cpp release/moc_DirParserThread.cpp: sources/GlobalDefine.h \ sources/TrainLogFileMgr.h \ sources/ZTData.h \ sources/DirParserThread.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\DirParserThread.h -o release\moc_DirParserThread.cpp + C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\DirParserThread.h -o release\moc_DirParserThread.cpp compiler_rcc_make_all: compiler_rcc_clean: diff --git a/sources/MainPanel.cpp b/sources/MainPanel.cpp index edb92fc..a7656ef 100644 --- a/sources/MainPanel.cpp +++ b/sources/MainPanel.cpp @@ -131,8 +131,9 @@ Panel::Panel() mMainPage->setZValue(0); mMainPage->resize(10,SCREEN_RES_HEIGHT); - mDatabaseModeLogViewPage->setPos(SCREEN_RES_WIDTH-980,0); - mDatabaseModeLogViewPage->resize(980,SCREEN_RES_HEIGHT); + const static int LogViewPageWidth(750); + mDatabaseModeLogViewPage->setPos(SCREEN_RES_WIDTH-LogViewPageWidth,0); + mDatabaseModeLogViewPage->resize(LogViewPageWidth/*980*/,SCREEN_RES_HEIGHT); mDatabaseModeLogViewPage->setZValue(0); mDatabaseModeLogViewPage->DisableCloseButton(); mDatabaseModeLogViewPage->show();