<?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="7.10" Name="calamari" ProjectGUID="{C7A3F7EF-F747-4C78-96F0-FC37FDBBBD5E}" RootNamespace="calamari" SccProjectName="SAK" SccAuxPath="SAK" SccLocalPath="SAK" SccProvider="SAK" Keyword="Qt4VSv1.0"> <Platforms> <Platform Name="Win32"/> </Platforms> <Configurations> <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1"> <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories=".\GeneratedFiles;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui" PreprocessorDefinitions="UNICODE,WIN32,QT_THREAD_SUPPORT,QT_NO_DEBUG,NDEBUG,QT_CORE_LIB,QT_GUI_LIB" RuntimeLibrary="2" DebugInformationFormat="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalDependencies="qtmain.lib QtCore4.lib QtGui4.lib" OutputFile="$(OutDir)\$(ProjectName).exe" AdditionalLibraryDirectories=""$(QTDIR)\lib"" GenerateDebugInformation="FALSE" SubSystem="2"/> <Tool Name="VCMIDLTool"/> <Tool Name="VCPostBuildEventTool" CommandLine="copy $(TargetPath) $(ProjectDir)bin.ntx86\$(TargetFileName) copy $(TargetPath) "C:\Program Files\Perforce\calamari.exe" cd $(ProjectDir)bin.ntx86\ "C:\Program Files\7-Zip\7z" u -r -tzip calamari.zip *.exe *.dll "/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".\GeneratedFiles;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui" PreprocessorDefinitions="UNICODE,WIN32,QT_THREAD_SUPPORT,QT_CORE_LIB,QT_GUI_LIB" RuntimeLibrary="3" DebugInformationFormat="3"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalDependencies=" qtmaind.lib QtCored4.lib QtGuid4.lib" OutputFile="$(OutDir)\$(ProjectName).exe" AdditionalLibraryDirectories="$(QTDIR)\lib" GenerateDebugInformation="TRUE" SubSystem="1"/> <Tool Name="VCMIDLTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> <References> </References> <Files> <Filter Name="Source Files" Filter="cpp;cxx;c;def" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> <File RelativePath=".\BaseWidget.cpp"> </File> <File RelativePath=".\CalamariWindow.cpp"> </File> <File RelativePath=".\ColorOptsDialog.cpp"> </File> <File RelativePath=".\DiffWidget.cpp"> </File> <File RelativePath=".\HandyScrollArea.cpp"> </File> <File RelativePath=".\ImageProjector.cpp"> </File> <File RelativePath=".\main.cpp"> </File> <File RelativePath=".\MergeEditor.cpp"> </File> <File RelativePath=".\MergeWidget.cpp"> </File> <File RelativePath=".\Minimap.cpp"> </File> <File RelativePath=".\util.cpp"> </File> </Filter> <Filter Name="Header Files" Filter="h" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"> <File RelativePath=".\BaseWidget.h"> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCustomBuildTool" Description="Moc'ing BaseWidget.h..." CommandLine="$(QTDIR)\bin\moc.exe -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -I".\GeneratedFiles" -I"$(QTDIR)\include" -I".\GeneratedFiles\$(ConfigurationName)" -I"." -I"$(QTDIR)\include\QtCore" -I"$(QTDIR)\include\QtGui" ".\BaseWidget.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_BaseWidget.cpp" " AdditionalDependencies="$(QTDIR)\bin\moc.exe;.\BaseWidget.h" Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_BaseWidget.cpp""/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCustomBuildTool" Description="Moc'ing BaseWidget.h..." CommandLine="$(QTDIR)\bin\moc.exe -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB -I".\GeneratedFiles" -I"$(QTDIR)\include" -I".\GeneratedFiles\$(ConfigurationName)" -I"." -I"$(QTDIR)\include\QtCore" -I"$(QTDIR)\include\QtGui" ".\BaseWidget.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_BaseWidget.cpp" " AdditionalDependencies="$(QTDIR)\bin\moc.exe;.\BaseWidget.h" Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_BaseWidget.cpp""/> </FileConfiguration> </File> <File RelativePath=".\CalamariWindow.h"> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCustomBuildTool" Description="Moc'ing CalamariWindow.h..." CommandLine="$(QTDIR)\bin\moc.exe -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -I".\GeneratedFiles" -I"$(QTDIR)\include" -I".\GeneratedFiles\$(ConfigurationName)" -I"." -I"$(QTDIR)\include\QtCore" -I"$(QTDIR)\include\QtGui" ".\CalamariWindow.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_CalamariWindow.cpp" " AdditionalDependencies="$(QTDIR)\bin\moc.exe;.\CalamariWindow.h" Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_CalamariWindow.cpp""/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCustomBuildTool" Description="Moc'ing CalamariWindow.h..." CommandLine="$(QTDIR)\bin\moc.exe -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB -I".\GeneratedFiles" -I"$(QTDIR)\include" -I".\GeneratedFiles\$(ConfigurationName)" -I"." -I"$(QTDIR)\include\QtCore" -I"$(QTDIR)\include\QtGui" ".\CalamariWindow.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_CalamariWindow.cpp" " AdditionalDependencies="$(QTDIR)\bin\moc.exe;.\CalamariWindow.h" Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_CalamariWindow.cpp""/> </FileConfiguration> </File> <File RelativePath=".\ColorOptsDialog.h"> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCustomBuildTool" Description="Moc'ing ColorOptsDialog.h..." CommandLine="$(QTDIR)\bin\moc.exe -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -I".\GeneratedFiles" -I"$(QTDIR)\include" -I".\GeneratedFiles\$(ConfigurationName)" -I"." -I"$(QTDIR)\include\QtCore" -I"$(QTDIR)\include\QtGui" ".\ColorOptsDialog.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_ColorOptsDialog.cpp" " AdditionalDependencies="$(QTDIR)\bin\moc.exe;.\ColorOptsDialog.h" Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_ColorOptsDialog.cpp""/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCustomBuildTool" Description="Moc'ing ColorOptsDialog.h..." CommandLine="$(QTDIR)\bin\moc.exe -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB -I".\GeneratedFiles" -I"$(QTDIR)\include" -I".\GeneratedFiles\$(ConfigurationName)" -I"." -I"$(QTDIR)\include\QtCore" -I"$(QTDIR)\include\QtGui" ".\ColorOptsDialog.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_ColorOptsDialog.cpp" " AdditionalDependencies="$(QTDIR)\bin\moc.exe;.\ColorOptsDialog.h" Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_ColorOptsDialog.cpp""/> </FileConfiguration> </File> <File RelativePath=".\DiffWidget.h"> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCustomBuildTool" Description="Moc'ing DiffWidget.h..." CommandLine="$(QTDIR)\bin\moc.exe -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -I".\GeneratedFiles" -I"$(QTDIR)\include" -I".\GeneratedFiles\$(ConfigurationName)" -I"." -I"$(QTDIR)\include\QtCore" -I"$(QTDIR)\include\QtGui" ".\DiffWidget.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_DiffWidget.cpp" " AdditionalDependencies="$(QTDIR)\bin\moc.exe;.\DiffWidget.h" Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_DiffWidget.cpp""/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCustomBuildTool" Description="Moc'ing DiffWidget.h..." CommandLine="$(QTDIR)\bin\moc.exe -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB -I".\GeneratedFiles" -I"$(QTDIR)\include" -I".\GeneratedFiles\$(ConfigurationName)" -I"." -I"$(QTDIR)\include\QtCore" -I"$(QTDIR)\include\QtGui" ".\DiffWidget.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_DiffWidget.cpp" " AdditionalDependencies="$(QTDIR)\bin\moc.exe;.\DiffWidget.h" Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_DiffWidget.cpp""/> </FileConfiguration> </File> <File RelativePath=".\HandyScrollArea.h"> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCustomBuildTool" Description="Moc'ing HandyScrollArea.h..." CommandLine="$(QTDIR)\bin\moc.exe -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -I".\GeneratedFiles" -I"$(QTDIR)\include" -I".\GeneratedFiles\$(ConfigurationName)" -I"." -I"$(QTDIR)\include\QtCore" -I"$(QTDIR)\include\QtGui" ".\HandyScrollArea.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_HandyScrollArea.cpp" " AdditionalDependencies="$(QTDIR)\bin\moc.exe;.\HandyScrollArea.h" Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_HandyScrollArea.cpp""/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCustomBuildTool" Description="Moc'ing HandyScrollArea.h..." CommandLine="$(QTDIR)\bin\moc.exe -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB -I".\GeneratedFiles" -I"$(QTDIR)\include" -I".\GeneratedFiles\$(ConfigurationName)" -I"." -I"$(QTDIR)\include\QtCore" -I"$(QTDIR)\include\QtGui" ".\HandyScrollArea.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_HandyScrollArea.cpp" " AdditionalDependencies="$(QTDIR)\bin\moc.exe;.\HandyScrollArea.h" Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_HandyScrollArea.cpp""/> </FileConfiguration> </File> <File RelativePath=".\ImageProjector.h"> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCustomBuildTool" Description="Moc'ing ImageProjector.h..." CommandLine="$(QTDIR)\bin\moc.exe -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -I".\GeneratedFiles" -I"$(QTDIR)\include" -I".\GeneratedFiles\$(ConfigurationName)" -I"." -I"$(QTDIR)\include\QtCore" -I"$(QTDIR)\include\QtGui" ".\ImageProjector.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_ImageProjector.cpp" " AdditionalDependencies="$(QTDIR)\bin\moc.exe;.\ImageProjector.h" Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_ImageProjector.cpp""/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCustomBuildTool" Description="Moc'ing ImageProjector.h..." CommandLine="$(QTDIR)\bin\moc.exe -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB -I".\GeneratedFiles" -I"$(QTDIR)\include" -I".\GeneratedFiles\$(ConfigurationName)" -I"." -I"$(QTDIR)\include\QtCore" -I"$(QTDIR)\include\QtGui" ".\ImageProjector.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_ImageProjector.cpp" " AdditionalDependencies="$(QTDIR)\bin\moc.exe;.\ImageProjector.h" Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_ImageProjector.cpp""/> </FileConfiguration> </File> <File RelativePath=".\MergeEditor.h"> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCustomBuildTool" Description="Moc'ing MergeEditor.h..." CommandLine="$(QTDIR)\bin\moc.exe -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -I".\GeneratedFiles" -I"$(QTDIR)\include" -I".\GeneratedFiles\$(ConfigurationName)" -I"." -I"$(QTDIR)\include\QtCore" -I"$(QTDIR)\include\QtGui" ".\MergeEditor.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_MergeEditor.cpp" " AdditionalDependencies="$(QTDIR)\bin\moc.exe;.\MergeEditor.h" Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_MergeEditor.cpp""/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCustomBuildTool" Description="Moc'ing MergeEditor.h..." CommandLine="$(QTDIR)\bin\moc.exe -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB -I".\GeneratedFiles" -I"$(QTDIR)\include" -I".\GeneratedFiles\$(ConfigurationName)" -I"." -I"$(QTDIR)\include\QtCore" -I"$(QTDIR)\include\QtGui" ".\MergeEditor.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_MergeEditor.cpp" " AdditionalDependencies="$(QTDIR)\bin\moc.exe;.\MergeEditor.h" Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_MergeEditor.cpp""/> </FileConfiguration> </File> <File RelativePath=".\MergeWidget.h"> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCustomBuildTool" Description="Moc'ing MergeWidget.h..." CommandLine="$(QTDIR)\bin\moc.exe -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -I".\GeneratedFiles" -I"$(QTDIR)\include" -I".\GeneratedFiles\$(ConfigurationName)" -I"." -I"$(QTDIR)\include\QtCore" -I"$(QTDIR)\include\QtGui" ".\MergeWidget.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_MergeWidget.cpp" " AdditionalDependencies="$(QTDIR)\bin\moc.exe;.\MergeWidget.h" Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_MergeWidget.cpp""/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCustomBuildTool" Description="Moc'ing MergeWidget.h..." CommandLine="$(QTDIR)\bin\moc.exe -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB -I".\GeneratedFiles" -I"$(QTDIR)\include" -I".\GeneratedFiles\$(ConfigurationName)" -I"." -I"$(QTDIR)\include\QtCore" -I"$(QTDIR)\include\QtGui" ".\MergeWidget.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_MergeWidget.cpp" " AdditionalDependencies="$(QTDIR)\bin\moc.exe;.\MergeWidget.h" Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_MergeWidget.cpp""/> </FileConfiguration> </File> <File RelativePath=".\Minimap.h"> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCustomBuildTool" Description="Moc'ing Minimap.h..." CommandLine="$(QTDIR)\bin\moc.exe -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -I".\GeneratedFiles" -I"$(QTDIR)\include" -I".\GeneratedFiles\$(ConfigurationName)" -I"." -I"$(QTDIR)\include\QtCore" -I"$(QTDIR)\include\QtGui" ".\Minimap.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_Minimap.cpp" " AdditionalDependencies="$(QTDIR)\bin\moc.exe;.\Minimap.h" Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_Minimap.cpp""/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCustomBuildTool" Description="Moc'ing Minimap.h..." CommandLine="$(QTDIR)\bin\moc.exe -DUNICODE -DWIN32 -DQT_THREAD_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB -I".\GeneratedFiles" -I"$(QTDIR)\include" -I".\GeneratedFiles\$(ConfigurationName)" -I"." -I"$(QTDIR)\include\QtCore" -I"$(QTDIR)\include\QtGui" ".\Minimap.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_Minimap.cpp" " AdditionalDependencies="$(QTDIR)\bin\moc.exe;.\Minimap.h" Outputs="".\GeneratedFiles\$(ConfigurationName)\moc_Minimap.cpp""/> </FileConfiguration> </File> <File RelativePath=".\util.h"> </File> <File RelativePath=".\Version"> </File> </Filter> <Filter Name="Executables" Filter=""> <File RelativePath=".\bin.ntx86\calamari.exe"> </File> <File RelativePath=".\bin.ntx86\calamari.zip"> </File> </Filter> <Filter Name="Resource Files" Filter="qrc;*" UniqueIdentifier="{D9D6E242-F8AF-46E4-B9FD-80ECBC20BA3E}" ParseFiles="FALSE"> <File RelativePath=".\auto.png"> </File> <File RelativePath=".\calamari.png"> </File> <File RelativePath=".\calamari.qrc"> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCustomBuildTool" Description="Rcc'ing calamari.qrc..." CommandLine="$(QTDIR)\bin\rcc.exe -name "calamari" -no-compress ".\calamari.qrc" -o .\qrc_calamari.cpp " AdditionalDependencies=".\calamari.qrc;help/diff-how.png;help/diff-toolbar.png;help/diff-window.png;help/diffing.html;help/main.html;help/merge-how.png;help/merge-toolbar.png;help/merge-window.png;help/merging.html;auto.png;calamari.png;color.png;conflict.png;diff.png;eraser.png;paint.png;save.png;spray.png;theirs.png;yours.png" Outputs=".\qrc_calamari.cpp"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCustomBuildTool" Description="Rcc'ing calamari.qrc..." CommandLine="$(QTDIR)\bin\rcc.exe -name "calamari" -no-compress ".\calamari.qrc" -o .\qrc_calamari.cpp " AdditionalDependencies=".\calamari.qrc;help/diff-how.png;help/diff-toolbar.png;help/diff-window.png;help/diffing.html;help/main.html;help/merge-how.png;help/merge-toolbar.png;help/merge-window.png;help/merging.html;auto.png;calamari.png;color.png;conflict.png;diff.png;eraser.png;paint.png;save.png;spray.png;theirs.png;yours.png" Outputs=".\qrc_calamari.cpp"/> </FileConfiguration> </File> <File RelativePath=".\color.png"> </File> <File RelativePath=".\conflict.png"> </File> <File RelativePath=".\help\diff-how.png"> </File> <File RelativePath=".\help\diff-toolbar.png"> </File> <File RelativePath=".\help\diff-window.png"> </File> <File RelativePath=".\diff.png"> </File> <File RelativePath=".\help\diffing.html"> </File> <File RelativePath=".\eraser.png"> </File> <File RelativePath=".\help\main.html"> </File> <File RelativePath=".\help\merge-how.png"> </File> <File RelativePath=".\help\merge-toolbar.png"> </File> <File RelativePath=".\help\merge-window.png"> </File> <File RelativePath=".\help\merging.html"> </File> <File RelativePath=".\paint.png"> </File> <File RelativePath=".\save.png"> </File> <File RelativePath=".\spray.png"> </File> <File RelativePath=".\theirs.png"> </File> <File RelativePath=".\yours.png"> </File> </Filter> <Filter Name="Generated Files" Filter="moc;h;cpp" UniqueIdentifier="{71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11}" SourceControlFiles="FALSE"> <File RelativePath=".\GeneratedFiles\debug\moc_BaseWidget.cpp"> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)/$(InputName)1.obj"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)/$(InputName)1.obj"/> </FileConfiguration> </File> <File RelativePath=".\GeneratedFiles\release\moc_BaseWidget.cpp"> <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File RelativePath=".\GeneratedFiles\debug\moc_calamariwindow.cpp"> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)/$(InputName)1.obj"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)/$(InputName)1.obj"/> </FileConfiguration> </File> <File RelativePath=".\GeneratedFiles\release\moc_calamariwindow.cpp"> <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File RelativePath=".\GeneratedFiles\debug\moc_ColorOptsDialog.cpp"> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)/$(InputName)1.obj"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)/$(InputName)1.obj"/> </FileConfiguration> </File> <File RelativePath=".\GeneratedFiles\release\moc_ColorOptsDialog.cpp"> <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File RelativePath=".\GeneratedFiles\debug\moc_DiffWidget.cpp"> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)/$(InputName)1.obj"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)/$(InputName)1.obj"/> </FileConfiguration> </File> <File RelativePath=".\GeneratedFiles\release\moc_DiffWidget.cpp"> <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File RelativePath=".\GeneratedFiles\release\moc_HandyScrollArea.cpp"> <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File RelativePath=".\GeneratedFiles\debug\moc_HandyScrollArea.cpp"> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)/$(InputName)1.obj"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)/$(InputName)1.obj"/> </FileConfiguration> </File> <File RelativePath=".\GeneratedFiles\debug\moc_ImageProjector.cpp"> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)/$(InputName)1.obj"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)/$(InputName)1.obj"/> </FileConfiguration> </File> <File RelativePath=".\GeneratedFiles\release\moc_ImageProjector.cpp"> <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File RelativePath=".\GeneratedFiles\debug\moc_MergeEditor.cpp"> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)/$(InputName)1.obj"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)/$(InputName)1.obj"/> </FileConfiguration> </File> <File RelativePath=".\GeneratedFiles\release\moc_MergeEditor.cpp"> <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File RelativePath=".\GeneratedFiles\release\moc_MergeWidget.cpp"> <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File RelativePath=".\GeneratedFiles\debug\moc_MergeWidget.cpp"> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)/$(InputName)1.obj"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)/$(InputName)1.obj"/> </FileConfiguration> </File> <File RelativePath=".\GeneratedFiles\release\moc_Minimap.cpp"> <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File RelativePath=".\GeneratedFiles\debug\moc_Minimap.cpp"> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)/$(InputName)1.obj"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)/$(InputName)1.obj"/> </FileConfiguration> </File> <File RelativePath=".\qrc_calamari.cpp"> </File> </Filter> <File RelativePath=".\calamari.ico"> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCustomBuildTool" Description="Creating windows resources..." CommandLine="rc.exe /fo "calamari.res" "calamari.rc" " Outputs="calamari.res"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCustomBuildTool" Description="Creating windows resources..." CommandLine="rc.exe /fo "calamari.res" "calamari.rc" " Outputs="calamari.res"/> </FileConfiguration> </File> </Files> <Globals> <Global Name="MocDir" Value=".\GeneratedFiles\$(ConfigurationName)"/> <Global Name="QtVersion" Value="4.1.3"/> <Global Name="UicDir" Value=".\GeneratedFiles"/> </Globals> </VisualStudioProject>
# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#19 | 6329 | Sam Stafford | Get the app icon working again. | ||
#18 | 6328 | Sam Stafford |
Fix project file to match my clever new client mapping, which was too clever for my own good and was preventing the Qt DLLs from getting bundled in the ZIP. |
||
#17 | 6281 | Sam Stafford | CALAMARI now builds with VS2005 and Qt 4.3.3. | ||
#16 | 5562 | Sam Stafford |
All DLLs now bundled in a ZIP file. Solves the problem of how to get the JPEG image plugin working. |
||
#15 | 5549 | Sam Stafford |
Fix another edge case bug where Qt's behavior is the opposite of what I'd expect - when an empty clip region is set, the clip region is cleared entirely, as if a FULL clip region had been set. The resulting bug was that any image which had zero conflicts would show up as one gigantic conflict - ack! The code now checks for this case and bails out of any painting operation that's about to use an empty clip region. |
||
#14 | 5540 | Sam Stafford |
CALAMARI build. Should be usable by now. |
||
#13 | 5539 | Sam Stafford | Kick off another window to merge alpha channels, if present. | ||
#12 | 5534 | Sam Stafford |
A brand new help file, a bit of cosmetic sprucing, one critical bug fix, and a partridge in a pear tree. |
||
#11 | 5527 | Sam Stafford |
Diff options in merge mode, and an "export stencils" command for people who like that sort of thing. Also, a fresh build. |
||
#10 | 5526 | Sam Stafford | Fixed project files so that the application icon actually gets built in. | ||
#9 | 5524 | Sam Stafford | Eraser and spraypaint tools, and "Save" command. | ||
#8 | 5519 | Sam Stafford |
Added the paintbrush tool. Now we're getting somewhere. |
||
#7 | 5516 | Sam Stafford | The M is for Merge. | ||
#6 | 5512 | Sam Stafford | UI reshuffling - pushed stencil-related options into a dialog. | ||
#5 | 5511 | Sam Stafford | Continued infrastructure work. | ||
#4 | 5508 | Sam Stafford | Infrastructure massaging to make way for Stage Two. | ||
#3 | 5505 | Sam Stafford | Add "diff stencil". | ||
#2 | 5502 | Sam Stafford |
Status bar with handy information, and infrastructure to allow ImageProjectors to have frames. |
||
#1 | 5501 | Sam Stafford |
Codename CALAMARI. Built with Qt 4.1.3 - needs QtCore4.dll and QtGui4.dll to run. |